Merge lp:~racb/ubuntu/quantal/apache2/988819 into lp:ubuntu/quantal/apache2

[Robie Basak]

This is a merge from Debian in order to pick up a fix to bug 988819. I wasn't sure if I was supposed to close the bug in the changelog or not for this kind of case, since the merge would have happened eventually anyway regardless of the bug being there.

[Chuck Short (zulcss)]

Robie,

Can you do this merge through merges.ubuntu.com. I think the bzr branch is a little messed up:

chuck@homer:~/work/server/merges/quantal/apache2/apache2$ bzr bd -S
Building using working tree
Building package in normal mode
Looking for a way to retrieve the upstream tarball
Using pristine-tar to reconstruct apache2_2.2.22.orig.tar.gz.
bzr: ERROR: [Errno 2] No such file or directory: '/home/chuck/work/server/merges/quantal/apache2/apache2/.pc/004_usr_bin_perl_0wnz_j00/docs/cgi-examples/printenv'
chuck@homer:~/work/server/merges/quantal/apache2/apache2$ ls

review: Approve

[masum chechra (makhipandey7)]

Hey Dear,

i want be a active member of ubuntu etherpad instance

[masum chechra (makhipandey7)]

review: Approve

[masum chechra (makhipandey7)]

review: Approve

Unmerged revisions

77. By Robie Basak on 2012-05-15

  * Merge from Debian testing. Remaining changes:
    - debian/{control, rules}: Enable PIE hardening.
    - debian/{control, rules, apache2.2-common.ufw.profile}: Add ufw profiles.
    - debian/control: Add bzr tag and point it to our tree
    - debian/apache2.py, debian/apache2.2-common.install: Add apport hook.
    - debian/control, debian/ask-for-passphrase, debian/config-dir/mods-available/ssl.conf:
      Plymouth aware passphrase dialog program ask-for-passphrase.

=== removed directory '.pc/004_usr_bin_perl_0wnz_j00'
=== removed directory '.pc/004_usr_bin_perl_0wnz_j00/docs'
=== removed directory '.pc/004_usr_bin_perl_0wnz_j00/docs/cgi-examples'
=== removed file '.pc/004_usr_bin_perl_0wnz_j00/docs/cgi-examples/printenv'
--- .pc/004_usr_bin_perl_0wnz_j00/docs/cgi-examples/printenv	2011-12-29 12:09:14 +0000
+++ .pc/004_usr_bin_perl_0wnz_j00/docs/cgi-examples/printenv	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/usr/local/bin/perl
-##
-##  printenv -- demo CGI program which just prints its environment
-##
-
-print "Content-type: text/plain; charset=iso-8859-1\n\n";
-foreach $var (sort(keys(%ENV))) {
-    $val = $ENV{$var};
-    $val =~ s|\n|\\n|g;
-    $val =~ s|"|\\"|g;
-    print "${var}=\"${val}\"\n";
-}
-

=== removed directory '.pc/008_make_include_safe'
=== removed directory '.pc/008_make_include_safe/server'
=== removed file '.pc/008_make_include_safe/server/config.c'
--- .pc/008_make_include_safe/server/config.c	2011-12-29 12:09:14 +0000
+++ .pc/008_make_include_safe/server/config.c	1970-01-01 00:00:00 +0000
@@ -1,2190 +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.
- */
-
-/*
- * http_config.c: once was auxillary functions for reading httpd's config
- * file and converting filenames into a namespace
- *
- * Rob McCool
- *
- * Wall-to-wall rewrite for Apache... commands which are part of the
- * server core can now be found next door in "http_core.c".  Now contains
- * general command loop, and functions which do bookkeeping for the new
- * Apache config stuff (modules and configuration vectors).
- *
- * rst
- *
- */
-
-#include "apr.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include "apr_file_io.h"
-#include "apr_fnmatch.h"
-
-#define APR_WANT_STDIO
-#define APR_WANT_STRFUNC
-#include "apr_want.h"
-
-#define CORE_PRIVATE
-
-#include "ap_config.h"
-#include "httpd.h"
-#include "http_config.h"
-#include "http_protocol.h"
-#include "http_core.h"
-#include "http_log.h"      /* for errors in parse_htaccess */
-#include "http_request.h"  /* for default_handler (see invoke_handler) */
-#include "http_main.h"
-#include "http_vhost.h"
-#include "util_cfgtree.h"
-#include "mpm.h"
-
-
-AP_DECLARE_DATA const char *ap_server_argv0 = NULL;
-
-AP_DECLARE_DATA const char *ap_server_root = NULL;
-
-AP_DECLARE_DATA apr_array_header_t *ap_server_pre_read_config = NULL;
-AP_DECLARE_DATA apr_array_header_t *ap_server_post_read_config = NULL;
-AP_DECLARE_DATA apr_array_header_t *ap_server_config_defines = NULL;
-
-AP_DECLARE_DATA ap_directive_t *ap_conftree = NULL;
-
-APR_HOOK_STRUCT(
-           APR_HOOK_LINK(header_parser)
-           APR_HOOK_LINK(pre_config)
-           APR_HOOK_LINK(post_config)
-           APR_HOOK_LINK(open_logs)
-           APR_HOOK_LINK(child_init)
-           APR_HOOK_LINK(handler)
-           APR_HOOK_LINK(quick_handler)
-           APR_HOOK_LINK(optional_fn_retrieve)
-           APR_HOOK_LINK(test_config)
-)
-
-AP_IMPLEMENT_HOOK_RUN_ALL(int, header_parser,
-                          (request_rec *r), (r), OK, DECLINED)
-
-AP_IMPLEMENT_HOOK_RUN_ALL(int, pre_config,
-                          (apr_pool_t *pconf, apr_pool_t *plog,
-                           apr_pool_t *ptemp),
-                          (pconf, plog, ptemp), OK, DECLINED)
-
-AP_IMPLEMENT_HOOK_VOID(test_config,
-                       (apr_pool_t *pconf, server_rec *s),
-                       (pconf, s))
-
-AP_IMPLEMENT_HOOK_RUN_ALL(int, post_config,
-                          (apr_pool_t *pconf, apr_pool_t *plog,
-                           apr_pool_t *ptemp, server_rec *s),
-                          (pconf, plog, ptemp, s), OK, DECLINED)
-
-/* During the course of debugging I expanded this macro out, so
- * rather than remove all the useful information there is in the
- * following lines, I'm going to leave it here in case anyone
- * else finds it useful.
- *
- * Ben has looked at it and thinks it correct :)
- *
-AP_DECLARE(int) ap_hook_post_config(ap_HOOK_post_config_t *pf,
-                                    const char * const *aszPre,
-                                    const char * const *aszSucc,
-                                    int nOrder)
-{
-    ap_LINK_post_config_t *pHook;
-
-    if (!_hooks.link_post_config) {
-        _hooks.link_post_config = apr_array_make(apr_hook_global_pool, 1,
-                                                 sizeof(ap_LINK_post_config_t));
-        apr_hook_sort_register("post_config", &_hooks.link_post_config);
-    }
-
-    pHook = apr_array_push(_hooks.link_post_config);
-    pHook->pFunc = pf;
-    pHook->aszPredecessors = aszPre;
-    pHook->aszSuccessors = aszSucc;
-    pHook->nOrder = nOrder;
-    pHook->szName = apr_hook_debug_current;
-
-    if (apr_hook_debug_enabled)
-        apr_hook_debug_show("post_config", aszPre, aszSucc);
-}
-
-AP_DECLARE(apr_array_header_t *) ap_hook_get_post_config(void) {
-    return _hooks.link_post_config;
-}
-
-AP_DECLARE(int) ap_run_post_config(apr_pool_t *pconf,
-                                   apr_pool_t *plog,
-                                   apr_pool_t *ptemp,
-                                   server_rec *s)
-{
-    ap_LINK_post_config_t *pHook;
-    int n;
-
-    if(!_hooks.link_post_config)
-        return;
-
-    pHook = (ap_LINK_post_config_t *)_hooks.link_post_config->elts;
-    for (n = 0; n < _hooks.link_post_config->nelts; ++n)
-        pHook[n].pFunc (pconf, plog, ptemp, s);
-}
- */
-
-AP_IMPLEMENT_HOOK_RUN_ALL(int, open_logs,
-                          (apr_pool_t *pconf, apr_pool_t *plog,
-                           apr_pool_t *ptemp, server_rec *s),
-                          (pconf, plog, ptemp, s), OK, DECLINED)
-
-AP_IMPLEMENT_HOOK_VOID(child_init,
-                       (apr_pool_t *pchild, server_rec *s),
-                       (pchild, s))
-
-AP_IMPLEMENT_HOOK_RUN_FIRST(int, handler, (request_rec *r),
-                            (r), DECLINED)
-
-AP_IMPLEMENT_HOOK_RUN_FIRST(int, quick_handler, (request_rec *r, int lookup),
-                            (r, lookup), DECLINED)
-
-AP_IMPLEMENT_HOOK_VOID(optional_fn_retrieve, (void), ())
-
-/****************************************************************
- *
- * We begin with the functions which deal with the linked list
- * of modules which control just about all of the server operation.
- */
-
-/* total_modules is the number of modules that have been linked
- * into the server.
- */
-static int total_modules = 0;
-
-/* dynamic_modules is the number of modules that have been added
- * after the pre-loaded ones have been set up. It shouldn't be larger
- * than DYNAMIC_MODULE_LIMIT.
- */
-static int dynamic_modules = 0;
-
-AP_DECLARE_DATA module *ap_top_module = NULL;
-AP_DECLARE_DATA module **ap_loaded_modules=NULL;
-
-static apr_hash_t *ap_config_hash = NULL;
-
-typedef int (*handler_func)(request_rec *);
-typedef void *(*dir_maker_func)(apr_pool_t *, char *);
-typedef void *(*merger_func)(apr_pool_t *, void *, void *);
-
-/* maximum nesting level for config directories */
-#ifndef AP_MAX_INCLUDE_DIR_DEPTH
-#define AP_MAX_INCLUDE_DIR_DEPTH (128)
-#endif
-
-/* Dealing with config vectors.  These are associated with per-directory,
- * per-server, and per-request configuration, and have a void* pointer for
- * each modules.  The nature of the structure pointed to is private to the
- * module in question... the core doesn't (and can't) know.  However, there
- * are defined interfaces which allow it to create instances of its private
- * per-directory and per-server structures, and to merge the per-directory
- * structures of a directory and its subdirectory (producing a new one in
- * which the defaults applying to the base directory have been properly
- * overridden).
- */
-
-static ap_conf_vector_t *create_empty_config(apr_pool_t *p)
-{
-    void *conf_vector = apr_pcalloc(p, sizeof(void *) *
-                                    (total_modules + DYNAMIC_MODULE_LIMIT));
-    return conf_vector;
-}
-
-static ap_conf_vector_t *create_default_per_dir_config(apr_pool_t *p)
-{
-    void **conf_vector = apr_pcalloc(p, sizeof(void *) *
-                                     (total_modules + DYNAMIC_MODULE_LIMIT));
-    module *modp;
-
-    for (modp = ap_top_module; modp; modp = modp->next) {
-        dir_maker_func df = modp->create_dir_config;
-
-        if (df)
-            conf_vector[modp->module_index] = (*df)(p, NULL);
-    }
-
-    return (ap_conf_vector_t *)conf_vector;
-}
-
-AP_CORE_DECLARE(ap_conf_vector_t *) ap_merge_per_dir_configs(apr_pool_t *p,
-                                           ap_conf_vector_t *base,
-                                           ap_conf_vector_t *new_conf)
-{
-    void **conf_vector = apr_palloc(p, sizeof(void *) * total_modules);
-    void **base_vector = (void **)base;
-    void **new_vector = (void **)new_conf;
-    module *modp;
-
-    for (modp = ap_top_module; modp; modp = modp->next) {
-        int i = modp->module_index;
-
-        if (!new_vector[i]) {
-            conf_vector[i] = base_vector[i];
-        }
-        else {
-            merger_func df = modp->merge_dir_config;
-            if (df && base_vector[i]) {
-                conf_vector[i] = (*df)(p, base_vector[i], new_vector[i]);
-            }
-            else
-                conf_vector[i] = new_vector[i];
-        }
-    }
-
-    return (ap_conf_vector_t *)conf_vector;
-}
-
-static ap_conf_vector_t *create_server_config(apr_pool_t *p, server_rec *s)
-{
-    void **conf_vector = apr_pcalloc(p, sizeof(void *) *
-                                     (total_modules + DYNAMIC_MODULE_LIMIT));
-    module *modp;
-
-    for (modp = ap_top_module; modp; modp = modp->next) {
-        if (modp->create_server_config)
-            conf_vector[modp->module_index] = (*modp->create_server_config)(p, s);
-    }
-
-    return (ap_conf_vector_t *)conf_vector;
-}
-
-static void merge_server_configs(apr_pool_t *p, ap_conf_vector_t *base,
-                                 ap_conf_vector_t *virt)
-{
-    /* Can reuse the 'virt' vector for the spine of it, since we don't
-     * have to deal with the moral equivalent of .htaccess files here...
-     */
-
-    void **base_vector = (void **)base;
-    void **virt_vector = (void **)virt;
-    module *modp;
-
-    for (modp = ap_top_module; modp; modp = modp->next) {
-        merger_func df = modp->merge_server_config;
-        int i = modp->module_index;
-
-        if (!virt_vector[i])
-            virt_vector[i] = base_vector[i];
-        else if (df)
-            virt_vector[i] = (*df)(p, base_vector[i], virt_vector[i]);
-    }
-}
-
-AP_CORE_DECLARE(ap_conf_vector_t *) ap_create_request_config(apr_pool_t *p)
-{
-    return create_empty_config(p);
-}
-
-AP_CORE_DECLARE(ap_conf_vector_t *) ap_create_conn_config(apr_pool_t *p)
-{
-    return create_empty_config(p);
-}
-
-AP_CORE_DECLARE(ap_conf_vector_t *) ap_create_per_dir_config(apr_pool_t *p)
-{
-    return create_empty_config(p);
-}
-
-/* Invoke the filter_init_func for all filters with FILTERS where f->r
- * matches R.  Restricting to a matching R avoids re-running init
- * functions for filters configured for r->main where r is a
- * subrequest.  */
-static int invoke_filter_init(request_rec *r, ap_filter_t *filters)
-{
-    while (filters) {
-        if (filters->frec->filter_init_func && filters->r == r) {
-            int result = filters->frec->filter_init_func(filters);
-            if (result != OK) {
-                return result;
-            }
-        }
-        filters = filters->next;
-    }
-    return OK;
-}
-
-AP_CORE_DECLARE(int) ap_invoke_handler(request_rec *r)
-{
-    const char *handler;
-    const char *p;
-    int result;
-    const char *old_handler = r->handler;
-    const char *ignore;
-
-    /*
-     * The new insert_filter stage makes the most sense here.  We only use
-     * it when we are going to run the request, so we must insert filters
-     * if any are available.  Since the goal of this phase is to allow all
-     * modules to insert a filter if they want to, this filter returns
-     * void.  I just can't see any way that this filter can reasonably
-     * fail, either your modules inserts something or it doesn't.  rbb
-     */
-    ap_run_insert_filter(r);
-
-    /* Before continuing, allow each filter that is in the two chains to
-     * run their init function to let them do any magic before we could
-     * start generating data.
-     */
-    result = invoke_filter_init(r, r->input_filters);
-    if (result != OK) {
-        return result;
-    }
-    result = invoke_filter_init(r, r->output_filters);
-    if (result != OK) {
-        return result;
-    }
-
-    if (!r->handler) {
-        handler = r->content_type ? r->content_type : ap_default_type(r);
-        if ((p=ap_strchr_c(handler, ';')) != NULL) {
-            char *new_handler = (char *)apr_pmemdup(r->pool, handler,
-                                                    p - handler + 1);
-            char *p2 = new_handler + (p - handler);
-            handler = new_handler;
-
-            /* MIME type arguments */
-            while (p2 > handler && p2[-1] == ' ')
-                --p2; /* strip trailing spaces */
-
-            *p2='\0';
-        }
-
-        r->handler = handler;
-    }
-
-    result = ap_run_handler(r);
-
-    r->handler = old_handler;
-
-    if (result == DECLINED && r->handler && r->filename) {
-        ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
-            "handler \"%s\" not found for: %s", r->handler, r->filename);
-    }
-    if ((result != OK) && (result != DONE) && (result != DECLINED)
-        && (result != AP_FILTER_ERROR)
-        && !ap_is_HTTP_VALID_RESPONSE(result)) {
-        /* If a module is deliberately returning something else
-         * (request_rec in non-HTTP or proprietary extension?)
-         * let it set a note to allow it explicitly.
-         * Otherwise, a return code that is neither reserved nor HTTP
-         * is a bug, as in PR#31759.
-         */
-        ignore = apr_table_get(r->notes, "HTTP_IGNORE_RANGE");
-        if (!ignore) {
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                          "Handler for %s returned invalid result code %d",
-                          r->handler, result);
-            result = HTTP_INTERNAL_SERVER_ERROR;
-        }
-    }
-
-    return result == DECLINED ? HTTP_INTERNAL_SERVER_ERROR : result;
-}
-
-AP_DECLARE(int) ap_method_is_limited(cmd_parms *cmd, const char *method)
-{
-    int methnum;
-
-    methnum = ap_method_number_of(method);
-
-    /*
-     * A method number either hardcoded into apache or
-     * added by a module and registered.
-     */
-    if (methnum != M_INVALID) {
-        return (cmd->limited & (AP_METHOD_BIT << methnum)) ? 1 : 0;
-    }
-
-    return 0; /* not found */
-}
-
-AP_DECLARE(void) ap_register_hooks(module *m, apr_pool_t *p)
-{
-    if (m->register_hooks) {
-        if (getenv("SHOW_HOOKS")) {
-            printf("Registering hooks for %s\n", m->name);
-            apr_hook_debug_enabled = 1;
-        }
-
-        apr_hook_debug_current = m->name;
-        m->register_hooks(p);
-    }
-}
-
-static void ap_add_module_commands(module *m, apr_pool_t *p);
-
-typedef struct ap_mod_list_struct ap_mod_list;
-struct ap_mod_list_struct {
-    struct ap_mod_list_struct *next;
-    module *m;
-    const command_rec *cmd;
-};
-
-static apr_status_t reload_conf_hash(void *baton)
-{
-    ap_config_hash = NULL;
-    return APR_SUCCESS;
-}
-
-static void rebuild_conf_hash(apr_pool_t *p, int add_prelinked)
-{
-    module **m;
-
-    ap_config_hash = apr_hash_make(p);
-
-    apr_pool_cleanup_register(p, NULL, reload_conf_hash,
-                              apr_pool_cleanup_null);
-    if (add_prelinked) {
-        for (m = ap_prelinked_modules; *m != NULL; m++) {
-            ap_add_module_commands(*m, p);
-        }
-    }
-}
-
-static void ap_add_module_commands(module *m, apr_pool_t *p)
-{
-    apr_pool_t *tpool;
-    ap_mod_list *mln;
-    const command_rec *cmd;
-    char *dir;
-
-    cmd = m->cmds;
-
-    if (ap_config_hash == NULL) {
-        rebuild_conf_hash(p, 0);
-    }
-
-    tpool = apr_hash_pool_get(ap_config_hash);
-
-    while (cmd && cmd->name) {
-        mln = apr_palloc(tpool, sizeof(ap_mod_list));
-        mln->cmd = cmd;
-        mln->m = m;
-        dir = apr_pstrdup(tpool, cmd->name);
-
-        ap_str_tolower(dir);
-
-        mln->next = apr_hash_get(ap_config_hash, dir, APR_HASH_KEY_STRING);
-        apr_hash_set(ap_config_hash, dir, APR_HASH_KEY_STRING, mln);
-        ++cmd;
-    }
-}
-
-
-/* One-time setup for precompiled modules --- NOT to be done on restart */
-
-AP_DECLARE(const char *) ap_add_module(module *m, apr_pool_t *p)
-{
-    /* This could be called from a LoadModule httpd.conf command,
-     * after the file has been linked and the module structure within it
-     * teased out...
-     */
-
-    if (m->version != MODULE_MAGIC_NUMBER_MAJOR) {
-        return apr_psprintf(p, "Module \"%s\" is not compatible with this "
-                            "version of Apache (found %d, need %d). Please "
-                            "contact the vendor for the correct version.",
-                            m->name, m->version, MODULE_MAGIC_NUMBER_MAJOR);
-    }
-
-    if (m->next == NULL) {
-        m->next = ap_top_module;
-        ap_top_module = m;
-    }
-
-    if (m->module_index == -1) {
-        m->module_index = total_modules++;
-        dynamic_modules++;
-
-        if (dynamic_modules > DYNAMIC_MODULE_LIMIT) {
-            return apr_psprintf(p, "Module \"%s\" could not be loaded, "
-                                "because the dynamic module limit was "
-                                "reached. Please increase "
-                                "DYNAMIC_MODULE_LIMIT and recompile.", m->name);
-        }
-    }
-
-    /* Some C compilers put a complete path into __FILE__, but we want
-     * only the filename (e.g. mod_includes.c). So check for path
-     * components (Unix and DOS), and remove them.
-     */
-
-    if (ap_strrchr_c(m->name, '/'))
-        m->name = 1 + ap_strrchr_c(m->name, '/');
-
-    if (ap_strrchr_c(m->name, '\\'))
-        m->name = 1 + ap_strrchr_c(m->name, '\\');
-
-#ifdef _OSD_POSIX
-    /* __FILE__ =
-     * "*POSIX(/home/martin/apache/src/modules/standard/mod_info.c)"
-     */
-
-    /* We cannot fix the string in-place, because it's const */
-    if (m->name[strlen(m->name)-1] == ')') {
-        char *tmp = strdup(m->name); /* FIXME: memory leak, albeit a small one */
-        tmp[strlen(tmp)-1] = '\0';
-        m->name = tmp;
-    }
-#endif /*_OSD_POSIX*/
-
-    ap_add_module_commands(m, p);
-    /*  FIXME: is this the right place to call this?
-     *  It doesn't appear to be
-     */
-    ap_register_hooks(m, p);
-
-    return NULL;
-}
-
-/*
- * remove_module undoes what add_module did. There are some caveats:
- * when the module is removed, its slot is lost so all the current
- * per-dir and per-server configurations are invalid. So we should
- * only ever call this function when you are invalidating almost
- * all our current data. I.e. when doing a restart.
- */
-
-AP_DECLARE(void) ap_remove_module(module *m)
-{
-    module *modp;
-
-    modp = ap_top_module;
-    if (modp == m) {
-        /* We are the top module, special case */
-        ap_top_module = modp->next;
-        m->next = NULL;
-    }
-    else {
-        /* Not the top module, find use. When found modp will
-         * point to the module _before_ us in the list
-         */
-
-        while (modp && modp->next != m) {
-            modp = modp->next;
-        }
-
-        if (!modp) {
-            /* Uh-oh, this module doesn't exist */
-            ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
-                         "Cannot remove module %s: not found in module list",
-                         m->name);
-            return;
-        }
-
-        /* Eliminate us from the module list */
-        modp->next = modp->next->next;
-    }
-
-    m->module_index = -1; /* simulate being unloaded, should
-                           * be unnecessary */
-    dynamic_modules--;
-    total_modules--;
-}
-
-AP_DECLARE(const char *) ap_add_loaded_module(module *mod, apr_pool_t *p)
-{
-    module **m;
-    const char *error;
-
-    /*
-     *  Add module pointer to top of chained module list
-     */
-    error = ap_add_module(mod, p);
-    if (error) {
-        return error;
-    }
-
-    /*
-     *  And module pointer to list of loaded modules
-     *
-     *  Notes: 1. ap_add_module() would already complain if no more space
-     *            exists for adding a dynamically loaded module
-     *         2. ap_add_module() accepts double inclusion, so we have
-     *            to accept this, too.
-     */
-    for (m = ap_loaded_modules; *m != NULL; m++)
-        ;
-    *m++ = mod;
-    *m = NULL;
-
-    return NULL;
-}
-
-AP_DECLARE(void) ap_remove_loaded_module(module *mod)
-{
-    module **m;
-    module **m2;
-    int done;
-
-    /*
-     *  Remove module pointer from chained module list
-     */
-    ap_remove_module(mod);
-
-    /*
-     *  Remove module pointer from list of loaded modules
-     *
-     *  Note: 1. We cannot determine if the module was successfully
-     *           removed by ap_remove_module().
-     *        2. We have not to complain explicity when the module
-     *           is not found because ap_remove_module() did it
-     *           for us already.
-     */
-    for (m = m2 = ap_loaded_modules, done = 0; *m2 != NULL; m2++) {
-        if (*m2 == mod && done == 0)
-            done = 1;
-        else
-            *m++ = *m2;
-    }
-
-    *m = NULL;
-}
-
-AP_DECLARE(const char *) ap_setup_prelinked_modules(process_rec *process)
-{
-    module **m;
-    module **m2;
-    const char *error;
-
-    apr_hook_global_pool=process->pconf;
-
-    rebuild_conf_hash(process->pconf, 0);
-
-    /*
-     *  Initialise total_modules variable and module indices
-     */
-    total_modules = 0;
-    for (m = ap_preloaded_modules; *m != NULL; m++)
-        (*m)->module_index = total_modules++;
-
-    /*
-     *  Initialise list of loaded modules
-     */
-    ap_loaded_modules = (module **)apr_palloc(process->pool,
-        sizeof(module *) * (total_modules + DYNAMIC_MODULE_LIMIT + 1));
-
-    if (ap_loaded_modules == NULL) {
-        return "Ouch! Out of memory in ap_setup_prelinked_modules()!";
-    }
-
-    for (m = ap_preloaded_modules, m2 = ap_loaded_modules; *m != NULL; )
-        *m2++ = *m++;
-
-    *m2 = NULL;
-
-    /*
-     *   Initialize chain of linked (=activate) modules
-     */
-    for (m = ap_prelinked_modules; *m != NULL; m++) {
-        error = ap_add_module(*m, process->pconf);
-        if (error) {
-            return error;
-        }
-    }
-
-    apr_hook_sort_all();
-
-    return NULL;
-}
-
-AP_DECLARE(const char *) ap_find_module_name(module *m)
-{
-    return m->name;
-}
-
-AP_DECLARE(module *) ap_find_linked_module(const char *name)
-{
-    module *modp;
-
-    for (modp = ap_top_module; modp; modp = modp->next) {
-        if (strcmp(modp->name, name) == 0)
-            return modp;
-    }
-
-    return NULL;
-}
-
-/*****************************************************************
- *
- * Resource, access, and .htaccess config files now parsed by a common
- * command loop.
- *
- * Let's begin with the basics; parsing the line and
- * invoking the function...
- */
-
-#define AP_MAX_ARGC 64
-
-static const char *invoke_cmd(const command_rec *cmd, cmd_parms *parms,
-                              void *mconfig, const char *args)
-{
-    char *w, *w2, *w3;
-    const char *errmsg = NULL;
-
-    if ((parms->override & cmd->req_override) == 0)
-        return apr_pstrcat(parms->pool, cmd->name, " not allowed here", NULL);
-
-    parms->info = cmd->cmd_data;
-    parms->cmd = cmd;
-
-    switch (cmd->args_how) {
-    case RAW_ARGS:
-#ifdef RESOLVE_ENV_PER_TOKEN
-        args = ap_resolve_env(parms->pool,args);
-#endif
-        return cmd->AP_RAW_ARGS(parms, mconfig, args);
-
-    case TAKE_ARGV:
-        {
-            char *argv[AP_MAX_ARGC];
-            int argc = 0;
-
-            do {
-                w = ap_getword_conf(parms->pool, &args);
-                if (*w == '\0' && *args == '\0') {
-                    break;
-                }
-                argv[argc] = w;
-                argc++;
-            } while (argc < AP_MAX_ARGC && *args != '\0');
-
-            return cmd->AP_TAKE_ARGV(parms, mconfig, argc, argv);
-        }
-
-    case NO_ARGS:
-        if (*args != 0)
-            return apr_pstrcat(parms->pool, cmd->name, " takes no arguments",
-                               NULL);
-
-        return cmd->AP_NO_ARGS(parms, mconfig);
-
-    case TAKE1:
-        w = ap_getword_conf(parms->pool, &args);
-
-        if (*w == '\0' || *args != 0)
-            return apr_pstrcat(parms->pool, cmd->name, " takes one argument",
-                               cmd->errmsg ? ", " : NULL, cmd->errmsg, NULL);
-
-        return cmd->AP_TAKE1(parms, mconfig, w);
-
-    case TAKE2:
-        w = ap_getword_conf(parms->pool, &args);
-        w2 = ap_getword_conf(parms->pool, &args);
-
-        if (*w == '\0' || *w2 == '\0' || *args != 0)
-            return apr_pstrcat(parms->pool, cmd->name, " takes two arguments",
-                               cmd->errmsg ? ", " : NULL, cmd->errmsg, NULL);
-
-        return cmd->AP_TAKE2(parms, mconfig, w, w2);
-
-    case TAKE12:
-        w = ap_getword_conf(parms->pool, &args);
-        w2 = ap_getword_conf(parms->pool, &args);
-
-        if (*w == '\0' || *args != 0)
-            return apr_pstrcat(parms->pool, cmd->name, " takes 1-2 arguments",
-                               cmd->errmsg ? ", " : NULL, cmd->errmsg, NULL);
-
-        return cmd->AP_TAKE2(parms, mconfig, w, *w2 ? w2 : NULL);
-
-    case TAKE3:
-        w = ap_getword_conf(parms->pool, &args);
-        w2 = ap_getword_conf(parms->pool, &args);
-        w3 = ap_getword_conf(parms->pool, &args);
-
-        if (*w == '\0' || *w2 == '\0' || *w3 == '\0' || *args != 0)
-            return apr_pstrcat(parms->pool, cmd->name, " takes three arguments",
-                               cmd->errmsg ? ", " : NULL, cmd->errmsg, NULL);
-
-        return cmd->AP_TAKE3(parms, mconfig, w, w2, w3);
-
-    case TAKE23:
-        w = ap_getword_conf(parms->pool, &args);
-        w2 = ap_getword_conf(parms->pool, &args);
-        w3 = *args ? ap_getword_conf(parms->pool, &args) : NULL;
-
-        if (*w == '\0' || *w2 == '\0' || *args != 0)
-            return apr_pstrcat(parms->pool, cmd->name,
-                               " takes two or three arguments",
-                               cmd->errmsg ? ", " : NULL, cmd->errmsg, NULL);
-
-        return cmd->AP_TAKE3(parms, mconfig, w, w2, w3);
-
-    case TAKE123:
-        w = ap_getword_conf(parms->pool, &args);
-        w2 = *args ? ap_getword_conf(parms->pool, &args) : NULL;
-        w3 = *args ? ap_getword_conf(parms->pool, &args) : NULL;
-
-        if (*w == '\0' || *args != 0)
-            return apr_pstrcat(parms->pool, cmd->name,
-                               " takes one, two or three arguments",
-                               cmd->errmsg ? ", " : NULL, cmd->errmsg, NULL);
-
-        return cmd->AP_TAKE3(parms, mconfig, w, w2, w3);
-
-    case TAKE13:
-        w = ap_getword_conf(parms->pool, &args);
-        w2 = *args ? ap_getword_conf(parms->pool, &args) : NULL;
-        w3 = *args ? ap_getword_conf(parms->pool, &args) : NULL;
-
-        if (*w == '\0' || (w2 && *w2 && !w3) || *args != 0)
-            return apr_pstrcat(parms->pool, cmd->name,
-                               " takes one or three arguments",
-                               cmd->errmsg ? ", " : NULL, cmd->errmsg, NULL);
-
-        return cmd->AP_TAKE3(parms, mconfig, w, w2, w3);
-
-    case ITERATE:
-        while (*(w = ap_getword_conf(parms->pool, &args)) != '\0') {
-
-            errmsg = cmd->AP_TAKE1(parms, mconfig, w);
-
-            if (errmsg && strcmp(errmsg, DECLINE_CMD) != 0)
-                return errmsg;
-        }
-
-        return errmsg;
-
-    case ITERATE2:
-        w = ap_getword_conf(parms->pool, &args);
-
-        if (*w == '\0' || *args == 0)
-            return apr_pstrcat(parms->pool, cmd->name,
-                               " requires at least two arguments",
-                               cmd->errmsg ? ", " : NULL, cmd->errmsg, NULL);
-
-        while (*(w2 = ap_getword_conf(parms->pool, &args)) != '\0') {
-
-            errmsg = cmd->AP_TAKE2(parms, mconfig, w, w2);
-
-            if (errmsg && strcmp(errmsg, DECLINE_CMD) != 0)
-                return errmsg;
-        }
-
-        return errmsg;
-
-    case FLAG:
-        w = ap_getword_conf(parms->pool, &args);
-
-        if (*w == '\0' || (strcasecmp(w, "on") && strcasecmp(w, "off")))
-            return apr_pstrcat(parms->pool, cmd->name, " must be On or Off",
-                               NULL);
-
-        return cmd->AP_FLAG(parms, mconfig, strcasecmp(w, "off") != 0);
-
-    default:
-        return apr_pstrcat(parms->pool, cmd->name,
-                           " is improperly configured internally (server bug)",
-                           NULL);
-    }
-}
-
-AP_CORE_DECLARE(const command_rec *) ap_find_command(const char *name,
-                                                     const command_rec *cmds)
-{
-    while (cmds->name) {
-        if (!strcasecmp(name, cmds->name))
-            return cmds;
-
-        ++cmds;
-    }
-
-    return NULL;
-}
-
-AP_CORE_DECLARE(const command_rec *) ap_find_command_in_modules(
-                                          const char *cmd_name, module **mod)
-{
-    const command_rec *cmdp;
-    module *modp;
-
-    for (modp = *mod; modp; modp = modp->next) {
-        if (modp->cmds && (cmdp = ap_find_command(cmd_name, modp->cmds))) {
-            *mod = modp;
-            return cmdp;
-        }
-    }
-
-    return NULL;
-}
-
-AP_CORE_DECLARE(void *) ap_set_config_vectors(server_rec *server,
-                                              ap_conf_vector_t *section_vector,
-                                              const char *section,
-                                              module *mod, apr_pool_t *pconf)
-{
-    void *section_config = ap_get_module_config(section_vector, mod);
-    void *server_config = ap_get_module_config(server->module_config, mod);
-
-    if (!section_config && mod->create_dir_config) {
-        /* ### need to fix the create_dir_config functions' prototype... */
-        section_config = (*mod->create_dir_config)(pconf, (char *)section);
-        ap_set_module_config(section_vector, mod, section_config);
-    }
-
-    if (!server_config && mod->create_server_config) {
-        server_config = (*mod->create_server_config)(pconf, server);
-        ap_set_module_config(server->module_config, mod, server_config);
-    }
-
-    return section_config;
-}
-
-static const char *execute_now(char *cmd_line, const char *args,
-                               cmd_parms *parms,
-                               apr_pool_t *p, apr_pool_t *ptemp,
-                               ap_directive_t **sub_tree,
-                               ap_directive_t *parent);
-
-static const char *ap_build_config_sub(apr_pool_t *p, apr_pool_t *temp_pool,
-                                       const char *l, cmd_parms *parms,
-                                       ap_directive_t **current,
-                                       ap_directive_t **curr_parent,
-                                       ap_directive_t **conftree)
-{
-    const char *retval = NULL;
-    const char *args;
-    char *cmd_name;
-    ap_directive_t *newdir;
-    module *mod = ap_top_module;
-    const command_rec *cmd;
-
-    if (*l == '#' || *l == '\0')
-        return NULL;
-
-#if RESOLVE_ENV_PER_TOKEN
-    args = l;
-#else
-    args = ap_resolve_env(temp_pool, l);
-#endif
-
-    cmd_name = ap_getword_conf(p, &args);
-    if (*cmd_name == '\0') {
-        /* Note: this branch should not occur. An empty line should have
-         * triggered the exit further above.
-         */
-        return NULL;
-    }
-
-    if (cmd_name[1] != '/') {
-        char *lastc = cmd_name + strlen(cmd_name) - 1;
-        if (*lastc == '>') {
-            *lastc = '\0' ;
-        }
-        if (cmd_name[0] == '<' && *args == '\0') {
-            args = ">";
-        }
-    }
-
-    newdir = apr_pcalloc(p, sizeof(ap_directive_t));
-    newdir->filename = parms->config_file->name;
-    newdir->line_num = parms->config_file->line_number;
-    newdir->directive = cmd_name;
-    newdir->args = apr_pstrdup(p, args);
-
-    if ((cmd = ap_find_command_in_modules(cmd_name, &mod)) != NULL) {
-        if (cmd->req_override & EXEC_ON_READ) {
-            ap_directive_t *sub_tree = NULL;
-
-            parms->err_directive = newdir;
-            retval = execute_now(cmd_name, args, parms, p, temp_pool,
-                                 &sub_tree, *curr_parent);
-            if (*current) {
-                (*current)->next = sub_tree;
-            }
-            else {
-                *current = sub_tree;
-                if (*curr_parent) {
-                    (*curr_parent)->first_child = (*current);
-                }
-                if (*current) {
-                    (*current)->parent = (*curr_parent);
-                }
-            }
-            if (*current) {
-                if (!*conftree) {
-                    /* Before walking *current to the end of the list,
-                     * set the head to *current.
-                     */
-                    *conftree = *current;
-                }
-                while ((*current)->next != NULL) {
-                    (*current) = (*current)->next;
-                    (*current)->parent = (*curr_parent);
-                }
-            }
-            return retval;
-        }
-    }
-
-    if (cmd_name[0] == '<') {
-        if (cmd_name[1] != '/') {
-            (*current) = ap_add_node(curr_parent, *current, newdir, 1);
-        }
-        else if (*curr_parent == NULL) {
-            parms->err_directive = newdir;
-            return apr_pstrcat(p, cmd_name,
-                               " without matching <", cmd_name + 2,
-                               " section", NULL);
-        }
-        else {
-            char *bracket = cmd_name + strlen(cmd_name) - 1;
-
-            if (*bracket != '>') {
-                parms->err_directive = newdir;
-                return apr_pstrcat(p, cmd_name,
-                                   "> directive missing closing '>'", NULL);
-            }
-
-            *bracket = '\0';
-
-            if (strcasecmp(cmd_name + 2,
-                           (*curr_parent)->directive + 1) != 0) {
-                parms->err_directive = newdir;
-                return apr_pstrcat(p, "Expected </",
-                                   (*curr_parent)->directive + 1, "> but saw ",
-                                   cmd_name, ">", NULL);
-            }
-
-            *bracket = '>';
-
-            /* done with this section; move up a level */
-            *current = *curr_parent;
-            *curr_parent = (*current)->parent;
-        }
-    }
-    else {
-        *current = ap_add_node(curr_parent, *current, newdir, 0);
-    }
-
-    return retval;
-}
-
-AP_DECLARE(const char *) ap_build_cont_config(apr_pool_t *p,
-                                              apr_pool_t *temp_pool,
-                                              cmd_parms *parms,
-                                              ap_directive_t **current,
-                                              ap_directive_t **curr_parent,
-                                              char *orig_directive)
-{
-    char *l;
-    char *bracket;
-    const char *retval;
-    ap_directive_t *sub_tree = NULL;
-
-    /* Since this function can be called recursively, allocate
-     * the temporary 8k string buffer from the temp_pool rather
-     * than the stack to avoid over-running a fixed length stack.
-     */
-    l = apr_palloc(temp_pool, MAX_STRING_LEN);
-
-    bracket = apr_pstrcat(p, orig_directive + 1, ">", NULL);
-    while (!(ap_cfg_getline(l, MAX_STRING_LEN, parms->config_file))) {
-        if (!memcmp(l, "</", 2)
-            && (strcasecmp(l + 2, bracket) == 0)
-            && (*curr_parent == NULL)) {
-            break;
-        }
-        retval = ap_build_config_sub(p, temp_pool, l, parms, current,
-                                     curr_parent, &sub_tree);
-        if (retval != NULL)
-            return retval;
-
-        if (sub_tree == NULL) {
-            sub_tree = *curr_parent;
-        }
-
-        if (sub_tree == NULL) {
-            sub_tree = *current;
-        }
-    }
-
-    *current = sub_tree;
-    return NULL;
-}
-
-static const char *ap_walk_config_sub(const ap_directive_t *current,
-                                      cmd_parms *parms,
-                                      ap_conf_vector_t *section_vector)
-{
-    const command_rec *cmd;
-    ap_mod_list *ml;
-    char *dir = apr_pstrdup(parms->pool, current->directive);
-
-    ap_str_tolower(dir);
-
-    ml = apr_hash_get(ap_config_hash, dir, APR_HASH_KEY_STRING);
-
-    if (ml == NULL) {
-        parms->err_directive = current;
-        return apr_pstrcat(parms->pool, "Invalid command '",
-                           current->directive,
-                           "', perhaps misspelled or defined by a module "
-                           "not included in the server configuration",
-                           NULL);
-    }
-
-    for ( ; ml != NULL; ml = ml->next) {
-        void *dir_config = ap_set_config_vectors(parms->server,
-                                                 section_vector,
-                                                 parms->path,
-                                                 ml->m,
-                                                 parms->pool);
-        const char *retval;
-        cmd = ml->cmd;
-
-        /* Once was enough? */
-        if (cmd->req_override & EXEC_ON_READ) {
-            continue;
-        }
-
-        retval = invoke_cmd(cmd, parms, dir_config, current->args);
-
-        if (retval != NULL && strcmp(retval, DECLINE_CMD) != 0) {
-            /* If the directive in error has already been set, don't
-             * replace it.  Otherwise, an error inside a container
-             * will be reported as occuring on the first line of the
-             * container.
-             */
-            if (!parms->err_directive) {
-                parms->err_directive = current;
-            }
-            return retval;
-        }
-    }
-
-    return NULL;
-}
-
-AP_DECLARE(const char *) ap_walk_config(ap_directive_t *current,
-                                        cmd_parms *parms,
-                                        ap_conf_vector_t *section_vector)
-{
-    ap_conf_vector_t *oldconfig = parms->context;
-
-    parms->context = section_vector;
-
-    /* scan through all directives, executing each one */
-    for (; current != NULL; current = current->next) {
-        const char *errmsg;
-
-        parms->directive = current;
-
-        /* actually parse the command and execute the correct function */
-        errmsg = ap_walk_config_sub(current, parms, section_vector);
-        if (errmsg != NULL) {
-            /* restore the context (just in case) */
-            parms->context = oldconfig;
-            return errmsg;
-        }
-    }
-
-    parms->context = oldconfig;
-    return NULL;
-}
-
-AP_DECLARE(const char *) ap_build_config(cmd_parms *parms,
-                                         apr_pool_t *p, apr_pool_t *temp_pool,
-                                         ap_directive_t **conftree)
-{
-    ap_directive_t *current = *conftree;
-    ap_directive_t *curr_parent = NULL;
-    char *l = apr_palloc (temp_pool, MAX_STRING_LEN);
-    const char *errmsg;
-
-    if (current != NULL) {
-        while (current->next) {
-            current = current->next;
-        }
-    }
-
-    while (!(ap_cfg_getline(l, MAX_STRING_LEN, parms->config_file))) {
-        errmsg = ap_build_config_sub(p, temp_pool, l, parms,
-                                     &current, &curr_parent, conftree);
-        if (errmsg != NULL)
-            return errmsg;
-
-        if (*conftree == NULL && curr_parent != NULL) {
-            *conftree = curr_parent;
-        }
-
-        if (*conftree == NULL && current != NULL) {
-            *conftree = current;
-        }
-    }
-
-    if (curr_parent != NULL) {
-        errmsg = "";
-
-        while (curr_parent != NULL) {
-            errmsg = apr_psprintf(p, "%s%s%s:%u: %s> was not closed.",
-                                  errmsg,
-                                  *errmsg == '\0' ? "" : APR_EOL_STR,
-                                  curr_parent->filename,
-                                  curr_parent->line_num,
-                                  curr_parent->directive);
-
-            parms->err_directive = curr_parent;
-            curr_parent = curr_parent->parent;
-        }
-
-        return errmsg;
-    }
-
-    return NULL;
-}
-
-/*
- * Generic command functions...
- */
-
-AP_DECLARE_NONSTD(const char *) ap_set_string_slot(cmd_parms *cmd,
-                                                   void *struct_ptr,
-                                                   const char *arg)
-{
-    int offset = (int)(long)cmd->info;
-
-    *(const char **)((char *)struct_ptr + offset) = arg;
-
-    return NULL;
-}
-
-AP_DECLARE_NONSTD(const char *) ap_set_int_slot(cmd_parms *cmd,
-                                                void *struct_ptr,
-                                                const char *arg)
-{
-    char *endptr;
-    char *error_str = NULL;
-    int offset = (int)(long)cmd->info;
-
-    *(int *)((char*)struct_ptr + offset) = strtol(arg, &endptr, 10);
-
-    if ((*arg == '\0') || (*endptr != '\0')) {
-        error_str = apr_psprintf(cmd->pool,
-                     "Invalid value for directive %s, expected integer",
-                     cmd->directive->directive);
-    }
-
-    return error_str;
-}
-
-AP_DECLARE_NONSTD(const char *) ap_set_string_slot_lower(cmd_parms *cmd,
-                                                         void *struct_ptr,
-                                                         const char *arg_)
-{
-    char *arg = apr_pstrdup(cmd->pool,arg_);
-    int offset = (int)(long)cmd->info;
-
-    ap_str_tolower(arg);
-    *(char **)((char *)struct_ptr + offset) = arg;
-
-    return NULL;
-}
-
-AP_DECLARE_NONSTD(const char *) ap_set_flag_slot(cmd_parms *cmd,
-                                                 void *struct_ptr_v, int arg)
-{
-    int offset = (int)(long)cmd->info;
-    char *struct_ptr = (char *)struct_ptr_v;
-
-    *(int *)(struct_ptr + offset) = arg ? 1 : 0;
-
-    return NULL;
-}
-
-AP_DECLARE_NONSTD(const char *) ap_set_file_slot(cmd_parms *cmd, void *struct_ptr,
-                                                 const char *arg)
-{
-    /* Prepend server_root to relative arg.
-     * This allows most args to be independent of server_root,
-     * so the server can be moved or mirrored with less pain.
-     */
-    const char *path;
-    int offset = (int)(long)cmd->info;
-
-    path = ap_server_root_relative(cmd->pool, arg);
-
-    if (!path) {
-        return apr_pstrcat(cmd->pool, "Invalid file path ",
-                           arg, NULL);
-    }
-
-    *(const char **) ((char*)struct_ptr + offset) = path;
-
-    return NULL;
-}
-
-AP_DECLARE_NONSTD(const char *) ap_set_deprecated(cmd_parms *cmd,
-                                                  void *struct_ptr,
-                                                  const char *arg)
-{
-    return cmd->cmd->errmsg;
-}
-
-/*****************************************************************
- *
- * Reading whole config files...
- */
-
-static cmd_parms default_parms =
-{NULL, 0, -1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
-
-AP_DECLARE(char *) ap_server_root_relative(apr_pool_t *p, const char *file)
-{
-    char *newpath = NULL;
-    apr_status_t rv;
-    rv = apr_filepath_merge(&newpath, ap_server_root, file,
-                            APR_FILEPATH_TRUENAME, p);
-    if (newpath && (rv == APR_SUCCESS || APR_STATUS_IS_EPATHWILD(rv)
-                                      || APR_STATUS_IS_ENOENT(rv)
-                                      || APR_STATUS_IS_ENOTDIR(rv))) {
-        return newpath;
-    }
-    else {
-        return NULL;
-    }
-}
-
-AP_DECLARE(const char *) ap_soak_end_container(cmd_parms *cmd, char *directive)
-{
-    char l[MAX_STRING_LEN];
-    const char *args;
-    char *cmd_name;
-
-    while(!(ap_cfg_getline(l, MAX_STRING_LEN, cmd->config_file))) {
-#if RESOLVE_ENV_PER_TOKEN
-        args = l;
-#else
-        args = ap_resolve_env(cmd->temp_pool, l);
-#endif
-
-        cmd_name = ap_getword_conf(cmd->pool, &args);
-        if (cmd_name[0] == '<') {
-            if (cmd_name[1] == '/') {
-                cmd_name[strlen(cmd_name) - 1] = '\0';
-
-                if (strcasecmp(cmd_name + 2, directive + 1) != 0) {
-                    return apr_pstrcat(cmd->pool, "Expected </",
-                                       directive + 1, "> but saw ",
-                                       cmd_name, ">", NULL);
-                }
-
-                return NULL; /* found end of container */
-            }
-            else {
-                const char *msg;
-
-                if (*args == '\0' && cmd_name[strlen(cmd_name) - 1] == '>') {
-                    cmd_name[strlen(cmd_name) - 1] = '\0';
-                }
-
-                if ((msg = ap_soak_end_container(cmd, cmd_name)) != NULL) {
-                    return msg;
-                }
-            }
-        }
-    }
-
-    return apr_pstrcat(cmd->pool, "Expected </",
-                       directive + 1, "> before end of configuration",
-                       NULL);
-}
-
-static const char *execute_now(char *cmd_line, const char *args,
-                               cmd_parms *parms,
-                               apr_pool_t *p, apr_pool_t *ptemp,
-                               ap_directive_t **sub_tree,
-                               ap_directive_t *parent)
-{
-    const command_rec *cmd;
-    ap_mod_list *ml;
-    char *dir = apr_pstrdup(parms->pool, cmd_line);
-
-    ap_str_tolower(dir);
-
-    ml = apr_hash_get(ap_config_hash, dir, APR_HASH_KEY_STRING);
-
-    if (ml == NULL) {
-        return apr_pstrcat(parms->pool, "Invalid command '",
-                           cmd_line,
-                           "', perhaps misspelled or defined by a module "
-                           "not included in the server configuration",
-                           NULL);
-    }
-
-    for ( ; ml != NULL; ml = ml->next) {
-        const char *retval;
-        cmd = ml->cmd;
-
-        retval = invoke_cmd(cmd, parms, sub_tree, args);
-
-        if (retval != NULL) {
-            return retval;
-        }
-    }
-
-    return NULL;
-}
-
-/* This structure and the following functions are needed for the
- * table-based config file reading. They are passed to the
- * cfg_open_custom() routine.
- */
-
-/* Structure to be passed to cfg_open_custom(): it contains an
- * index which is incremented from 0 to nelts on each call to
- * cfg_getline() (which in turn calls arr_elts_getstr())
- * and an apr_array_header_t pointer for the string array.
- */
-typedef struct {
-    apr_array_header_t *array;
-    int curr_idx;
-} arr_elts_param_t;
-
-
-/* arr_elts_getstr() returns the next line from the string array. */
-static void *arr_elts_getstr(void *buf, size_t bufsiz, void *param)
-{
-    arr_elts_param_t *arr_param = (arr_elts_param_t *)param;
-
-    /* End of array reached? */
-    if (++arr_param->curr_idx > arr_param->array->nelts)
-        return NULL;
-
-    /* return the line */
-    apr_cpystrn(buf,
-                ((char **)arr_param->array->elts)[arr_param->curr_idx - 1],
-                bufsiz);
-
-    return buf;
-}
-
-
-/* arr_elts_close(): dummy close routine (makes sure no more lines can be read) */
-static int arr_elts_close(void *param)
-{
-    arr_elts_param_t *arr_param = (arr_elts_param_t *)param;
-
-    arr_param->curr_idx = arr_param->array->nelts;
-
-    return 0;
-}
-
-static const char *process_command_config(server_rec *s,
-                                          apr_array_header_t *arr,
-                                          ap_directive_t **conftree,
-                                          apr_pool_t *p,
-                                          apr_pool_t *ptemp)
-{
-    const char *errmsg;
-    cmd_parms parms;
-    arr_elts_param_t arr_parms;
-
-    arr_parms.curr_idx = 0;
-    arr_parms.array = arr;
-
-    if (ap_config_hash == NULL) {
-        rebuild_conf_hash(s->process->pconf, 1);
-    }
-
-    parms = default_parms;
-    parms.pool = p;
-    parms.temp_pool = ptemp;
-    parms.server = s;
-    parms.override = (RSRC_CONF | OR_ALL) & ~(OR_AUTHCFG | OR_LIMIT);
-    parms.override_opts = OPT_ALL | OPT_SYM_OWNER | OPT_MULTI;
-
-    parms.config_file = ap_pcfg_open_custom(p, "-c/-C directives",
-                                            &arr_parms, NULL,
-                                            arr_elts_getstr, arr_elts_close);
-
-    errmsg = ap_build_config(&parms, p, ptemp, conftree);
-    ap_cfg_closefile(parms.config_file);
-
-    if (errmsg) {
-        return apr_pstrcat(p, "Syntax error in -C/-c directive: ", errmsg,
-                           NULL);
-    }
-
-    return NULL;
-}
-
-typedef struct {
-    char *fname;
-} fnames;
-
-static int fname_alphasort(const void *fn1, const void *fn2)
-{
-    const fnames *f1 = fn1;
-    const fnames *f2 = fn2;
-
-    return strcmp(f1->fname,f2->fname);
-}
-
-static const char *process_resource_config_nofnmatch(server_rec *s,
-                                                     const char *fname,
-                                                     ap_directive_t **conftree,
-                                                     apr_pool_t *p,
-                                                     apr_pool_t *ptemp,
-                                                     unsigned depth)
-{
-    cmd_parms parms;
-    ap_configfile_t *cfp;
-    const char *error;
-    apr_status_t rv;
-
-    if (ap_is_directory(p, fname)) {
-        apr_dir_t *dirp;
-        apr_finfo_t dirent;
-        int current;
-        apr_array_header_t *candidates = NULL;
-        fnames *fnew;
-        char *path = apr_pstrdup(p, fname);
-
-        if (++depth > AP_MAX_INCLUDE_DIR_DEPTH) {
-            return apr_psprintf(p, "Directory %s exceeds the maximum include "
-                                "directory nesting level of %u. You have "
-                                "probably a recursion somewhere.", path,
-                                AP_MAX_INCLUDE_DIR_DEPTH);
-        }
-
-        /*
-         * first course of business is to grok all the directory
-         * entries here and store 'em away. Recall we need full pathnames
-         * for this.
-         */
-        rv = apr_dir_open(&dirp, path, p);
-        if (rv != APR_SUCCESS) {
-            char errmsg[120];
-            return apr_psprintf(p, "Could not open config directory %s: %s",
-                                path, apr_strerror(rv, errmsg, sizeof errmsg));
-        }
-
-        candidates = apr_array_make(p, 1, sizeof(fnames));
-        while (apr_dir_read(&dirent, APR_FINFO_DIRENT, dirp) == APR_SUCCESS) {
-            /* strip out '.' and '..' */
-            if (strcmp(dirent.name, ".")
-                && strcmp(dirent.name, "..")) {
-                fnew = (fnames *) apr_array_push(candidates);
-                fnew->fname = ap_make_full_path(p, path, dirent.name);
-            }
-        }
-
-        apr_dir_close(dirp);
-        if (candidates->nelts != 0) {
-            qsort((void *) candidates->elts, candidates->nelts,
-                  sizeof(fnames), fname_alphasort);
-
-            /*
-             * Now recurse these... we handle errors and subdirectories
-             * via the recursion, which is nice
-             */
-            for (current = 0; current < candidates->nelts; ++current) {
-                fnew = &((fnames *) candidates->elts)[current];
-                error = process_resource_config_nofnmatch(s, fnew->fname,
-                                                          conftree, p, ptemp,
-                                                          depth);
-                if (error) {
-                    return error;
-                }
-            }
-        }
-
-        return NULL;
-    }
-
-    /* GCC's initialization extensions are soooo nice here... */
-    parms = default_parms;
-    parms.pool = p;
-    parms.temp_pool = ptemp;
-    parms.server = s;
-    parms.override = (RSRC_CONF | OR_ALL) & ~(OR_AUTHCFG | OR_LIMIT);
-    parms.override_opts = OPT_ALL | OPT_SYM_OWNER | OPT_MULTI;
-
-    rv = ap_pcfg_openfile(&cfp, p, fname);
-    if (rv != APR_SUCCESS) {
-        char errmsg[120];
-        return apr_psprintf(p, "Could not open configuration file %s: %s",
-                            fname, apr_strerror(rv, errmsg, sizeof errmsg));
-    }
-
-    parms.config_file = cfp;
-    error = ap_build_config(&parms, p, ptemp, conftree);
-    ap_cfg_closefile(cfp);
-
-    if (error) {
-        return apr_psprintf(p, "Syntax error on line %d of %s: %s",
-                            parms.err_directive->line_num,
-                            parms.err_directive->filename, error);
-    }
-
-    return NULL;
-}
-
-AP_DECLARE(const char *) ap_process_resource_config(server_rec *s,
-                                                    const char *fname,
-                                                    ap_directive_t **conftree,
-                                                    apr_pool_t *p,
-                                                    apr_pool_t *ptemp)
-{
-    /* XXX: lstat() won't work on the wildcard pattern...
-     */
-
-    /* don't require conf/httpd.conf if we have a -C or -c switch */
-    if ((ap_server_pre_read_config->nelts
-        || ap_server_post_read_config->nelts)
-        && !(strcmp(fname, ap_server_root_relative(p, SERVER_CONFIG_FILE)))) {
-        apr_finfo_t finfo;
-
-        if (apr_stat(&finfo, fname, APR_FINFO_LINK | APR_FINFO_TYPE, p) != APR_SUCCESS)
-            return NULL;
-    }
-
-    if (!apr_fnmatch_test(fname)) {
-        return process_resource_config_nofnmatch(s, fname, conftree, p, ptemp,
-                                                 0);
-    }
-    else {
-        apr_dir_t *dirp;
-        apr_finfo_t dirent;
-        int current;
-        apr_array_header_t *candidates = NULL;
-        fnames *fnew;
-        apr_status_t rv;
-        char *path = apr_pstrdup(p, fname), *pattern = NULL;
-
-        pattern = ap_strrchr(path, '/');
-
-        AP_DEBUG_ASSERT(pattern != NULL); /* path must be absolute. */
-
-        *pattern++ = '\0';
-
-        if (apr_fnmatch_test(path)) {
-            return apr_pstrcat(p, "Wildcard patterns not allowed in Include ",
-                               fname, NULL);
-        }
-
-        if (!ap_is_directory(p, path)){
-            return apr_pstrcat(p, "Include directory '", path, "' not found",
-                               NULL);
-        }
-
-        if (!apr_fnmatch_test(pattern)) {
-            return apr_pstrcat(p, "Must include a wildcard pattern for "
-                               "Include ", fname, NULL);
-        }
-
-        /*
-         * first course of business is to grok all the directory
-         * entries here and store 'em away. Recall we need full pathnames
-         * for this.
-         */
-        rv = apr_dir_open(&dirp, path, p);
-        if (rv != APR_SUCCESS) {
-            char errmsg[120];
-            return apr_psprintf(p, "Could not open config directory %s: %s",
-                                path, apr_strerror(rv, errmsg, sizeof errmsg));
-        }
-
-        candidates = apr_array_make(p, 1, sizeof(fnames));
-        while (apr_dir_read(&dirent, APR_FINFO_DIRENT, dirp) == APR_SUCCESS) {
-            /* strip out '.' and '..' */
-            if (strcmp(dirent.name, ".")
-                && strcmp(dirent.name, "..")
-                && (apr_fnmatch(pattern, dirent.name,
-                                APR_FNM_PERIOD) == APR_SUCCESS)) {
-                fnew = (fnames *) apr_array_push(candidates);
-                fnew->fname = ap_make_full_path(p, path, dirent.name);
-            }
-        }
-
-        apr_dir_close(dirp);
-        if (candidates->nelts != 0) {
-            const char *error;
-
-            qsort((void *) candidates->elts, candidates->nelts,
-                  sizeof(fnames), fname_alphasort);
-
-            /*
-             * Now recurse these... we handle errors and subdirectories
-             * via the recursion, which is nice
-             */
-            for (current = 0; current < candidates->nelts; ++current) {
-                fnew = &((fnames *) candidates->elts)[current];
-                error = process_resource_config_nofnmatch(s, fnew->fname,
-                                                          conftree, p,
-                                                          ptemp, 0);
-                if (error) {
-                    return error;
-                }
-            }
-        }
-    }
-
-    return NULL;
-}
-
-AP_DECLARE(int) ap_process_config_tree(server_rec *s,
-                                       ap_directive_t *conftree,
-                                       apr_pool_t *p,
-                                       apr_pool_t *ptemp)
-{
-    const char *errmsg;
-    cmd_parms parms;
-
-    parms = default_parms;
-    parms.pool = p;
-    parms.temp_pool = ptemp;
-    parms.server = s;
-    parms.override = (RSRC_CONF | OR_ALL) & ~(OR_AUTHCFG | OR_LIMIT);
-    parms.override_opts = OPT_ALL | OPT_SYM_OWNER | OPT_MULTI;
-    parms.limited = -1;
-
-    errmsg = ap_walk_config(conftree, &parms, s->lookup_defaults);
-    if (errmsg) {
-        ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, p,
-                     "Syntax error on line %d of %s:",
-                     parms.err_directive->line_num,
-                     parms.err_directive->filename);
-        ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, p,
-                     "%s", errmsg);
-        return HTTP_INTERNAL_SERVER_ERROR;
-    }
-
-    return OK;
-}
-
-AP_CORE_DECLARE(int) ap_parse_htaccess(ap_conf_vector_t **result,
-                                       request_rec *r, int override,
-                                       int override_opts,
-                                       const char *d, const char *access_name)
-{
-    ap_configfile_t *f = NULL;
-    cmd_parms parms;
-    char *filename = NULL;
-    const struct htaccess_result *cache;
-    struct htaccess_result *new;
-    ap_conf_vector_t *dc = NULL;
-    apr_status_t status;
-
-    /* firstly, search cache */
-    for (cache = r->htaccess; cache != NULL; cache = cache->next) {
-        if (cache->override == override && strcmp(cache->dir, d) == 0) {
-            *result = cache->htaccess;
-            return OK;
-        }
-    }
-
-    parms = default_parms;
-    parms.override = override;
-    parms.override_opts = override_opts;
-    parms.pool = r->pool;
-    parms.temp_pool = r->pool;
-    parms.server = r->server;
-    parms.path = apr_pstrdup(r->pool, d);
-
-    /* loop through the access names and find the first one */
-    while (access_name[0]) {
-        /* AFAICT; there is no use of the actual 'filename' against
-         * any canonicalization, so we will simply take the given
-         * name, ignoring case sensitivity and aliases
-         */
-        filename = ap_make_full_path(r->pool, d,
-                                     ap_getword_conf(r->pool, &access_name));
-        status = ap_pcfg_openfile(&f, r->pool, filename);
-
-        if (status == APR_SUCCESS) {
-            const char *errmsg;
-            ap_directive_t *temptree = NULL;
-
-            dc = ap_create_per_dir_config(r->pool);
-
-            parms.config_file = f;
-            errmsg = ap_build_config(&parms, r->pool, r->pool, &temptree);
-            if (errmsg == NULL)
-                errmsg = ap_walk_config(temptree, &parms, dc);
-
-            ap_cfg_closefile(f);
-
-            if (errmsg) {
-                ap_log_rerror(APLOG_MARK, APLOG_ALERT, 0, r,
-                              "%s: %s", filename, errmsg);
-                return HTTP_INTERNAL_SERVER_ERROR;
-            }
-
-            *result = dc;
-            break;
-        }
-        else {
-            if (!APR_STATUS_IS_ENOENT(status)
-                && !APR_STATUS_IS_ENOTDIR(status)) {
-                ap_log_rerror(APLOG_MARK, APLOG_CRIT, status, r,
-                              "%s pcfg_openfile: unable to check htaccess file, "
-                              "ensure it is readable",
-                              filename);
-                apr_table_setn(r->notes, "error-notes",
-                               "Server unable to read htaccess file, denying "
-                               "access to be safe");
-                return HTTP_FORBIDDEN;
-            }
-        }
-    }
-
-    /* cache it */
-    new = apr_palloc(r->pool, sizeof(struct htaccess_result));
-    new->dir = parms.path;
-    new->override = override;
-    new->override_opts = override_opts;
-    new->htaccess = dc;
-
-    /* add to head of list */
-    new->next = r->htaccess;
-    r->htaccess = new;
-
-    return OK;
-}
-
-AP_CORE_DECLARE(const char *) ap_init_virtual_host(apr_pool_t *p,
-                                                   const char *hostname,
-                                                   server_rec *main_server,
-                                                   server_rec **ps)
-{
-    server_rec *s = (server_rec *) apr_pcalloc(p, sizeof(server_rec));
-
-    /* TODO: this crap belongs in http_core */
-    s->process = main_server->process;
-    s->server_admin = NULL;
-    s->server_hostname = NULL;
-    s->server_scheme = NULL;
-    s->error_fname = NULL;
-    s->timeout = 0;
-    s->keep_alive_timeout = 0;
-    s->keep_alive = -1;
-    s->keep_alive_max = -1;
-    s->error_log = main_server->error_log;
-    s->loglevel = main_server->loglevel;
-    /* useful default, otherwise we get a port of 0 on redirects */
-    s->port = main_server->port;
-    s->next = NULL;
-
-    s->is_virtual = 1;
-    s->names = apr_array_make(p, 4, sizeof(char **));
-    s->wild_names = apr_array_make(p, 4, sizeof(char **));
-
-    s->module_config = create_empty_config(p);
-    s->lookup_defaults = ap_create_per_dir_config(p);
-
-    s->limit_req_line = main_server->limit_req_line;
-    s->limit_req_fieldsize = main_server->limit_req_fieldsize;
-    s->limit_req_fields = main_server->limit_req_fields;
-
-    *ps = s;
-
-    return ap_parse_vhost_addrs(p, hostname, s);
-}
-
-
-AP_DECLARE(void) ap_fixup_virtual_hosts(apr_pool_t *p, server_rec *main_server)
-{
-    server_rec *virt;
-
-    for (virt = main_server->next; virt; virt = virt->next) {
-        merge_server_configs(p, main_server->module_config,
-                             virt->module_config);
-
-        virt->lookup_defaults =
-            ap_merge_per_dir_configs(p, main_server->lookup_defaults,
-                                     virt->lookup_defaults);
-
-        if (virt->server_admin == NULL)
-            virt->server_admin = main_server->server_admin;
-
-        if (virt->timeout == 0)
-            virt->timeout = main_server->timeout;
-
-        if (virt->keep_alive_timeout == 0)
-            virt->keep_alive_timeout = main_server->keep_alive_timeout;
-
-        if (virt->keep_alive == -1)
-            virt->keep_alive = main_server->keep_alive;
-
-        if (virt->keep_alive_max == -1)
-            virt->keep_alive_max = main_server->keep_alive_max;
-
-        /* XXX: this is really something that should be dealt with by a
-         * post-config api phase
-         */
-        ap_core_reorder_directories(p, virt);
-    }
-
-    ap_core_reorder_directories(p, main_server);
-}
-
-/*****************************************************************
- *
- * Getting *everything* configured...
- */
-
-static void init_config_globals(apr_pool_t *p)
-{
-    /* Global virtual host hash bucket pointers.  Init to null. */
-    ap_init_vhost_config(p);
-}
-
-static server_rec *init_server_config(process_rec *process, apr_pool_t *p)
-{
-    apr_status_t rv;
-    server_rec *s = (server_rec *) apr_pcalloc(p, sizeof(server_rec));
-
-    apr_file_open_stderr(&s->error_log, p);
-    s->process = process;
-    s->port = 0;
-    s->server_admin = DEFAULT_ADMIN;
-    s->server_hostname = NULL;
-    s->server_scheme = NULL;
-    s->error_fname = DEFAULT_ERRORLOG;
-    s->loglevel = DEFAULT_LOGLEVEL;
-    s->limit_req_line = DEFAULT_LIMIT_REQUEST_LINE;
-    s->limit_req_fieldsize = DEFAULT_LIMIT_REQUEST_FIELDSIZE;
-    s->limit_req_fields = DEFAULT_LIMIT_REQUEST_FIELDS;
-    s->timeout = apr_time_from_sec(DEFAULT_TIMEOUT);
-    s->keep_alive_timeout = apr_time_from_sec(DEFAULT_KEEPALIVE_TIMEOUT);
-    s->keep_alive_max = DEFAULT_KEEPALIVE;
-    s->keep_alive = 1;
-    s->next = NULL;
-    s->addrs = apr_pcalloc(p, sizeof(server_addr_rec));
-
-    /* NOT virtual host; don't match any real network interface */
-    rv = apr_sockaddr_info_get(&s->addrs->host_addr,
-                               NULL, APR_INET, 0, 0, p);
-    ap_assert(rv == APR_SUCCESS); /* otherwise: bug or no storage */
-
-    s->addrs->host_port = 0; /* matches any port */
-    s->addrs->virthost = ""; /* must be non-NULL */
-    s->names = s->wild_names = NULL;
-
-    s->module_config = create_server_config(p, s);
-    s->lookup_defaults = create_default_per_dir_config(p);
-
-    return s;
-}
-
-
-AP_DECLARE(server_rec*) ap_read_config(process_rec *process, apr_pool_t *ptemp,
-                                       const char *filename,
-                                       ap_directive_t **conftree)
-{
-    const char *confname, *error;
-    apr_pool_t *p = process->pconf;
-    server_rec *s = init_server_config(process, p);
-
-    init_config_globals(p);
-
-    /* All server-wide config files now have the SAME syntax... */
-    error = process_command_config(s, ap_server_pre_read_config, conftree,
-                                   p, ptemp);
-    if (error) {
-        ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, 0, NULL, "%s: %s",
-                     ap_server_argv0, error);
-        return NULL;
-    }
-
-    /* process_command_config may change the ServerRoot so
-     * compute this config file name afterwards.
-     */
-    confname = ap_server_root_relative(p, filename);
-
-    if (!confname) {
-        ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT,
-                     APR_EBADPATH, NULL, "Invalid config file path %s",
-                     filename);
-        return NULL;
-    }
-
-    error = ap_process_resource_config(s, confname, conftree, p, ptemp);
-    if (error) {
-        ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, 0, NULL,
-                     "%s: %s", ap_server_argv0, error);
-        return NULL;
-    }
-
-    error = process_command_config(s, ap_server_post_read_config, conftree,
-                                   p, ptemp);
-
-    if (error) {
-        ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, 0, NULL, "%s: %s",
-                     ap_server_argv0, error);
-        return NULL;
-    }
-
-    return s;
-}
-
-AP_DECLARE(void) ap_single_module_configure(apr_pool_t *p, server_rec *s,
-                                            module *m)
-{
-    if (m->create_server_config)
-        ap_set_module_config(s->module_config, m,
-                             (*m->create_server_config)(p, s));
-
-    if (m->create_dir_config)
-        ap_set_module_config(s->lookup_defaults, m,
-                             (*m->create_dir_config)(p, NULL));
-}
-
-AP_DECLARE(void) ap_run_rewrite_args(process_rec *process)
-{
-    module *m;
-
-    for (m = ap_top_module; m; m = m->next) {
-        if (m->rewrite_args) {
-            (*m->rewrite_args)(process);
-        }
-    }
-}
-
-/********************************************************************
- * Configuration directives are restricted in terms of where they may
- * appear in the main configuration files and/or .htaccess files according
- * to the bitmask req_override in the command_rec structure.
- * If any of the overrides set in req_override are also allowed in the
- * context in which the command is read, then the command is allowed.
- * The context is determined as follows:
- *
- *    inside *.conf --> override = (RSRC_CONF|OR_ALL)&~(OR_AUTHCFG|OR_LIMIT);
- *    within <Directory> or <Location> --> override = OR_ALL|ACCESS_CONF;
- *    within .htaccess --> override = AllowOverride for current directory;
- *
- * the result is, well, a rather confusing set of possibilities for when
- * a particular directive is allowed to be used.  This procedure prints
- * in English where the given (pc) directive can be used.
- */
-static void show_overrides(const command_rec *pc, module *pm)
-{
-    int n = 0;
-
-    printf("\tAllowed in *.conf ");
-    if ((pc->req_override & (OR_OPTIONS | OR_FILEINFO | OR_INDEXES))
-        || ((pc->req_override & RSRC_CONF)
-        && ((pc->req_override & (ACCESS_CONF | OR_AUTHCFG | OR_LIMIT))))) {
-        printf("anywhere");
-    }
-    else if (pc->req_override & RSRC_CONF) {
-        printf("only outside <Directory>, <Files> or <Location>");
-    }
-    else {
-        printf("only inside <Directory>, <Files> or <Location>");
-    }
-
-    /* Warn if the directive is allowed inside <Directory> or .htaccess
-     * but module doesn't support per-dir configuration
-     */
-    if ((pc->req_override & (OR_ALL | ACCESS_CONF)) && !pm->create_dir_config)
-        printf(" [no per-dir config]");
-
-    if (pc->req_override & OR_ALL) {
-        printf(" and in .htaccess\n\twhen AllowOverride");
-
-        if ((pc->req_override & OR_ALL) == OR_ALL) {
-            printf(" isn't None");
-        }
-        else {
-            printf(" includes ");
-
-            if (pc->req_override & OR_AUTHCFG) {
-                if (n++)
-                    printf(" or ");
-
-                printf("AuthConfig");
-            }
-
-            if (pc->req_override & OR_LIMIT) {
-                if (n++)
-                    printf(" or ");
-
-                printf("Limit");
-            }
-
-            if (pc->req_override & OR_OPTIONS) {
-                if (n++)
-                    printf(" or ");
-
-                printf("Options");
-            }
-
-            if (pc->req_override & OR_FILEINFO) {
-                if (n++)
-                    printf(" or ");
-
-                printf("FileInfo");
-            }
-
-            if (pc->req_override & OR_INDEXES) {
-                if (n++)
-                    printf(" or ");
-
-                printf("Indexes");
-            }
-        }
-    }
-
-    printf("\n");
-}
-
-/* Show the preloaded configuration directives, the help string explaining
- * the directive arguments, in what module they are handled, and in
- * what parts of the configuration they are allowed.  Used for httpd -L.
- */
-AP_DECLARE(void) ap_show_directives(void)
-{
-    const command_rec *pc;
-    int n;
-
-    for (n = 0; ap_loaded_modules[n]; ++n) {
-        for (pc = ap_loaded_modules[n]->cmds; pc && pc->name; ++pc) {
-            printf("%s (%s)\n", pc->name, ap_loaded_modules[n]->name);
-
-            if (pc->errmsg)
-                printf("\t%s\n", pc->errmsg);
-
-            show_overrides(pc, ap_loaded_modules[n]);
-        }
-    }
-}
-
-/* Show the preloaded module names.  Used for httpd -l. */
-AP_DECLARE(void) ap_show_modules(void)
-{
-    int n;
-
-    printf("Compiled in modules:\n");
-    for (n = 0; ap_loaded_modules[n]; ++n)
-        printf("  %s\n", ap_loaded_modules[n]->name);
-}
-
-AP_DECLARE(const char *) ap_show_mpm(void)
-{
-    return MPM_NAME;
-}

=== removed directory '.pc/009_apache2_has_dso'
=== removed directory '.pc/009_apache2_has_dso/support'
=== removed file '.pc/009_apache2_has_dso/support/apxs.in'
--- .pc/009_apache2_has_dso/support/apxs.in	2011-12-29 12:09:14 +0000
+++ .pc/009_apache2_has_dso/support/apxs.in	1970-01-01 00:00:00 +0000
@@ -1,768 +0,0 @@
-#!@perlbin@ -w
-#
-# 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.
-
-require 5.004;
-use strict;
-package apxs;
-
-##
-##  Configuration
-##
-
-my %config_vars = ();
-
-my $installbuilddir = "@exp_installbuilddir@";
-get_config_vars("$installbuilddir/config_vars.mk",\%config_vars);
-
-# read the configuration variables once
-
-my $prefix         = get_vars("prefix");
-my $CFG_PREFIX     = $prefix;
-my $exec_prefix    = get_vars("exec_prefix");
-my $datadir        = get_vars("datadir");
-my $localstatedir  = get_vars("localstatedir");
-my $CFG_TARGET     = get_vars("progname");
-my $CFG_SYSCONFDIR = get_vars("sysconfdir");
-my $CFG_CFLAGS     = join ' ', map { get_vars($_) }
-  qw(SHLTCFLAGS CFLAGS NOTEST_CPPFLAGS EXTRA_CPPFLAGS EXTRA_CFLAGS);
-my $includedir     = get_vars("includedir");
-my $CFG_INCLUDEDIR = eval qq("$includedir");
-my $CFG_CC         = get_vars("CC");
-my $libexecdir     = get_vars("libexecdir");
-my $CFG_LIBEXECDIR = eval qq("$libexecdir");
-my $sbindir        = get_vars("sbindir");
-my $CFG_SBINDIR    = eval qq("$sbindir");
-my $ltflags        = $ENV{'LTFLAGS'};
-$ltflags or $ltflags = "--silent";
-
-my %internal_vars = map {$_ => 1}
-    qw(TARGET CC CFLAGS CFLAGS_SHLIB LD_SHLIB LDFLAGS_SHLIB LIBS_SHLIB
-       PREFIX SBINDIR INCLUDEDIR LIBEXECDIR SYSCONFDIR);
-
-##
-##  parse argument line
-##
-
-#   defaults for parameters
-my $opt_n = '';
-my $opt_g = '';
-my $opt_c = 0;
-my $opt_o = '';
-my @opt_D = ();
-my @opt_I = ();
-my @opt_L = ();
-my @opt_l = ();
-my @opt_W = ();
-my @opt_S = ();
-my $opt_e = 0;
-my $opt_i = 0;
-my $opt_a = 0;
-my $opt_A = 0;
-my $opt_q = 0;
-my $opt_h = 0;
-my $opt_p = 0;
-
-#   this subroutine is derived from Perl's getopts.pl with the enhancement of
-#   the "+" metacharacter at the format string to allow a list to be built by
-#   subsequent occurrences of the same option.
-sub Getopts {
-    my ($argumentative, @ARGV) = @_;
-    my $errs = 0;
-    local $_;
-
-    my @args = split / */, $argumentative;
-    while (@ARGV && ($_ = $ARGV[0]) =~ /^-(.)(.*)/) {
-        my ($first, $rest) = ($1,$2);
-        if ($_ =~ m|^--$|) {
-            shift @ARGV;
-            last;
-        }
-        my $pos = index($argumentative,$first);
-        if ($pos >= 0) {
-            if ($pos < $#args && $args[$pos+1] eq ':') {
-                shift @ARGV;
-                if ($rest eq '') {
-                    unless (@ARGV) {
-                        error("Incomplete option: $first (needs an argument)");
-                        $errs++;
-                    }
-                    $rest = shift(@ARGV);
-                }
-                eval "\$opt_$first = \$rest;";
-            }
-            elsif ($pos < $#args && $args[$pos+1] eq '+') {
-                shift @ARGV;
-                if ($rest eq '') {
-                    unless (@ARGV) {
-                        error("Incomplete option: $first (needs an argument)");
-                        $errs++;
-                    }
-                    $rest = shift(@ARGV);
-                }
-                eval "push(\@opt_$first, \$rest);";
-            }
-            else {
-                eval "\$opt_$first = 1";
-                if ($rest eq '') {
-                    shift(@ARGV);
-                }
-                else {
-                    $ARGV[0] = "-$rest";
-                }
-            }
-        }
-        else {
-            error("Unknown option: $first");
-            $errs++;
-            if ($rest ne '') {
-                $ARGV[0] = "-$rest";
-            }
-            else {
-                shift(@ARGV);
-            }
-        }
-    }
-    return ($errs == 0, @ARGV);
-}
-
-sub usage {
-    print STDERR "Usage: apxs -g [-S <var>=<val>] -n <modname>\n";
-    print STDERR "       apxs -q [-S <var>=<val>] <query> ...\n";
-    print STDERR "       apxs -c [-S <var>=<val>] [-o <dsofile>] [-D <name>[=<value>]]\n";
-    print STDERR "               [-I <incdir>] [-L <libdir>] [-l <libname>] [-Wc,<flags>]\n";
-    print STDERR "               [-Wl,<flags>] [-p] <files> ...\n";
-    print STDERR "       apxs -i [-S <var>=<val>] [-a] [-A] [-n <modname>] <dsofile> ...\n";
-    print STDERR "       apxs -e [-S <var>=<val>] [-a] [-A] [-n <modname>] <dsofile> ...\n";
-    exit(1);
-}
-
-#   option handling
-my $rc;
-($rc, @ARGV) = &Getopts("qn:gco:I+D+L+l+W+S+eiaAp", @ARGV);
-&usage if ($rc == 0);
-&usage if ($#ARGV == -1 and not $opt_g);
-&usage if (not $opt_q and not ($opt_g and $opt_n) and not $opt_i and not $opt_c and not $opt_e);
-
-#   argument handling
-my @args = @ARGV;
-my $name = 'unknown';
-$name = $opt_n if ($opt_n ne '');
-
-if (@opt_S) {
-    my ($opt_S);
-    foreach $opt_S (@opt_S) {
-	if ($opt_S =~ m/^([^=]+)=(.*)$/) {
-	    my ($var) = $1;
-	    my ($val) = $2;
-	    my $oldval = eval "\$CFG_$var";
-
-	    unless ($var and $oldval) {
-		print STDERR "apxs:Error: no config variable $var\n";
-		&usage;
-	    }
-
-	    eval "\$CFG_${var}=\"${val}\"";
-	} else {
-	    print STDERR "apxs:Error: malformatted -S option\n";
-	    &usage;
-	}	
-    }
-}
-
-##
-##  Initial shared object support check
-##
-my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
-$httpd = eval qq("$httpd");
-$httpd = eval qq("$httpd");
-my $envvars = get_vars("sbindir") . "/envvars";
-$envvars = eval qq("$envvars");
-$envvars = eval qq("$envvars");
-
-#allow apxs to be run from the source tree, before installation
-if ($0 =~ m:support/apxs$:) {
-    ($httpd = $0) =~ s:support/apxs$::;
-}
-
-unless (-x "$httpd") {
-	error("$httpd not found or not executable");
-	exit 1;
-}
-
-unless (grep /mod_so/, `. $envvars && $httpd -l`) {
-    error("Sorry, no shared object support for Apache");
-    error("available under your platform. Make sure");
-    error("the Apache module mod_so is compiled into");
-    error("your server binary `$httpd'.");
-    exit 1;
-}
-
-sub get_config_vars{
-    my ($file, $rh_config) = @_;
-
-    open IN, $file or die "cannot open $file: $!";
-    while (<IN>){
-        if (/^\s*(.*?)\s*=\s*(.*)$/){
-            $rh_config->{$1} = $2;
-        }
-    }
-    close IN;
-}
-
-sub get_vars {
-    my $result = '';
-    my $ok = 0;
-    my $arg;
-    foreach $arg (@_) {
-        if (exists $config_vars{$arg} or exists $config_vars{lc $arg}) {
-            my $val = exists $config_vars{$arg}
-                ? $config_vars{$arg}
-                : $config_vars{lc $arg};
-            $val =~ s/[()]//g;
-            $result .= eval "qq($val)" if defined $val;
-            $result .= ";;";
-            $ok = 1;
-        }
-        if (not $ok) {
-            if (exists $internal_vars{$arg} or exists $internal_vars{lc $arg}) {
-                my $val = exists $internal_vars{$arg} ? $arg : lc $arg;
-                $val = eval "\$CFG_$val";
-                $result .= eval "qq($val)" if defined $val;
-                $result .= ";;";
-                $ok = 1;
-            }
-            if (not $ok) {
-                error("Invalid query string `$arg'");
-                exit(1);
-            }
-        }
-    }
-    $result =~ s|;;$||;
-    $result =~ s|:| |;
-    return $result;
-}
-
-##
-##  Operation
-##
-
-#   helper function for executing a list of
-#   system command with return code checks
-sub execute_cmds {
-    my (@cmds) = @_;
-    my ($cmd, $rc);
-
-    foreach $cmd (@cmds) {
-        notice($cmd);
-        $rc = system $cmd;
-        if ($rc) {
-            error(sprintf "Command failed with rc=%d\n", $rc << 8);
-            exit 1 ;
-        }
-    }
-}
-
-if ($opt_g) {
-    ##
-    ##  SAMPLE MODULE SOURCE GENERATION
-    ##
-
-    if (-d $name) {
-        error("Directory `$name' already exists. Remove first");
-        exit(1);
-    }
-
-    my $data = join('', <DATA>);
-    $data =~ s|%NAME%|$name|sg;
-    $data =~ s|%TARGET%|$CFG_TARGET|sg;
-    $data =~ s|%PREFIX%|$prefix|sg;
-    $data =~ s|%INSTALLBUILDDIR%|$installbuilddir|sg;
-
-    my ($mkf, $mods, $src) = ($data =~ m|^(.+)-=#=-\n(.+)-=#=-\n(.+)|s);
-
-    notice("Creating [DIR]  $name");
-    system("mkdir $name");
-    notice("Creating [FILE] $name/Makefile");
-    open(FP, ">${name}/Makefile") || die;
-    print FP $mkf;
-    close(FP);
-    notice("Creating [FILE] $name/modules.mk");
-    open(FP, ">${name}/modules.mk") || die;
-    print FP $mods;
-    close(FP);
-    notice("Creating [FILE] $name/mod_$name.c");
-    open(FP, ">${name}/mod_${name}.c") || die;
-    print FP $src;
-    close(FP);
-    notice("Creating [FILE] $name/.deps");
-    system("touch ${name}/.deps");
-
-    exit(0);
-}
-
-
-if ($opt_q) {
-    ##
-    ##  QUERY INFORMATION 
-    ##
-    my $result = get_vars(@args);
-    print "$result\n";
-}
-
-my $apr_config = get_vars("APR_CONFIG");
-
-if (! -x "$apr_config") {
-    error("$apr_config not found!");
-    exit(1);
-}
-
-my $apu_config = get_vars("APU_CONFIG");
-
-if (! -x "$apu_config") {
-    error("$apu_config not found!");
-    exit(1);
-}
-
-my $libtool = `$apr_config --apr-libtool`;
-chomp($libtool);
-
-my $apr_includedir = `$apr_config --includes`;
-chomp($apr_includedir);
-my $apu_includedir = `$apu_config --includes`;
-chomp($apu_includedir);
-
-if ($opt_c) {
-    ##
-    ##  SHARED OBJECT COMPILATION
-    ##
-
-    #   split files into sources and objects
-    my @srcs = ();
-    my @objs = ();
-    my $f;
-    foreach $f (@args) {
-        if ($f =~ m|\.c$|) {
-            push(@srcs, $f);
-        }
-        else {
-            push(@objs, $f);
-        }
-    }
-
-    #   determine output file
-    my $dso_file;
-    if ($opt_o eq '') {
-        if ($#srcs > -1) {
-            $dso_file = $srcs[0];
-            $dso_file =~ s|\.[^.]+$|.la|;
-        }
-        elsif ($#objs > -1) {
-            $dso_file = $objs[0];
-            $dso_file =~ s|\.[^.]+$|.la|;
-        }
-        else {
-            $dso_file = "mod_unknown.la";
-        }
-    }
-    else {
-        $dso_file = $opt_o;
-        $dso_file =~ s|\.[^.]+$|.la|;
-    }
-
-    #   create compilation commands
-    my @cmds = ();
-    my $opt = '';
-    my ($opt_Wc, $opt_I, $opt_D);
-    foreach $opt_Wc (@opt_W) {
-        $opt .= "$1 " if ($opt_Wc =~ m|^\s*c,(.*)$|);
-    }
-    foreach $opt_I (@opt_I) {
-        $opt .= "-I$opt_I ";
-    }
-    foreach $opt_D (@opt_D) {
-        $opt .= "-D$opt_D ";
-    }
-    my $cflags = "$CFG_CFLAGS";
-    my $s;
-    my $mod;
-    foreach $s (@srcs) {
-        my $slo = $s;
-        $slo =~ s|\.c$|.slo|;
-        my $lo = $s;
-        $lo =~ s|\.c$|.lo|;
-        my $la = $s;
-        $la =~ s|\.c$|.la|;
-        my $o = $s;
-        $o =~ s|\.c$|.o|;
-        push(@cmds, "$libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $apr_includedir $apu_includedir $opt -c -o $lo $s && touch $slo");
-        unshift(@objs, $lo);
-    }
-
-    #   create link command
-    my $o;
-    my $lo;	
-    foreach $o (@objs) {
-        $lo .= " $o";
-    }
-    my ($opt_Wl, $opt_L, $opt_l);
-    $opt = '';
-    foreach $opt_Wl (@opt_W) {
-        $opt .= "$1 " if ($opt_Wl =~ m|^\s*l,(.*)$|);
-    }
-    foreach $opt_L (@opt_L) {
-        $opt .= " -L$opt_L";
-    }
-    foreach $opt_l (@opt_l) {
-        $opt .= " -l$opt_l";
-    }
-
-    if ($opt_p == 1) {
-        
-        my $apr_libs=`$apr_config --cflags --ldflags --link-libtool --libs`;
-        chomp($apr_libs);
-        my $apu_libs=`$apu_config --ldflags --link-libtool --libs`;
-        chomp($apu_libs);
-        
-        $opt .= " ".$apu_libs." ".$apr_libs;
-    }
-    else {
-        my $apr_ldflags=`$apr_config --ldflags`;
-        chomp($apr_ldflags);
-        $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags";
-    }
-
-    push(@cmds, "$libtool $ltflags --mode=link $CFG_CC -o $dso_file $opt $lo");
-
-    #   execute the commands
-    &execute_cmds(@cmds);
-
-    #   allow one-step compilation and installation
-    if ($opt_i or $opt_e) {
-        @args = ( $dso_file );
-    }
-}
-
-if ($opt_i or $opt_e) {
-    ##
-    ##  SHARED OBJECT INSTALLATION
-    ##
-
-    #   determine installation commands
-    #   and corresponding LoadModule directive
-    my @lmd = ();
-    my @cmds = ();
-    my $f;
-    foreach $f (@args) {
-        #  ack all potential gcc, hp/ux, win32+os2+aix and os/x extensions
-        if ($f !~ m#(\.so$|\.la$|\.sl$|\.dll$|\.dylib$|)#) {
-            error("file $f is not a shared object");
-            exit(1);
-        }
-        my $t = $f;
-        $t =~ s|^.+/([^/]+)$|$1|;
-        #  use .so unambigiously for installed shared library modules
-        $t =~ s|\.[^./\\]+$|\.so|;
-        if ($opt_i) {
-	    push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
-                 "$libtool' $f $CFG_LIBEXECDIR");
-	    push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
-        }
-
-        #   determine module symbolname and filename
-        my $filename = '';
-        if ($name eq 'unknown') {
-            $name = '';
-            my $base = $f;
-            $base =~ s|\.[^.]+$||;
-            if (-f "$base.c") {
-                open(FP, "<$base.c");
-                my $content = join('', <FP>);
-                close(FP);
-                if ($content =~ m|.*module\s+(?:AP_MODULE_DECLARE_DATA\s+)?([a-zA-Z0-9_]+)_module\s*=\s*.*|s) {
-                    $name = "$1";
-                    $filename = "$base.c";
-                    $filename =~ s|^[^/]+/||;
-                }
-            }
-            if ($name eq '') {
-                if ($base =~ m|.*mod_([a-zA-Z0-9_]+)\..+|) {
-                    $name = "$1";
-                    $filename = $base;
-                    $filename =~ s|^[^/]+/||;
-                }
-            }
-            if ($name eq '') {
-                error("Sorry, cannot determine bootstrap symbol name");
-                error("Please specify one with option `-n'");
-                exit(1);
-            }
-        }
-        if ($filename eq '') {
-            $filename = "mod_${name}.c";
-        }
-        my $dir = $CFG_LIBEXECDIR;
-        $dir =~ s|^$CFG_PREFIX/?||;
-        $dir =~ s|(.)$|$1/|;
-	$t =~ s|\.la$|.so|;
-        push(@lmd, sprintf("LoadModule %-18s %s", "${name}_module", "$dir$t"));
-    }
-
-    #   execute the commands
-    &execute_cmds(@cmds);
-
-    #   activate module via LoadModule/AddModule directive
-    if ($opt_a or $opt_A) {
-        if (not -f "$CFG_SYSCONFDIR/$CFG_TARGET.conf") {
-            error("Config file $CFG_SYSCONFDIR/$CFG_TARGET.conf not found");
-            exit(1);
-        }
-
-        open(FP, "<$CFG_SYSCONFDIR/$CFG_TARGET.conf") || die;
-        my $content = join('', <FP>);
-        close(FP);
-
-        if ($content !~ m|\n#?\s*LoadModule\s+|) {
-            error("Activation failed for custom $CFG_SYSCONFDIR/$CFG_TARGET.conf file.");
-            error("At least one `LoadModule' directive already has to exist.");
-            exit(1);
-        }
-
-        my $lmd;
-        my $c = '';
-        $c = '#' if ($opt_A);
-        foreach $lmd (@lmd) {
-            my $what = $opt_A ? "preparing" : "activating";
-            my $lmd_re = $lmd;
-            $lmd_re =~ s/\s+/\\s+/g;
-
-            if ($content !~ m|\n#?\s*$lmd_re|) {
-                # check for open <containers>, so that the new LoadModule
-                # directive always appears *outside* of an <container>.
-
-                my $before = ($content =~ m|^(.*\n)#?\s*LoadModule\s+[^\n]+\n|s)[0];
-
-                # the '()=' trick forces list context and the scalar
-                # assignment counts the number of list members (aka number
-                # of matches) then
-                my $cntopen = () = ($before =~ m|^\s*<[^/].*$|mg);
-                my $cntclose = () = ($before =~ m|^\s*</.*$|mg);
-
-                if ($cntopen == $cntclose) {
-                    # fine. Last LoadModule is contextless.
-                    $content =~ s|^(.*\n#?\s*LoadModule\s+[^\n]+\n)|$1$c$lmd\n|s;
-                }
-                elsif ($cntopen < $cntclose) {
-                    error('Configuration file is not valid. There are sections'
-                          . ' closed before opened.');
-                    exit(1);
-                }
-                else {
-                    # put our cmd after the section containing the last
-                    # LoadModule.
-                    my $found =
-                    $content =~ s!\A (               # string and capture start
-                                  (?:(?:
-                                    ^\s*             # start of conf line with a
-                                    (?:[^<]|<[^/])   # directive which does not
-                                                     # start with '</'
-
-                                    .*(?:$)\n        # rest of the line.
-                                                     # the '$' is in parentheses
-                                                     # to avoid misinterpreting
-                                                     # the string "$\" as
-                                                     # perl variable.
-
-                                    )*               # catch as much as possible
-                                                     # of such lines. (including
-                                                     # zero)
-
-                                    ^\s*</.*(?:$)\n? # after the above, we
-                                                     # expect a config line with
-                                                     # a closing container (</)
-
-                                  ) {$cntopen}       # the whole pattern (bunch
-                                                     # of lines that end up with
-                                                     # a closing directive) must
-                                                     # be repeated $cntopen
-                                                     # times. That's it.
-                                                     # Simple, eh? ;-)
-
-                                  )                  # capture end
-                                 !$1$c$lmd\n!mx;
-
-                    unless ($found) {
-                        error('Configuration file is not valid. There are '
-                              . 'sections opened and not closed.');
-                        exit(1);
-                    }
-                }
-            } else {
-                # replace already existing LoadModule line
-                $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1$c$lmd\n|s;
-            }
-            $lmd =~ m|LoadModule\s+(.+?)_module.*|;
-            notice("[$what module `$1' in $CFG_SYSCONFDIR/$CFG_TARGET.conf]");
-        }
-        if (@lmd) {
-            if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) {
-                print FP $content;
-                close(FP);
-                system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf $CFG_SYSCONFDIR/$CFG_TARGET.conf.bak && " .
-                       "cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " .
-                       "rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new");
-            } else {
-                notice("unable to open configuration file");
-            }
-	}
-    }
-}
-
-sub error{
-    print STDERR "apxs:Error: $_[0].\n";
-}
-
-sub notice{
-    print STDERR "$_[0]\n";
-}
-
-##EOF##
-__DATA__
-##
-##  Makefile -- Build procedure for sample %NAME% Apache module
-##  Autogenerated via ``apxs -n %NAME% -g''.
-##
-
-builddir=.
-top_srcdir=%PREFIX%
-top_builddir=%PREFIX%
-include %INSTALLBUILDDIR%/special.mk
-
-#   the used tools
-APXS=apxs
-APACHECTL=apachectl
-
-#   additional defines, includes and libraries
-#DEFS=-Dmy_define=my_value
-#INCLUDES=-Imy/include/dir
-#LIBS=-Lmy/lib/dir -lmylib
-
-#   the default target
-all: local-shared-build
-
-#   install the shared object file into Apache 
-install: install-modules-yes
-
-#   cleanup
-clean:
-	-rm -f mod_%NAME%.o mod_%NAME%.lo mod_%NAME%.slo mod_%NAME%.la 
-
-#   simple test
-test: reload
-	lynx -mime_header http://localhost/%NAME%
-
-#   install and activate shared object by reloading Apache to
-#   force a reload of the shared object file
-reload: install restart
-
-#   the general Apache start/restart/stop
-#   procedures
-start:
-	$(APACHECTL) start
-restart:
-	$(APACHECTL) restart
-stop:
-	$(APACHECTL) stop
-
--=#=-
-mod_%NAME%.la: mod_%NAME%.slo
-	$(SH_LINK) -rpath $(libexecdir) -module -avoid-version  mod_%NAME%.lo
-DISTCLEAN_TARGETS = modules.mk
-shared =  mod_%NAME%.la
--=#=-
-/* 
-**  mod_%NAME%.c -- Apache sample %NAME% module
-**  [Autogenerated via ``apxs -n %NAME% -g'']
-**
-**  To play with this sample module first compile it into a
-**  DSO file and install it into Apache's modules directory 
-**  by running:
-**
-**    $ apxs -c -i mod_%NAME%.c
-**
-**  Then activate it in Apache's %TARGET%.conf file for instance
-**  for the URL /%NAME% in as follows:
-**
-**    #   %TARGET%.conf
-**    LoadModule %NAME%_module modules/mod_%NAME%.so
-**    <Location /%NAME%>
-**    SetHandler %NAME%
-**    </Location>
-**
-**  Then after restarting Apache via
-**
-**    $ apachectl restart
-**
-**  you immediately can request the URL /%NAME% and watch for the
-**  output of this module. This can be achieved for instance via:
-**
-**    $ lynx -mime_header http://localhost/%NAME% 
-**
-**  The output should be similar to the following one:
-**
-**    HTTP/1.1 200 OK
-**    Date: Tue, 31 Mar 1998 14:42:22 GMT
-**    Server: Apache/1.3.4 (Unix)
-**    Connection: close
-**    Content-Type: text/html
-**  
-**    The sample page from mod_%NAME%.c
-*/ 
-
-#include "httpd.h"
-#include "http_config.h"
-#include "http_protocol.h"
-#include "ap_config.h"
-
-/* The sample content handler */
-static int %NAME%_handler(request_rec *r)
-{
-    if (strcmp(r->handler, "%NAME%")) {
-        return DECLINED;
-    }
-    r->content_type = "text/html";      
-
-    if (!r->header_only)
-        ap_rputs("The sample page from mod_%NAME%.c\n", r);
-    return OK;
-}
-
-static void %NAME%_register_hooks(apr_pool_t *p)
-{
-    ap_hook_handler(%NAME%_handler, NULL, NULL, APR_HOOK_MIDDLE);
-}
-
-/* Dispatch list for API hooks */
-module AP_MODULE_DECLARE_DATA %NAME%_module = {
-    STANDARD20_MODULE_STUFF, 
-    NULL,                  /* create per-dir    config structures */
-    NULL,                  /* merge  per-dir    config structures */
-    NULL,                  /* create per-server config structures */
-    NULL,                  /* merge  per-server config structures */
-    NULL,                  /* table of config file commands       */
-    %NAME%_register_hooks  /* register hooks                      */
-};
-

=== removed directory '.pc/010_fhs_compliance'
=== removed file '.pc/010_fhs_compliance/config.layout'
--- .pc/010_fhs_compliance/config.layout	2011-12-29 12:09:14 +0000
+++ .pc/010_fhs_compliance/config.layout	1970-01-01 00:00:00 +0000
@@ -1,324 +0,0 @@
-##
-##  config.layout -- Pre-defined Installation Path Layouts
-##
-##  Hints:
-##  - layouts can be loaded with configure's --enable-layout=ID option
-##  - when no --enable-layout option is given, the default layout is `Apache'
-##  - a trailing plus character (`+') on paths is replaced with a 
-##    `/<target>' suffix where <target> is currently hardcoded to 'apache2'.
-##    (This may become a configurable parameter at some point.)
-##
-
-#   Classical Apache path layout.
-<Layout Apache>
-    prefix:        /usr/local/apache2
-    exec_prefix:   ${prefix}
-    bindir:        ${exec_prefix}/bin
-    sbindir:       ${exec_prefix}/bin
-    libdir:        ${exec_prefix}/lib
-    libexecdir:    ${exec_prefix}/modules
-    mandir:        ${prefix}/man
-    sysconfdir:    ${prefix}/conf
-    datadir:       ${prefix}
-    installbuilddir: ${datadir}/build
-    errordir:      ${datadir}/error
-    iconsdir:      ${datadir}/icons
-    htdocsdir:     ${datadir}/htdocs
-    manualdir:     ${datadir}/manual
-    cgidir:        ${datadir}/cgi-bin
-    includedir:    ${prefix}/include
-    localstatedir: ${prefix}
-    runtimedir:    ${localstatedir}/logs
-    logfiledir:    ${localstatedir}/logs
-    proxycachedir: ${localstatedir}/proxy
-</Layout>
-
-#   GNU standards conforming path layout.
-#   See FSF's GNU project `make-stds' document for details.
-<Layout GNU>
-    prefix:        /usr/local
-    exec_prefix:   ${prefix}
-    bindir:        ${exec_prefix}/bin
-    sbindir:       ${exec_prefix}/sbin
-    libdir:        ${exec_prefix}/lib
-    libexecdir:    ${exec_prefix}/libexec
-    mandir:        ${prefix}/man
-    sysconfdir:    ${prefix}/etc+
-    datadir:       ${prefix}/share+
-    installbuilddir: ${datadir}/build
-    errordir:      ${datadir}/error
-    iconsdir:      ${datadir}/icons
-    htdocsdir:     ${datadir}/htdocs
-    manualdir:     ${datadir}/manual
-    cgidir:        ${datadir}/cgi-bin
-    includedir:    ${prefix}/include+
-    localstatedir: ${prefix}/var+
-    runtimedir:    ${localstatedir}/run
-    logfiledir:    ${localstatedir}/log
-    proxycachedir: ${localstatedir}/proxy
-</Layout>
-
-#   Mac OS X Server (Rhapsody)
-<Layout Mac OS X Server>
-    prefix:        /Local/Library/WebServer
-    exec_prefix:   /usr
-    bindir:        ${exec_prefix}/bin
-    sbindir:       ${exec_prefix}/sbin
-    libdir:        ${exec_prefix}/lib
-    libexecdir:    /System/Library/Apache/Modules
-    mandir:        ${exec_prefix}/share/man
-    sysconfdir:    ${prefix}/Configuration
-    datadir:       ${prefix}
-    installbuilddir: /System/Library/Apache/Build
-    errordir:      /System/Library/Apache/Error
-    iconsdir:      /System/Library/Apache/Icons
-    manualdir:     /System/Library/Apache/Manual
-    htdocsdir:     ${datadir}/Documents
-    cgidir:        ${datadir}/CGI-Executables
-    includedir:    /System/Library/Frameworks/Apache.framework/Versions/2.0/Headers
-    localstatedir: /var
-    runtimedir:    ${prefix}/Logs
-    logfiledir:    ${prefix}/Logs
-    proxycachedir: ${prefix}/ProxyCache
-</Layout>
-
-#   Darwin/Mac OS Layout
-<Layout Darwin>
-    prefix:        /usr
-    exec_prefix:   ${prefix}
-    bindir:        ${exec_prefix}/bin
-    sbindir:       ${exec_prefix}/sbin
-    libdir:        ${exec_prefix}/lib
-    libexecdir:    ${exec_prefix}/libexec+
-    mandir:        ${prefix}/share/man
-    datadir:       /Library/WebServer
-    sysconfdir:    /etc+
-    installbuilddir: ${prefix}/share/httpd/build
-    errordir:      ${prefix}/share/httpd/error
-    iconsdir:      ${prefix}/share/httpd/icons
-    htdocsdir:     ${datadir}/Documents
-    manualdir:     ${datadir}/share/httpd/manual
-    cgidir:        ${datadir}/CGI-Executables
-    includedir:    ${prefix}/include+
-    localstatedir: /var
-    runtimedir:    ${localstatedir}/run
-    logfiledir:    ${localstatedir}/log+
-    proxycachedir: ${runtimedir}/proxy
-</Layout>
-
-#   Red Hat Linux 7.x layout
-<Layout RedHat>
-    prefix:        /usr
-    exec_prefix:   ${prefix}
-    bindir:        ${prefix}/bin
-    sbindir:       ${prefix}/sbin
-    libdir:        ${prefix}/lib
-    libexecdir:    ${prefix}/lib/apache
-    mandir:        ${prefix}/man
-    sysconfdir:    /etc/httpd/conf
-    datadir:       /var/www
-    installbuilddir: ${datadir}/build
-    errordir:      ${datadir}/error
-    iconsdir:      ${datadir}/icons
-    htdocsdir:     ${datadir}/html
-    manualdir:     ${datadir}/manual
-    cgidir:        ${datadir}/cgi-bin
-    includedir:    ${prefix}/include/apache
-    localstatedir: /var
-    runtimedir:    ${localstatedir}/run
-    logfiledir:    ${localstatedir}/log/httpd
-    proxycachedir: ${localstatedir}/cache/httpd
-</Layout>     
-
-#   According to the /opt filesystem conventions
-<Layout opt>
-    prefix:        /opt/apache
-    exec_prefix:   ${prefix}
-    bindir:        ${exec_prefix}/bin
-    sbindir:       ${exec_prefix}/sbin
-    libdir:        ${exec_prefix}/lib
-    libexecdir:    ${exec_prefix}/libexec
-    mandir:        ${prefix}/man
-    sysconfdir:    /etc${prefix}
-    datadir:       ${prefix}/share
-    installbuilddir: ${datadir}/build
-    errordir:      ${datadir}/error
-    iconsdir:      ${datadir}/icons
-    htdocsdir:     ${datadir}/htdocs
-    manualdir:     ${datadir}/manual
-    cgidir:        ${datadir}/cgi-bin
-    includedir:    ${prefix}/include
-    localstatedir: /var${prefix}
-    runtimedir:    ${localstatedir}/run
-    logfiledir:    ${localstatedir}/logs
-    proxycachedir: ${localstatedir}/proxy
-</Layout>
-
-#  BeOS layout...
-<Layout beos>
-    prefix:        /boot/home/apache
-    exec_prefix:   ${prefix}
-    bindir:        ${exec_prefix}/bin
-    sbindir:       ${exec_prefix}/bin
-    libdir:        ${exec_prefix}/lib
-    libexecdir:    ${exec_prefix}/libexec
-    mandir:        ${prefix}/man
-    sysconfdir:    ${prefix}/conf
-    datadir:       ${prefix}
-    installbuilddir: ${datadir}/build
-    errordir:      ${datadir}/error
-    iconsdir:      ${datadir}/icons
-    htdocsdir:     ${datadir}/htdocs
-    manualdir:     ${datadir}/manual
-    cgidir:        ${datadir}/cgi-bin
-    includedir:    ${prefix}/include
-    localstatedir: ${prefix}
-    runtimedir:    ${localstatedir}/logs
-    logfiledir:    ${localstatedir}/logs
-    proxycachedir: ${localstatedir}/proxy
-</Layout>
-
-#   SuSE 6.x layout
-<Layout SuSE>
-    prefix:        /usr
-    exec_prefix:   ${prefix}
-    bindir:        ${prefix}/bin
-    sbindir:       ${prefix}/sbin
-    libdir:        ${prefix}/lib
-    libexecdir:    ${prefix}/lib/apache
-    mandir:        ${prefix}/share/man
-    sysconfdir:    /etc/httpd
-    datadir:       /usr/local/httpd
-    installbuilddir: ${datadir}/build
-    errordir:      ${datadir}/error
-    iconsdir:      ${datadir}/icons
-    htdocsdir:     ${datadir}/htdocs
-    manualdir:     ${datadir}/manual
-    cgidir:        ${datadir}/cgi-bin
-    includedir:    ${prefix}/include/apache
-    localstatedir: /var/lib/httpd
-    runtimedir:    /var/run
-    logfiledir:    /var/log/httpd
-    proxycachedir: /var/cache/httpd
-</Layout>
-
-#   BSD/OS layout
-<Layout BSDI>
-    prefix:        /var/www
-    exec_prefix:   /usr/contrib
-    bindir:        ${exec_prefix}/bin
-    sbindir:       ${exec_prefix}/bin
-    libdir:        ${exec_prefix}/lib
-    libexecdir:    ${exec_prefix}/libexec/apache
-    mandir:        ${exec_prefix}/man
-    sysconfdir:    ${prefix}/conf
-    datadir:       ${prefix}
-    installbuilddir: ${datadir}/build
-    errordir:      ${datadir}/error
-    iconsdir:      ${datadir}/icons
-    htdocsdir:     ${datadir}/htdocs
-    manualdir:     ${datadir}/manual
-    cgidir:        ${datadir}/cgi-bin
-    includedir:    ${exec_prefix}/include/apache
-    localstatedir: /var
-    runtimedir:    ${localstatedir}/run
-    logfiledir:    ${localstatedir}/log/httpd
-    proxycachedir: ${localstatedir}/proxy
-</Layout>
-
-#   Solaris 8 Layout
-<Layout Solaris>
-    prefix:        /usr/apache
-    exec_prefix:   ${prefix}
-    bindir:        ${exec_prefix}/bin
-    sbindir:       ${exec_prefix}/bin
-    libdir:        ${exec_prefix}/lib
-    libexecdir:    ${exec_prefix}/libexec
-    mandir:        ${exec_prefix}/man
-    sysconfdir:    /etc/apache
-    datadir:       /var/apache
-    installbuilddir: ${datadir}/build
-    errordir:      ${datadir}/error
-    iconsdir:      ${datadir}/icons
-    htdocsdir:     ${datadir}/htdocs
-    manualdir:     ${datadir}/manual
-    cgidir:        ${datadir}/cgi-bin
-    includedir:    ${exec_prefix}/include
-    localstatedir: ${prefix}
-    runtimedir:    /var/run
-    logfiledir:    ${datadir}/logs
-    proxycachedir: ${datadir}/proxy
-</Layout>
-
-#   OpenBSD Layout
-<Layout OpenBSD>
-    prefix:        /var/www
-    exec_prefix:   /usr
-    bindir:        ${exec_prefix}/bin
-    sbindir:       ${exec_prefix}/sbin
-    libdir:        ${exec_prefix}/lib
-    libexecdir:    ${exec_prefix}/lib/apache/modules
-    mandir:        ${exec_prefix}/share/man
-    sysconfdir:    ${prefix}/conf
-    datadir:       ${prefix}
-    installbuilddir: ${prefix}/build
-    errordir:      ${prefix}/error
-    iconsdir:      ${prefix}/icons
-    htdocsdir:     ${prefix}/htdocs
-    manualdir:     ${datadir}/manual
-    cgidir:        ${prefix}/cgi-bin
-    includedir:    ${exec_prefix}/lib/apache/include
-    localstatedir: ${prefix}
-    runtimedir:    ${prefix}/logs
-    logfiledir:    ${prefix}/logs
-    proxycachedir: ${prefix}/proxy
-</Layout>
-
-# FreeBSD Layout
-<Layout FreeBSD>
-  prefix:        /usr/local
-  exec_prefix:   ${prefix}
-  bindir:        ${exec_prefix}/bin
-  sbindir:       ${exec_prefix}/sbin
-  libdir:        ${exec_prefix}/lib
-  libexecdir:    ${exec_prefix}/libexec/apache2
-  mandir:        ${prefix}/man
-  sysconfdir:    ${prefix}/etc/apache2
-  datadir:       ${prefix}/www
-  installbuilddir: ${prefix}/share/apache2/build
-  errordir:      ${datadir}/error
-  iconsdir:      ${datadir}/icons
-  htdocsdir:     ${datadir}/data
-  manualdir:     ${prefix}/share/doc/apache2
-  cgidir:        ${datadir}/cgi-bin
-  includedir:    ${prefix}/include/apache2
-  localstatedir: /var
-  runtimedir:    ${localstatedir}/run
-  logfiledir:    ${localstatedir}/log
-  proxycachedir: ${datadir}/proxy
-</Layout>
-
-# Debian layout
-<Layout Debian>
-    prefix:        
-    exec_prefix:   ${prefix}/usr
-    bindir:        ${exec_prefix}/bin
-    sbindir:       ${exec_prefix}/sbin
-    libdir:        ${exec_prefix}/lib
-    libexecdir:    ${exec_prefix}/lib/apache2/modules
-    mandir:        ${exec_prefix}/share/man
-    sysconfdir:    ${prefix}/etc/apache2
-    datadir:       ${exec_prefix}/share/apache2
-    iconsdir:      ${datadir}/icons
-    htdocsdir:     ${prefix}/usr/share/apache2/default-site/htdocs
-    manualdir:     ${htdocsdir}/manual
-    cgidir:        ${prefix}/usr/lib/cgi-bin
-    includedir:    ${exec_prefix}/include/apache2
-    localstatedir: ${prefix}/var/run
-    runtimedir:    ${prefix}/var/run
-    logfiledir:    ${prefix}/var/log/apache2
-    proxycachedir: ${prefix}/var/cache/apache2/proxy
-    infodir:       ${exec_prefix}/share/info
-    installbuilddir: ${prefix}/etc/apache2/build
-    errordir:      ${datadir}/error
-</Layout>

=== removed file '.pc/010_fhs_compliance/configure'
--- .pc/010_fhs_compliance/configure	2011-12-29 12:09:14 +0000
+++ .pc/010_fhs_compliance/configure	1970-01-01 00:00:00 +0000
@@ -1,20482 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 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 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=:
-  # 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
-fi
-
-
-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
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (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
-  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
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# 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.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # 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
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell [e-mail] about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-  fi
-  $as_echo "$as_me: error: $1" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  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'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  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
-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'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 7<&0 </dev/null 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
-
-ac_unique_file="ABOUT_APACHE"
-enable_option_checking=no
-ac_default_prefix=/usr/local/apache2
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='LTLIBOBJS
-LIBOBJS
-HTTPD_VERSION
-ap_make_delimiter
-ap_make_include
-perlbin
-APU_CONFIG
-APU_VERSION
-APU_INCLUDEDIR
-APU_BINDIR
-APR_CONFIG
-APR_VERSION
-APR_INCLUDEDIR
-APR_BINDIR
-DSO_MODULES
-INSTALL_PROG_FLAGS
-MK_IMPLIB
-SH_LIBTOOL
-SH_LIBS
-CORE_IMPLIB
-CORE_IMPLIB_FILE
-nonssl_listen_stmt_2
-nonssl_listen_stmt_1
-SSLPORT
-PORT
-MODULE_CLEANDIRS
-MODULE_DIRS
-LIBTOOL
-NOTEST_LIBS
-NOTEST_LDFLAGS
-NOTEST_CXXFLAGS
-NOTEST_CFLAGS
-NOTEST_CPPFLAGS
-INCLUDES
-UTIL_LDFLAGS
-HTTPD_LDFLAGS
-SH_LDFLAGS
-LT_LDFLAGS
-LTFLAGS
-CXXFLAGS
-CXX
-other_targets
-proxycachedir
-runtimedir
-installbuilddir
-iconsdir
-errordir
-manualdir
-htdocsdir
-logfiledir
-cgidir
-abs_srcdir
-EXTRA_INCLUDES
-EXTRA_LIBS
-EXTRA_LDFLAGS
-EXTRA_CXXFLAGS
-EXTRA_CFLAGS
-EXTRA_CPPFLAGS
-AP_CLEAN_SRCLIB_DIRS
-AP_BUILD_SRCLIB_DIRS
-AP_LIBS
-shared_build
-POST_SHARED_CMDS
-PRE_SHARED_CMDS
-OS_SPECIFIC_VARS
-SHLIBPATH_VAR
-BUILTIN_LIBS
-OS_DIR
-OS
-MPM_LIB
-progname
-MOD_SO_LDADD
-INSTALL_DSO
-MOD_REWRITE_LDADD
-MOD_ALIAS_LDADD
-MOD_USERDIR_LDADD
-MOD_SPELING_LDADD
-MOD_ACTIONS_LDADD
-MOD_IMAGEMAP_LDADD
-MOD_DIR_LDADD
-MOD_NEGOTIATION_LDADD
-MOD_VHOST_ALIAS_LDADD
-MOD_DAV_LOCK_LDADD
-MOD_DAV_FS_LDADD
-MOD_CGI_LDADD
-MOD_CGID_LDADD
-MOD_SUEXEC_LDADD
-MOD_INFO_LDADD
-MOD_ASIS_LDADD
-MOD_AUTOINDEX_LDADD
-MOD_STATUS_LDADD
-MOD_DAV_LDADD
-MOD_MIME_LDADD
-MOD_HTTP_LDADD
-APACHECTL_ULIMIT
-NONPORTABLE_SUPPORT
-httxt2dbm_LTFLAGS
-htcacheclean_LTFLAGS
-checkgid_LTFLAGS
-ab_LTFLAGS
-htdbm_LTFLAGS
-logresolve_LTFLAGS
-rotatelogs_LTFLAGS
-htdigest_LTFLAGS
-htpasswd_LTFLAGS
-MPM_SUBDIR_NAME
-MPM_NAME
-MOD_OPTIONAL_FN_EXPORT_LDADD
-MOD_OPTIONAL_FN_IMPORT_LDADD
-MOD_OPTIONAL_HOOK_IMPORT_LDADD
-MOD_OPTIONAL_HOOK_EXPORT_LDADD
-MOD_SSL_LDADD
-SSL_LIBS
-MOD_PROXY_BALANCER_LDADD
-MOD_PROXY_AJP_LDADD
-MOD_PROXY_SCGI_LDADD
-MOD_PROXY_HTTP_LDADD
-MOD_PROXY_FTP_LDADD
-MOD_PROXY_CONNECT_LDADD
-MOD_PROXY_LDADD
-MOD_VERSION_LDADD
-MOD_SETENVIF_LDADD
-MOD_UNIQUE_ID_LDADD
-MOD_USERTRACK_LDADD
-MOD_IDENT_LDADD
-MOD_HEADERS_LDADD
-MOD_EXPIRES_LDADD
-MOD_CERN_META_LDADD
-MOD_MIME_MAGIC_LDADD
-MOD_ENV_LDADD
-MOD_LOGIO_LDADD
-MOD_LOG_FORENSIC_LDADD
-MOD_LOG_CONFIG_LDADD
-MOD_LDAP_LDADD
-MOD_DEFLATE_LDADD
-MOD_CHARSET_LITE_LDADD
-MOD_SUBSTITUTE_LDADD
-MOD_FILTER_LDADD
-MOD_INCLUDE_LDADD
-MOD_EXT_FILTER_LDADD
-MOD_REQTIMEOUT_LDADD
-MOD_CASE_FILTER_IN_LDADD
-MOD_CASE_FILTER_LDADD
-MOD_EXAMPLE_LDADD
-MOD_ECHO_LDADD
-MOD_DUMPIO_LDADD
-MOD_BUCKETEER_LDADD
-MOD_DBD_LDADD
-MOD_MEM_CACHE_LDADD
-MOD_DISK_CACHE_LDADD
-MOD_CACHE_LDADD
-MOD_FILE_CACHE_LDADD
-MOD_ISAPI_LDADD
-MOD_AUTH_DIGEST_LDADD
-MOD_AUTH_BASIC_LDADD
-MOD_AUTHZ_DEFAULT_LDADD
-MOD_AUTHNZ_LDAP_LDADD
-MOD_AUTHZ_OWNER_LDADD
-MOD_AUTHZ_DBM_LDADD
-MOD_AUTHZ_USER_LDADD
-MOD_AUTHZ_GROUPFILE_LDADD
-MOD_AUTHZ_HOST_LDADD
-MOD_AUTHN_ALIAS_LDADD
-MOD_AUTHN_DEFAULT_LDADD
-MOD_AUTHN_DBD_LDADD
-MOD_AUTHN_ANON_LDADD
-MOD_AUTHN_DBM_LDADD
-MOD_AUTHN_FILE_LDADD
-PILDFLAGS
-PICFLAGS
-CRYPT_LIBS
-MKDEP
-EGREP
-GREP
-INSTALL
-MKINSTALLDIRS
-LYNX_PATH
-RANLIB
-LN_S
-AWK
-RSYNC
-PKGCONFIG
-RM
-LTCFLAGS
-SHLTCFLAGS
-PCRE_CONFIG
-CPP
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-target_os
-target_vendor
-target_cpu
-target
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-rel_proxycachedir
-exp_proxycachedir
-rel_logfiledir
-exp_logfiledir
-rel_runtimedir
-exp_runtimedir
-rel_localstatedir
-exp_localstatedir
-rel_includedir
-exp_includedir
-rel_cgidir
-exp_cgidir
-rel_manualdir
-exp_manualdir
-rel_htdocsdir
-exp_htdocsdir
-rel_iconsdir
-exp_iconsdir
-rel_errordir
-exp_errordir
-rel_installbuilddir
-exp_installbuilddir
-rel_datadir
-exp_datadir
-rel_sysconfdir
-exp_sysconfdir
-rel_mandir
-exp_mandir
-rel_libexecdir
-exp_libexecdir
-rel_libdir
-exp_libdir
-rel_sbindir
-exp_sbindir
-rel_bindir
-exp_bindir
-rel_exec_prefix
-exp_exec_prefix
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-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_reqtimeout
-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_scgi
-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'
-
-
-# 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
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
-    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 ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
-    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- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
-    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_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
-    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.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $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
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    $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
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-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 .` ||
-  as_fn_error "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  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
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-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]
-_ACEOF
-
-  cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-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
-  --enable-v4-mapped      Allow IPv6 sockets to handle IPv4 connections
-  --enable-exception-hook Enable fatal exception hook
-  --enable-maintainer-mode
-                          Turn on debugging and compile time warnings
-  --enable-pie            Build httpd as a Position Independent Executable
-  --enable-modules=MODULE-LIST
-                          Space-separated list of modules to enable | "all" |
-                          "most"
-  --enable-mods-shared=MODULE-LIST
-                          Space-separated list of shared modules to enable |
-                          "all" | "most"
-  --disable-authn-file    file-based authentication control
-  --enable-authn-dbm      DBM-based authentication control
-  --enable-authn-anon     anonymous user authentication control
-  --enable-authn-dbd      SQL-based authentication control
-  --disable-authn-default authentication backstopper
-  --enable-authn-alias    auth provider alias
-  --disable-authz-host    host-based authorization control
-  --disable-authz-groupfile
-                          'require group' authorization control
-  --disable-authz-user    'require user' authorization control
-  --enable-authz-dbm      DBM-based authorization control
-  --enable-authz-owner    'require file-owner' authorization control
-  --enable-authnz-ldap    LDAP based authentication
-  --disable-authz-default authorization control backstopper
-  --disable-auth-basic    basic authentication
-  --enable-auth-digest    RFC2617 Digest authentication
-  --enable-isapi          isapi extension support
-  --enable-file-cache     File cache
-  --enable-cache          dynamic file caching
-  --enable-disk-cache     disk caching module
-  --enable-mem-cache      memory caching module
-  --enable-dbd            Apache DBD Framework
-  --enable-bucketeer      buckets manipulation filter
-  --enable-dumpio         I/O dump filter
-  --enable-echo           ECHO server
-  --enable-example        example and demo module
-  --enable-case-filter    example uppercase conversion filter
-  --enable-case-filter-in example uppercase conversion input filter
-  --enable-reqtimeout     Limit time waiting for request from client
-  --enable-ext-filter     external filter module
-  --disable-include       Server Side Includes
-  --disable-filter        Smart Filtering
-  --enable-substitute     response content rewrite-like filtering
-  --disable-charset-lite  character set translation
-  --enable-charset-lite   character set translation
-  --enable-deflate        Deflate transfer encoding support
-  --enable-ldap           LDAP caching and connection pooling services
-  --disable-log-config    logging configuration
-  --enable-log-forensic   forensic logging
-  --enable-logio          input and output logging