delete app

Change-Id: Id4c572809969ebe89e946e88063eaed262cff3f2
Signed-off-by: hongbotian <hongbo.tianhongbo@huawei.com>

686 files changed, 0 insertions, 175938 deletions

diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/.libs/libapr-0.a b/rubbos/app/httpd-2.0.64/srclib/apr/.libs/libapr-0.a
deleted file mode 100644
index 581e7eff..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/.libs/libapr-0.a
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/.libs/libapr-0.la b/rubbos/app/httpd-2.0.64/srclib/apr/.libs/libapr-0.la
deleted file mode 100644
index 213c75df..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/.libs/libapr-0.la
+++ /dev/null
@@ -1,35 +0,0 @@
-# libapr-0.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libapr-0.so.0'
-
-# Names of this library.
-library_names='libapr-0.so.0.9.19 libapr-0.so.0 libapr-0.so'
-
-# The name of the static archive.
-old_library='libapr-0.a'
-
-# Libraries that this one depends upon.
-dependency_libs=' -lrt -lm -lcrypt -lnsl -lpthread -ldl'
-
-# Version information for libapr-0.
-current=9
-age=9
-revision=19
-
-# Is this an already installed library?
-installed=no
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/bottlenecks/rubbos/app/apache2/lib'
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/.libs/libapr-0.lai b/rubbos/app/httpd-2.0.64/srclib/apr/.libs/libapr-0.lai
deleted file mode 100644
index 7906d95a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/.libs/libapr-0.lai
+++ /dev/null
@@ -1,35 +0,0 @@
-# libapr-0.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libapr-0.so.0'
-
-# Names of this library.
-library_names='libapr-0.so.0.9.19 libapr-0.so.0 libapr-0.so'
-
-# The name of the static archive.
-old_library='libapr-0.a'
-
-# Libraries that this one depends upon.
-dependency_libs=' -lrt -lm -lcrypt -lnsl -lpthread -ldl'
-
-# Version information for libapr-0.
-current=9
-age=9
-revision=19
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/bottlenecks/rubbos/app/apache2/lib'
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/.libs/libapr-0.so b/rubbos/app/httpd-2.0.64/srclib/apr/.libs/libapr-0.so
deleted file mode 100755
index 605582aa..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/.libs/libapr-0.so
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/.libs/libapr-0.so.0 b/rubbos/app/httpd-2.0.64/srclib/apr/.libs/libapr-0.so.0
deleted file mode 100755
index 605582aa..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/.libs/libapr-0.so.0
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/.libs/libapr-0.so.0.9.19 b/rubbos/app/httpd-2.0.64/srclib/apr/.libs/libapr-0.so.0.9.19
deleted file mode 100755
index 605582aa..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/.libs/libapr-0.so.0.9.19
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/CHANGES b/rubbos/app/httpd-2.0.64/srclib/apr/CHANGES
deleted file mode 100644
index 96e7b4e2..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/CHANGES
+++ /dev/null
@@ -1,1909 +0,0 @@
-                                                     -*- coding: utf-8 -*-
-Changes with APR 0.9.19
-
-  *) SECURITY: CVE-2009-2412 (cve.mitre.org)
-     Fix overflow in pools and rmm, where size alignment was taking place.
-     [Matt Lewis <mattlewis@google.com>, Sander Striker, William Rowe]
-
-  *) Improve platform detection by updating config.guess and config.sub.
-     [Rainer Jung]
-
-Changes with APR 0.9.18
-
-  *) z/OS: return standard apr_status_t codes from apr_dso_load()
-     and apr_dso_sym().  [David Jones <oscaremma gmail.com>]
-
-  *) Fix apr_tokenize_to_argv parsing.  PR 46128
-     [Edward Rudd <eddie omegaware.com>]
-
-Changes with APR 0.9.17
-
-  *) Fix DSO-related crash on z/OS caused by incorrect memory
-     allocation.  [David Jones <oscaremma gmail.com>]
-
-  *) Define apr_ino_t in such a way that it doesn't change definition
-     based on the library consumer's -D'efines to the filesystem.
-     [Lucian Adrian Grijincu <lucian.grijincu gmail.com>]
-
-  *) Cause apr_file_dup2() on Win32 to update the MSVCRT psuedo-stdio
-     handles for fd-based and FILE * based I/O.  [William Rowe]
-
-  *) Revert Win32 to the 0.9.14 behavior of apr_proc_create() for any 
-     of the three stdio streams which are not initialized, through either
-     apr_procattr_io_set() or apr_procattr_child_XXX_set(), when given a
-     procattr_t with one or two streams which were initialized through
-     apr_procattr_child_XXX_set().  Once again, these do not inherit the 
-     parent process stdio stream to WIN32 child processes (passing 
-     INVALID_HANDLE_VALUE instead) as on Unix.  Note APR 1.3.0 adopts 
-     the Unix behavior of inheriting any uninitialized streams as the 
-     parent's corresponding stdio stream, in such cases.  [William Rowe]
-
-Changes with APR 0.9.16
-
-  *) Win32 apr_file_read: Correctly handle completion-based read-to-EOF.
-     [Steven Naim <steven.naim googlemail.com>]
-
-  *) Fixed Win32 regression of StdOutput inheritance in apr_proc_create.
-     [William Rowe]
-
-Changes with APR 0.9.15
-
-  *) Solve WinNT inherited pipe leaks by mutexing apr_proc_create calls,
-     on WinNT (not WinCE, nor 9x) so that we toggle the inherited state 
-     of the stdin/out/err pipes.  All other file handles are treated as
-     not-inherited until apr_file_dup2'ed a std handle of this process, 
-     or while they are used by apr_proc_create.  [William Rowe]
-
-  *) Define the Mac OS/X filesystem_encoding as utf-8 (in previous
-     releases the interpretation would vary).  [Branko ÄŒibej]
-
-  *) Fix day of year (tm_day) calculation for July. The bug only affects
-     Windows builds.  PR 42953.  [Davi Arnaut]
-
-Changes with APR 0.9.14
-
-  *) Register a cleanup only if APR_FILE_NOCLEANUP was not flagged in
-     apr_file_mktemp. [Brian J. France <list firehawksystems.com>]
-
-  *) Numerous build fixes for non-GCC builds and GCC builds on Win32,
-     as well as WinCE builds.  [Davi Arnaut <davi haxent.com.br>,
-     Curt Arnold <carnold apache.org>, John Mark Vandenberg, 
-     Kouhei Sutou <kou cozmixng.org>, William Rowe]
-
-  *) Discard file buffers when running cleanups for exec.
-     PR 41119.  [Davi Arnaut <davi haxent.com.br>, Bojan Smojver]
-
-  *) Improve thread safety of assorted file_io functions.
-     PR 42400.  [Davi Arnaut <davi haxent.com.br>]
-
-  *) Fix file pointer position calculation in apr_file_writev() on
-     buffered file.  PR 40963.  [Davi Arnaut <davi haxent.com.br>]
-
-Changes with APR 0.9.13
-
-  *) Fix detection of pthread cross-process robust mutexes.
-     PR 39833.  [Tsuyoshi SASAMOTO <nazonazo miobox.jp>]
-
-  *) Correctly retrieve 'empty' environment values with apr_env_get
-     on Win32 (e.g. "VAR="), and added validation to testall suite.  
-     PR 40764.  [Issac Goldstand <margol beamartyr.net>]
-
-  *) Portably check for EEXIST in mktemp code.  PR 40818
-     [Kenneth Golomb <KGolomb TradeCard.com>]
-
-  *) Fix apr_atomic_cas on platforms with 64 bit longs.
-     [Philip Martin <philip codematters.co.uk>]
-
-  *) Provide folding in autogenerated .manifest files for Win32 builders
-     using VisualStudio 2005  [William Rowe]
-
-Changes with APR 0.9.12
-
-  *) Netware - add missing apu_version.c parsing for apu_version_string()
-     to the Netware specific builds.  Unix platforms supporte this API 
-     since 0.9.1.  [Brad Nicholes]
-
-Changes with APR 0.9.11
-
-  *) Synced get-version.sh to trunk to correctly retrieve 2 digit subversion,
-     which broke the 0.9.10 candidate.  [William Rowe]
-
-  *) Fixed 'make check' target to avoid invoking sub-programs of testshm,
-     testshmconsumer and testshmproducer.  [William Rowe]
-
-  *) Permit Win32 to seek to the point 2^32-1, by checking that result
-     against the actual error and continuing on success.  [William Rowe]
-
-Changes with APR 0.9.10
-
-  *) Minor bug fixes to address various platform build and run time issues.
-
-  *) Permit 'make check' binaries to run on Darwin by omitting -no-install
-     flag [William Rowe, Joe Orton]
-
-Changes with APR 0.9.9
-
-  *) Prevent detection of robust mutex support with glibc 2.4,
-     fixing APR_LOCK_PROC_PTHREAD locks.  PR 38442.  [Joe Orton]
-
-  *) Fix apr_strerror() with glibc 2.4.  [Joe Orton]
-
-  *) Install mkdir.sh, make_exports.awk, make_var_export.awk to the APR
-     installbuilddir, and provide working accessor variables in
-     apr_rules.mk.
-     [Max Bowsher]
-
-  *) Fix seeks with files opened in xthread mode for append on win32.
-     [M Joonas Pihlaja <jpihlaja cc.helsinki.fi>, Garrett Rooney]
-
-  *) Keep testpipe.c from hanging on win32. [Garrett Rooney]
-
-  *) Cause apr_file_write_full on win32 to consider the timeout value set by 
-     apr_file_pipe_timeout_set.  PR 30182
-     [<eholyat olf.com>]
-
-  *) Fix assertion from double close of a handle with a rwlock on win32.
-     [Evgueni Brevnov <evgueni.brevnov gmail.com>]
-
-  *) Fix EOF handling for unbuffered reads on win32.
-     [Konstantin Sharenkov <Konstantin.Sharenkov enterra-inc.com>]
-
-  *) Documented that apr_stat and apr_dir_read can return APR_INCOMPLETE,
-     and how to determine which parts of the resulting apr_finfo_t can be
-     used in such a case.
-     [Garrett Rooney]
-
-  *) Fix passing "" as an argument to the program started by apr_proc_create
-     on Win32.
-     [Philip Martin <philip codematters.co.uk>
-
-  *) Fix warning when compiling on FreeBSD by correcting the type of
-     the final argument passed to sysctlbyname. [Garrett Rooney]
-
-Changes with APR 0.9.7
-
-  *) Fix crash in apr_dir_make_recursive() for relative path
-     when the working directory has been deleted.  [Joe Orton]
-
-  *) Win32: fix apr_proc_mutex_trylock() to handle WAIT_TIMEOUT,
-     returning APR_EBUSY.  [Ronen Mizrahi <ronen@tversity.com>]
-
-  *) Fix apr_file_read() to catch write failures when flushing pending
-     writes for a buffered file.  [Joe Orton]
-
-  *) Fix apr_file_write() infinite loop on write failure for buffered
-     files.  [Erik Huelsmann <ehuels gmail.com>]
-
-  *) Fix error handling where apr_uid_* and apr_gid_* could segfault
-     or return APR_SUCCESS in failure cases.  PR 34053.  [Joe Orton,
-     Paul Querna]
-
-  *) Refactor Win32 condition variables code to address bugs 27654, 34336.
-     [Henry Jen <henryjen ztune.net>, E Holyat <eholyat yahoo.com>]
-
-  *) Support APR_SO_SNDBUF and APR_SO_RCVBUF on Windows.  PR 32177.
-     [Sim <sgobbi datamanagement.it>, Jeff Trawick]
-
-  *) Fix detection of rwlocks on Mac OS X. [Aaron Bannert]
-
-  *) Fix issue with poll() followed by net I/O yielding EAGAIN on
-     Mac OS 10.4 (Darwin 8). [Wilfredo Sanchez]
-
-Changes with APR 0.9.6
-
-  *) Add apr_threadattr_stacksize_set() for overriding the default
-     stack size for threads created by apr_thread_create().
-     [Jeff Trawick]
-
-  *) Add an RPM spec file. [Graham Leggett]
-
-  *) Add a build script to create a solaris package. [Graham Leggett]
-
-Changes with APR 0.9.5
-
-  *) Prevent unbounded memory use during repeated operations on a hash table.
-     [Julian Foad <julianfoad btopenworld.com>
-
-  *) fix apr_file_dup and apr_file_dup2 win32 implementations
-     to create a mutex [Steve Hay <steve.hay uk.radan.com>]
-
-  *) Makes the threads to behave like on posix. If the thread is created
-     without APR_DETACH expect that the thread_join will be called, so don't
-     close the handle in advance, if the thread has already finished.
-     [Mladen Turk]
- 
-   *) The apr/test/Makefile.win is missing a target to build a
-     readchild.exe that test is depending on but is never built.
-     [Mladen Turk]
- 
-  *) Fix build issues in paths containing symlinks.  PR 8867.
-     [Joe Orton]
-
-  *) Update config.{guess,sub} for DragonFly BSD.  PR 29858.
-     [Joe Orton]
-
-  *) Win32: Fix bug in apr_socket_sendfile that interferred with
-     Win32 LSPs. Bug is described in Apache 2.0 bugzilla report 
-     23982 [Jan Bilek, Bill Stoddard]
-
-  *) apr_proc_create() on Unix: Remove unnecessary check for read 
-     access to the working directory of the child process.
-     PR 30137.  [Jeremy Chadwick <apache jdc.parodius.com>]
-
-  *) Win32: Fix bug tracking the file pointer on a file opened for 
-     overlapped/APR_XTHREAD io. [Bill Stoddard]
-
-  *) Fix FreeBSD atomics.  [Paul Querna <chip force-elite.com>]
-
-  *) Fix apr_snprintf() to respect precision for small floating point
-     numbers.  PR 29621.  [Artur Zaprzala <zybi talex.pl>]
-
-  *) Add command type APR_SHELLCMD_ENV for creating a process
-     which is started by the shell and which inherits the parent's
-     environment variables.  [Jeff Trawick]
-
-  *) Change default inter-process locking mechanisms: POSIX semaphores
-     and pthread cross-process mutexes are not used by default; on 
-     Solaris, fcntl locks are used by default.  [Joe Orton]
-
-  *) Don't try to enable run-time linking on AIX < 4.2, as this
-     results in invalid linker options being used.  PR 29170.  
-     [Jeff Trawick]
-
-  *) Remove apr_file_copy()'s 2Gb file size limit on some platforms.
-     [Joe Orton]
-
-  *) Don't assume getnameinfo() can handle IPv4-mapped IPv6 addresses
-     on any platforms.
-     [Jeff Trawick, Joe Orton, Colm MacCárthaigh <colm stdlib.net>]
-
-  *) Support setuid, setgid and sticky file permissions bits on Unix.
-     [André Malo]
-
-  *) Fix sign error in apr_file_seek(APR_END).
-     [Greg Hudson <ghudson MIT.EDU>]
-
-  *) Provide workaround for socklen_t declaration problem with 64-bit
-     build on HP-UX.  Stop setting a PA-RISC-specific compile option
-     on ia64.  Look for -mt thread option, which is used with HP-UX
-     vendor compiler on ia64.  [Jeff Trawick, based on idea from
-     Madhusudan Mathihalli]
-
-  *) Return an error instead of silently failing when apr_poll() is
-     used with file descriptors >= FD_SETSIZE.  (Unix systems with
-     no native poll())  [Jeff Trawick, Brad Nicholes]
-
-  *) Fix handling of negative numbers in apr_strtoi64() on platforms
-     without strtoll.  [Joe Orton]
-
-  *) Fix printing apr_int64_t values smaller than LONG_MIN on 32-bit
-     platforms in apr_vformatter.  [Joe Orton]
-
-  *) Fix apr_socket_opt_set with APR_IPV6_V6ONLY flag.  Fixes httpd
-     Listen IPv6 socket behavior on FreeBSD 5.x, OpenBSD, NetBSD.
-     [Justin Erenkrantz]
-
-  *) Fix apr_time_exp_get() for dates in 2038.  
-     [Philip Martin <philip codematters.co.uk>]
-
-  *) Add APR_LARGEFILE flag to allow opening files with the
-     O_LARGEFILE flag; not recommended for general use, see
-     include/apr_file_io.h.  [Joe Orton]
-
-  *) Various build fixes: thread_rwlock.c on some Solaris platforms
-     (PR 22990); filestat.c on ReliantUnix (PR 22990); config.status
-     on IRIX (PR 19251).  [Various]
-
-  *) Use NI_NAMEREQD instead of NI_NUMERICHOST in
-     APR_CHECK_GETNAMEINFO_IPV4_MAPPED.  PR 24469.  [Justin Erenkrantz]
-
-  *) Ensure that apr_sockaddr_info_get() does not return anything
-     other than AF_INET and AF_INET6 addresses.  [Joe Orton]
-
-  *) Clarify that apr_dir_read() does not guarantee order of returned
-     entries as previously claimed.  [Joe Orton]
-
-  *) The whole codebase was relicensed and is now available under
-     the Apache License, Version 2.0 (http://www.apache.org/licenses).
-     [Apache Software Foundation]
-
-  *) Define apr_off_t as long rather than as off_t on platforms with a
-     32-bit off_t to prevent incompatibility with packages such as
-     Perl which redefine the size of off_t via _FILE_OFFSET_BITS on
-     some platforms.  [Ben Reser <ben reser.org>]
-
-  *) apr_socket_connect(): allow app to make subsequent call on 
-     non-blocking socket.  [Jeff Trawick]
- 
-  *) Add apr_os_pipe_put_ex(), which allows the caller to tell APR
-     to establish a cleanup on the pipe.  [Jeff Trawick, Brad Nicholes]
-
-  *) Fix make_exports.awk to work with apr-iconv.  [Justin Erenkrantz]
-
-Changes with APR 0.9.4
-
-  *) win32: fix apr_file_dup() and apr_file_dup2() to dup the
-     ungetchar member [Stas Bekman]
-
-  *) Preserve leading '../' segments as when merging to an empty and
-     unrooted path - fixes a bug observed in SVN with Win32/Netware/OS2.
-     [Mike Pilato <cmpilato@collab.net>, William Rowe]
-
-  *) Work around a bug in Darwin when calling getnameinfo() on IPv4-mapped
-     IPv6-addresses.  [Colm MacCárthaigh <colm@stdlib.net>, Jeff Trawick,
-     Justin Erenkrantz]
-
-  *) Add apr_temp_dir_get() for getting the most suitable temp directory
-     [Mike Pilato <cmpilato@collab.net>, Thom May]
-
-  *) Modify apr_sockaddr_info_get to call the resolver when we
-     do not have a hostname.  Also, fix bugs in the getaddrinfo()
-     implementation.
-     [Colm MacCárthaigh <colm@stdlib.net>, Justin Erenkrantz]
-
-  *) Change the behavior of unix process 'trylock's to return
-     APR_ENOTIMPL instead of segfaulting, consistent with the
-     other lock implementations.  [William Rowe]
-
-  *) Fix a subtle race where the ownership of a unix nested
-     thread lock could be corrupted when the prior owner released
-     the lock with another thread waiting on the same lock.
-     [William Rowe]
-
-  *) apr_socket_data_set(): allow the same key to be used for
-     multiple sockets in the same pool.  [Jeff Trawick]
-
-  *) Add new table function apr_table_compress() and replace
-     red-black trees with mergesort in apr_table_overlap()
-     [Joe Schaefer <joe+gmane@sunstarsys.com>, Brian Pane]
-
-  *) Win32: Adopt Brian Havard's OS/2 rwlock implementation for
-     Windows [Marc Adkins, Bill Stoddard]
-
-  *) Add apr_proc_mutex_lockfile() for retrieving the name of the
-     file associated with a mutex.  [Jeff Trawick]
-
-  *) Don't require the lock file name to be passed into 
-     apr_proc_mutex_child_init() or apr_global_mutex_child_init().
-     This allows child init to work when the lock file was a temp
-     file created by APR.  (The problem only occurred with flock-
-     based mutexes.)  [Jeff Trawick]
-
-  *) When using a temporary file for flock- and fcntl-based mutexes, 
-     don't let the file be deleted on close.  For flock-based mutexes,
-     this corrects a fatal problem, since the file would disappear 
-     when a program was spawned and cleanup-for-exec was performed, 
-     and a subsequent attempt to perform child process mutex 
-     initialization would fail.  For fcntl-based mutexes, this was a 
-     very minor issue that resulted in a failing unlink() when the 
-     file was closed, since fcntl lock initialization always removes 
-     the file immediately.  [Jeff Trawick]
-
-  *) When writing to pipes with a timeout set, handle the situation
-     where the kernel says the pipe is writable but an attempt to
-     write <= PIPE_BUF bytes gets EAGAIN.  APR will now write whatever
-     data will fit.  APR applications that relied on the atomic nature
-     of relatively small pipe write requests may be affected.
-     PR 20295  [Mark Street <mark@faime.demon.co.uk>, Jeff Trawick]
-
-  *) Define _THREAD_SAFE for all compilations on AIX.  Previously
-     those of us who used the vendor compiler had it defined
-     implicitly and others did not.  The difference became obvious
-     with the recent thread safety fixes to apr_password_validate().
-     PR 20420  [Jeff Trawick]
-
-  *) For apr_proc_detach(APR_PROC_DETACH_FOREGROUND), don't treat
-     a setsid() failure as fatal, as the usual cause is that the
-     caller is already a process group leader.  PR 18519
-     [Jeff Trawick]
-
-  *) Fix some problems with non-blocking socket handling on unix
-     that resulted in infinite timeouts being used for non-blocking
-     sockets with apr_socket_connect() and some read/write calls.
-     [Jeff Trawick]
-
-  *) Fix a bug in socket timeout handling on unix that left the
-     socket non-blocking after disabling the timeout.
-     [Jacob Craig Lewallen <jlewalle@cs.ucr.edu>]
-
-  *) Added flag APR_FILE_ATTR_HIDDEN for manipulating the "hidden"
-     file attribute on Windows and OS/2.  [Branko ÄŒibej]
-
-  *) SECURITY [CAN-2003-0245]: Fixed a bug that could be triggered
-     remotely through mod_dav and possibly other mechanisms, causing
-     an Apache child process to crash.  The crash was first reported
-     by David Endler <DEndler@iDefense.com> and was researched and
-     fixed by Joe Orton <jorton@redhat.com>.  Details will be released
-     on 30 May 2003.
-
-  *) apr_proc_wait(): Handle interrupted waitpid(2) calls by calling
-     it repeatedly until it succeeds or fails with errno other than
-     EINTR.  This hides this UNIX-specific behavior from APR clients.
-
-  *) Removed the solaris-specific atomic code, due to licence
-     concerns (it was MPL 1.0, and the author could not be contacted)
-     [Ian Holsman]
-
-  *) apr_file_gets(): Return APR_SUCCESS if any characters are
-     returned.  Any I/O errors or EOF will be reported on the
-     next call.  Callers that are coded to expect returned 
-     data + APR_EOF when there is no final newline are affected 
-     by this change.  [Jeff Trawick]
-
-  *) apr_proc_create() on Unix: Make the APR_SHELLCMD mode work
-     when there is more than one program argument passed in.
-     [Jeff Trawick]
-
-  *) Add --cc and --cpp flags to apr-config.  [Jeff Trawick]
-
-  *) Don't segfault trying to close a file in error paths of flock
-     and fcntl mutex creation.  PR 19036  [Jeff Trawick]
-
-  *) Add %pT support to apr_snprintf() for printing an apr_os_thread_t.
-     [Jeff Trawick]
-
-  *) Add APR_TCP_NODELAY_INHERITED & APR_O_NONBLOCK_INHERITED to apr.hw
-     [Allan Edwards]
-
-  *) Add APR_UINT64_T_HEX_FMT.  [Jeff Trawick]
-
-  *) Add parameter to APR_SUBDIR_CONFIG to drop options passed to configure
-     before the subdir's configure is invoked.
-     [Jeff Trawick, Justin Erenkrantz]
-
-  *) Implement APR_SO_RCVBUF socket option on Unix.  
-     [Adam Sussman <myddryn@vishnu.vidya.com>]
-
-  *) Don't add the math library (-lm) if the modf() function
-     is already available via libc.  [Roy Fielding]
-
-  *) Solaris cc: Don't use the -mt option for threaded builds.  That
-     is for non-Posix threading, and the use of it prevented us from
-     linking with -lpthread, which in turn caused weird problems for
-     APR applications.  [Kristofer Spinka <kspinka@style.net>]
-
-  *) OS/2: apr_stat() fixes - When a character device is stat'ed, 
-     fill in finfo.name if it was asked for.  Return APR_INCOMPLETE 
-     when appropriate.  Addresses httpd incident [CAN-2003-0134].
-     [Brian Havard]
-
-Changes with APR 0.9.3
-
-  *) Don't enable posixsem, at build time, on systems where sem_t *
-     won't "fit" into an int (sizeof-wise). Also, better error handling
-     when we fail to create a posixsem. PR 17186 [Scott Herod
-     <sherod@pillardata.com>, Jim Jagielski]
-
-  *) Default hpux 10.x to disable threading, since if it exists at all
-     the pthread implementation should not be trusted, while hpux 10 
-     had its own threads implementation that is no longer supported.
-     PR 9457 [William Rowe]
-
-  *) Fix error in apr-config when symlinks are involved.
-     [Garrett Rooney <rooneg@electricjellyfish.net>]
-
-Changes with APR 0.9.2
-
-  *) Numerous bug fixes for file and socket inheritence by child
-     processes on Unix, correcting bugs that affected the correct 
-     behavior of apr_[file|socket]_inherit_[un]set() API.
-     [Bjoern A. Zeeb <bz@zabbadoz.net>, William Rowe, Joe Orton]
-
-  *) Define APR_UINT64_T_FMT and APR_UINT64_T_FMT_LEN.
-     Define APR_INT64_T_FMT_LEN on Windows and Netware.  [Branko ÄŒibej]
-
-  *) Correct apr_file_gets() on OS2 and Win32 so that '\r's are no longer
-     eaten, and apr_file_gets() -> apr_file_puts() moves the contents
-     uncorrupted.  [William Rowe]
-
-  *) Alter Win32's handling of the apr_proc_t hproc member, so that we
-     close that system handle wherever an apr function would invoke the
-     final waitpid() against a zombie process on Unix.  [William Rowe]
-
-  *) APR_MAX_SECONDS_TO_LINGER and APR_FNM_* #defines replace their
-     old undecorated names (missing APR_ prefix).  The old names will
-     disappear with APR 1.0.0.
-     [Craig Rodrigues <rodrigc@attbi.com>, William Rowe]
-
-
-  *) When generating a semaphore name for posixsem locking, try to
-     be a little more robust (and unique). [Jim Jagielski]
-
-  *) Add functions apr_env_get, apr_env_set and apr_env_delete for
-     manipulating the environment.  [Branko ÄŒibej]
-
-  *) Fix APR_LAYOUT to work with layout files with no preceding blank lines
-     and emit errors when layout is not found.  PR 15679.
-     [Justin Erenkrantz]
-
-  *) Add functions apr_filepath_list_split and apr_filepath_list_merge
-     for managing search paths.  [Branko ÄŒibej]
-
-  *) Introduce Release mode debugging symbols for Win32 builds of apr.
-     All library builds gain /Zi for debug symbols (which are discarded
-     at link time if some flavor of the /debug flag isn't passed to link)
-     and .dll builds gain .pdb symbols.  [Allen Edwards, William Rowe]
-
-  *) Add two new proc attributes to improve diagnostics for 
-     apr_proc_create() failures on platforms where fork()+exec() is used.
-     See the doc for apr_procattr_child_errfn_set() and
-     apr_procattr_error_check_set().  [Jeff Trawick]
-
-  *) Rename rules.mk to apr_rules.mk and make apr_rules.mk be installed.
-     [Thom May]
-     
-  *) Fix a bug in apr_proc_create() that could cause a new child process
-     to run the parent's code if setrlimit() fails.  [Jeff Trawick]
-
-  *) Disable apr_socket_sendfile() on 64-bit AIX to avoid an apparent
-     system problem.  PR 11408.  [Jeff Trawick]
-
-  *) Add --includedir flag to apr-config.  [Justin Erenkrantz]
-
-  *) Only include sys/syslimits.h if we don't have limits.h
-     [Craig Rodrigues <rodrigc@attbi.com>, Garrett Rooney 
-     <rooneg@electricjellyfish.net>, Thom May]
-
-  *) Allow apr-config to work in symlinked install directories when
-     'realpath' is available.  [Justin Erenkrantz]
-
-  *) Namespace protect the header files in include/arch
-     [Thom May]
-
-  *) Add function apr_filepath_encoding and associated constants.
-     [Branko ÄŒibej]
-
-  *) Allow apr_hash to have greater than int number of elements.
-     [Justin Erenkrantz]
-
-  *) Allow generation of dependencies by non-GCC compilers.
-     [Justin Erenkrantz]
-
-  *) Prevent obscenely large values of precision in apr_vformatter
-     from clobbering a buffer. [Sander Striker, Jim Jagielski]
-
-  *) limit the renames performed in apr_rename.pl to the most recent renames.
-     [Thom May]
-
-  *) Changed apr_mmap_dup() and friends so that there's no longer any
-     is_owner concept on the mmaped region, but rather something more
-     along the lines of a reference count.  This allows the old apr_mmap_t
-     to still be used safely when the new apr_mmap_t is in a disjoint pool.
-     [Cliff Woolley, Sander Striker]
-
-  *) Fix a bug in apr_hash_merge() which caused the last entry in the
-     overlay hash to be lost.  PR 10522  [Jeff Trawick]
-
-  *) Add DougM's apr_rename.pl script into helpers, and update for the new 
-     batch of updates [Thom May]
-
-  *) Renames done (deprecated functions wrapped):
-     apr_filename_of_pathname -> apr_filepath_name_get
-     apr_get_groupid -> apr_gid_get
-     apr_get_groupname -> apr_gid_name_get
-     apr_compare_groups -> apr_gid_compare
-     apr_parse_addr_port -> apr_port_addr_parse
-     apr_shutdown -> apr_socket_shutdown
-     apr_bind -> apr_socket_bind
-     apr_listen -> apr_socket_listen
-     apr_accept -> apr_socket_accept
-     apr_connect -> apr_socket_connect
-     apr_send -> apr_socket_send
-     apr_sendv -> apr_socket_sendv
-     apr_sendto -> apr_socket_sendto
-     apr_implode_gmt -> apr_time_exp_gmt_get
-     apr_get_home_directory -> apr_uid_homepath_get
-     apr_get_userid -> apr_uid_get
-     apr_current_userid -> apr_uid_current
-     apr_compare_users -> apr_uid_compare
-     apr_get_username -> apr_uid_name_get
-     apr_recvfrom -> apr_socket_recvfrom
-     apr_sendfile -> apr_socket_sendfile
-     apr_recv -> apr_socket_recv 
-     [Thom May]
-
-  *) Add APR_IPV6_V6ONLY socket option.  [Jeff Trawick]
-
-  *) Update timeout algorithm in free_proc_chain. If a subprocess
-     did not exit immediately, the thread would sleep for 3 seconds
-     before checking the subprocess exit status again. In a very
-     common case when the subprocess was an HTTP server CGI script,
-     the CGI script actually exited a fraction of a second into the 3
-     second sleep, which effectively limited the server to serving one 
-     CGI request every 3 seconds across a persistent connection.
-     [Bill Stoddard, Kai.Risku@arrak.fi]
-
-  *) Update doxygen tags.  [Justin Erenkrantz]
-
-  *) NetWare: implemented a file IO path context scheme to directly
-     reference directory paths and files in the file system rather
-     than having to traverse the file system on every stat() or
-     open() call. (Performance enhancement) [Brad Nicholes]
-     
-  *) ReliantUnix: recognize that dlsym() is in libdl and dlopen() is in
-     libc.  The check is generic so maybe this fixes some other system.
-     PR 14189  [Jeff Trawick]
-
-  *) Win32: Fix APR_APPEND file i/o. [Bill Stoddard]
-
-  *) Fix a problem retrieving the remote socket address for sockets
-     created via apr_os_sock_put() or apr_os_sock_make().  [Jeff Trawick]
-
-  *) Add recognition of and socket API support for the SCTP protocol.
-     [Randall Stewart <randall@stewart.chicago.il.us>]
-
-  *) Win32: apr_shutdown was not honoring apr_shutdown_how_e and
-     always shutting down the socket for read. This could result
-     in Apache HTTPD 2.0 clients getting early connection closures
-     because lingering_close() was broken. [Bill Stoddard, Allan Edwards]
-
-  *) Add apr_atomic_casptr() to support atomic compare-and-swap
-     of pointers  [Brian Pane]
-
-  *) Add apr_socket_create_ex() to allow protocol to be specified for the
-     socket.  With APR 1.0, this function will be removed and apr_socket_create()
-     will have the additional parameter.
-     [Randall Stewart <randall@stewart.chicago.il.us>]
-
-  *) Fix the detection of INT64_C() when defined in <stdint.h>.
-     [Joe Orton <joe@manyfish.co.uk>]
-
-  *) Don't use whitespace before preprocessor directives in the configure
-     logic.  Such whitespace breaks with some older preprocessors; a 
-     particularly nasty break occurs on Tru64 4.0f where APR_CHECK_DEFINE 
-     will always succeed.  [Joe Orton <joe@manyfish.co.uk>]
-
-  *) Add APR_IPV4_ADDR_OK flag to apr_sockaddr_info_get() to allow
-     apps to avoid lookup of IPv6 address if IPv4 address is sufficient.
-     (New APR_IPV6_ADDR_OK flag is similar.)  [Jeff Trawick]
-
-  *) Disable IPv6 support on Darwin.  The current IPv6 support has a
-     problem in getnameinfo() which breaks certain applications.
-     [Sander Temme <sctemme@covalent.net>, Jeff Trawick]
-
-  *) Support for SCO OpenServer Release 5 [Kean Johnston <jkj@caldera.com>]
-
-  *) Faster (inline and mutex-free) implementations of all apr_atomic
-     operations for Linux/x86 (requires a 486 or later; to enable,
-     configure APR with --enable-nonportable-atomics=yes )   [Brian Pane]
-
-  *) Add --bindir option to apr-config.  [Justin Erenkrantz]
-
-  *) Begin to rehash the test suite.  There is now a new test program called
-     testall.  This program currently runs testtime and teststr with the
-     CuTest framework.  The stand-alone programs for testtime and teststr
-     can be built, but only if a special flag is specified when building.
-     [Ryan Bloom]
-
-  *) Fix a broken check for a failure to read from the random device file.
-     PR 12615  [tenthumbs@cybernex.net]
-
-  *) Print informative link errors on Darwin.  [Justin Erenkrantz]
-
-Changes with APR 0.9.1
-
-  *) Fixed usage of alloca in apr_poll() on Tru64
-     [Dave Hill <ddhill@zk3.dec.com>]
-
-  *) Running "make check" in the toplevel directory or the test/ directory
-     will build and run all test programs.  [Aaron Bannert]
-
-  *) Add apr_array_pop().  [Justin Erenkrantz]
-
-  *) Fixed the native SPARC v8plus version of apr_atomic_dec
-     to match the semantics of the default C version [Brian Pane]
-
-Changes with APR 0.9.0
-
-  *) If the length argument to apr_snprintf is 0, then we should return the
-     length that the string would be if we actually were going to fill it out.
-     However, if the length argument is 0, we can also accept a NULL string.
-     Also, added a test case for this.  [Ryan Bloom]
-
-  *) Printing a string with apr_snprintf can seg fault, if a precision is
-     specified for the string, and the string being printed doesn't have a
-     trailing '\0'.  Fix that seg fault by not calling strlen if a precision
-     is specified when printing a string.  Also add a test to the test suite
-     for this case.
-     [R Samuel Klatchko <rsk@brightmail.com>]
-
-  *) handle leak related to threads on Windows2000/XP 
-     [INOUE Seiichiro <inoue@ariel-networks.com>]
-
-  *) Includes moved to INCLUDEDIR/apr-{major} (e.g. /usr/include/apr-0)
-     [Greg Stein]
-
-  *) libtool versioning is used to give the library sonames a real
-     value. The libraries will be libapr-{major}.so.0.{minor}.{patch}
-     [Greg Stein]
-
-  *) Fix apr_tokenize_to_argv() to remove the escape character
-     (backslash) from the argument tokens. PR 11793 [Paul J. Reder]
-
-  *) Add APR_PARSE_ARGUMENTS and APR_LAYOUT macros for better layout
-     support. [Thom May]
-
-  *) Add parallel-apr layout which utilizes the major version number in
-     directories and library names.  [Justin Erenkrantz]
-
-  *) Add a version number to the library name (e.g. libapr-1.so) so
-     that apps can do things like: -lapr-1 or -lapr-2, depending on
-     which version they want to use and link against. [Greg Stein]
-
-  *) Add --version to apr-config so that apps can retrieve the version
-     information of the (installed) APR. [Greg Stein]
-
-  *) Remove the APRVARS system; apps should use apr-config. [Greg Stein]
-
-  *) EBCDIC: fix compile failure in strings/apr_strings.c in
-     httpd-2.0.40 with the following error message:
-     CANNOT COMPILE apr_strtoi64(), only ASCII and EBCDIC supported
-     
-  *) In apr_signal_thread() remove synchronous signals from the mask
-     passed to sigwait().  It is never valid for them to be there.
-     Some platforms silently ignore them, some return EINVAL, some
-     don't process it as desired.  [Jeff Trawick]
-
-  *) Change config.nice generation to always expand variables.
-     [Justin Erenkrantz]
-
-  *) Renamed apr_strtoll()/apr_atoll() to follow int64 convention,
-     so these new helpers are apr_strtoi64/apr_atoi64(), since
-     'll' (long long) is a nonportable and aspecific construct.
-     Used ac/m4 tests to choose the appropriate fn behind strtoi64.
-     [William Rowe]
-
-  *) don't perform a strlen on that name value without checking for NULL 
-     first (in getopt)
-     [David Waite <mass@akuma.org>, Ian Holsman]
-
-  *) Added apr_strtoll() and apr_atoll() to strings lib.
-     [Shantonu Sen <ssen@apple.com>, Wilfredo Sanchez]
-
-  *) Added a lightweight internal index to apr_table_t to speed up
-     table lookup operations  [Brian Pane]
-
-  *) initalize handle members to invalid before calling createprocess
-     on win32 [Rob Saccoccio <robs@fastcgi.com>]
-
-  *) Removed apr/i18n to apr-util/xlate for inclusion of apr-iconv
-     as required by missing libiconv.  [William Rowe]
-
-  *) Removed apr/md5 and apr/uuid into apr-util/crypto.  [William Rowe]
-
-  *) Add APR_BUFFERED support to apr_os_file_put().  [Justin Erenkrantz]
-
-  *) Fix misinterpretation of timeout for select() on Win32/Netware.
-     Identified by [TANAKA Koichi <tanaka@ariel-networks.com>]
-
-  *) Re-write apr_poll() on Unix.  This improves the performance by
-     giving the user back control over the memory in the pollset.
-     [Ryan Bloom]
-
-  *) Added APR_LIMIT_NOFILE option to apr_procattr_limit_set() to
-     control the file descriptor limit on platforms that support
-     RLIMIT_NOFILE.  [Brian Pane]
-
-  *) FreeBSD: change apr_sendfile to accomodate a 4.6 kernel patch.
-     [Greg Ames]
-
-  *) Faster code for the apr_table get/set functions  [Brian Pane]
-
-  *) Fix the userid functions on Irix to handle the way that Irix 
-     reports a failure from getpwnam_r().  PR 10095.
-     [Robert I. Cowles <ric@cs.uregina.ca>, Jeff Trawick]
-
-  *) apr_table_do() and apr_table_vdo() now return an int rather than
-     void to indicate whether or not any of its iterations returned 0.
-     [Cliff Woolley]
-
-  *) Fix the definition of union semun so that it is valid on systems
-     where sizeof(long) != sizeof(int).  This resolves a hang on
-     HP-UX/Itanium.  
-     [Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>]
-
-  *) Correct shared library support on Darwin to not fatally error out
-     when a shared library does not exist.  [Justin Erenkrantz]
-
-  *) Added optimized atomic CAS support for Linux/x86 (available only
-     when APR is configured with --enable-nonportable-atomics=yes)
-     [Brian Pane]
-
-  *) Fix a compile error in the EGD support in rand.c on older Solaris
-     versions.  PR 9976  [Jim Morris <jmorris@sunflower.com>]
-
-  *) Fixed apr_file_seek() to unset the eof_hit flag.  [Stas Bekman]
-
-  *) Removed --disable-atomics flag and added --enable-nonportable-atomics,
-     thereby defaulting to portable binaries on those systems that could
-     be optimized at the expense of portability. PR: 9507  [Aaron Bannert]
-
-  *) Added 2 additional lock functions: apr_proc_mutex_name and
-     apr_proc_mutex_defname which returns the type name of the mutex
-     (eg: "sysvsem") as well as the default mutex type (APR_LOCK_DEFAULT).
-     Mostly useful under Unix were the locktypes are selectable.
-     [Jim Jagielski]
-
-  *) Fixed apr_generate_random_bytes() for Win32 on Win NT or 9x by
-     dropping the 0x40 bit (CRYPT_SILENT) for earlier OS'es.
-     PR 9286  [William Rowe]
-
-  *) Added --with-devrandom=[DEV] configure flag which allows a particular
-     "/dev/random"-compatible device to be specified, overriding the
-     default search path (/dev/random then /dev/arandom then /dev/urandom).
-     Also, if --with-egd=<path> is specified, it now implies
-     --without-devrandom.  [Cliff Woolley]
-
-  *) Darwin/Mac OS X: Don't leave zombie processes when the app calls
-     apr_signal(SIGCHLD, SIG_IGN).  This fixes a problem with Apache's
-     mod_cgid.  PR 9168.  [Jeff Trawick]
-
-  *) Win32: Fix bug where apr_sendfile() was incorrectly returning
-     APR_SUCCESS on a TransmitFile call that was interrupted by
-     the client closing its end of the connection. Always call 
-     GetOverlappedResults() to get results of async TransmitFile()
-     completion notification. [Bill Stoddard] 
-
-  *) Renamed APR_XtOffset -> APR_OFFSET and APR_XtOffsetOf -> APR_OFFSETOF.
-     [Cliff Woolley]
-
-  *) Cygwin: the unix version of apr_file_open() must respect the
-     APR_BINARY flag if the underlying platform requires it (in
-     which case we assume O_BINARY is defined).  PR 9185.
-     [Cliff Woolley]
-
-  *) Linux, AIX: Use crypt_r() instead of crypt() because the native
-     crypt() is not thread-safe.  The misuse of crypt() led to   
-     intermittent failures with Apache basic authentication when crypt 
-     passwords were being used.  [Jeff Trawick]
-
-  *) AIX: Global mutexes don't need an intraprocess mutex when SysV
-     sems are used for the crossprocess mutex.
-     Darwin: The same optimization was applied for Posix sems.
-     [Jeff Trawick]
-
-  *) Fix a problem with global mutexes on OS/390 when something other
-     than the default mechanism (SysV sem) was used.  The mutexes didn't
-     necessarily block out other threads in the same process.
-     [Jeff Trawick]
-
-  *) Fixed apr_strfsize formatting of values over 1 gig
-     [Matsuzaki Yoshinobu <maz@iij.ad.jp>]
-
-  *) Renamed --disable-atomics as --disable-optimized-atomics,
-     since it doesn't really disable the atomics.  [Aaron Bannert]
-
-  *) Converted apr_pcalloc to a macro  [Brian Pane]
-
-  *) Fixed APR_STATUS_IS_ETIMEDOUT macro.
-     [Dagfinn Aarvaag <dagfinn.aarvaag@beepscience.com>]
-
-  *) Add --disable-atomics switch to override our handcoded assembly
-     optimizations.  Note that this has no effect if your operating
-     system has a userspace atomic interface.  [Justin Erenkrantz]
-
-  *) Remove Linux atomic support since it does not have a usable
-     userspace atomic interface.  [Justin Erenkrantz]
-
-  *) Don't require that the DNS can map 127.0.0.1 when checking for
-     the presence/usability of getnameinfo().  PR 7642.  [Jeff Trawick]
-
-  *) Remove APR_WANT_SIGNAL from apr_want.h because code must include
-     apr_signal.h in order to get consistent definitions. [Roy Fielding]
-
-  *) Don't try to use /dev/zero and mmap on platforms that don't
-     support that (such as HP-UX).  PR 8537.  [Justin Erenkrantz]
-
-  *) Reduce the number of apr_sendfile calls on AIX and OS/390 by
-     remembering when the kernel tells us the next one will block.
-     [Jeff Trawick]
-
-  *) Reduce the number of apr_sendfile calls on FreeBSD by remembering
-     when the kernel tells us the next one will block.  [Greg Ames]
-
-  *) To support modules like PHP, which implement their own
-     loaded extensions, Darwin needs to place their public
-     symbols in the global table. [Marko Karppinen <markonen@php.net>,
-     Jim Jagielski]
-
-  *) Rename apr_get_groupname to apr_group_name_get.
-     [Thom May <thom@planetarytramp.net>]
-     
-  *) Allow VPATH builds to properly build dependencies and switch to
-     a .deps dependency model to mimic httpd-2.0.  [Justin Erenkrantz]
-
-  *) Tru64: Stop leaving zombies in APR apps like mod_cgid which
-     tell APR to ignore SIGCHLD.  
-     [Dave Hill <David.D.Hill@Compaq.com>]
-
-  *) Ensure that the ATOMIC_HASH can not be negative.
-     [Joe Orton <jorton@redhat.com>]
-
-  *) Fix a problem with eof reporting with Unix file I/O on 
-     unbuffered files.  [Stas Bekman <stas@stason.org>]
-
-  *) Rename apr_explode_time to apr_time_exp_tz.
-     [Thom May <thom@planetarytramp.net>]
-
-  *) Rename apr_explode_localtime to apr_time_exp_lt.
-     [Thom May <thom@planetarytramp.net>]
-
-  *) Set precompiler for Solaris atomics when using GNU binutils.
-     PR 7876.  [solomon@conceptshopping.com (Marvin Solomon)]
-
-  *) AIX: Fix breakage with 64-bit builds on versions of AIX prior
-     to 5L.  PR 7957  [Jeff Trawick]
-
-  *) On socket write functions (apr_sendfile, apr_send, apr_sendv),
-     added a select to wait for writability on the socket if the
-     previous write was incomplete.  [Jeff Trawick, Brian Pane]
-
-  *) Deprecated the apr_lock.h API. Please see the following files
-     for the improved thread and process locking and signaling:
-     apr_proc_mutex.h, apr_thread_mutex.h, apr_thread_rwlock.h,
-     apr_thread_cond.h, and apr_global_mutex.h.  [Aaron Bannert]
-
-  *) Fix some daylight savings time breakage on (at least) AIX, 
-     Solaris, and HP-UX.  [Jeff Trawick]
-
-  *) Added support for Posix semaphores (sem_open, et.al.) for mutex
-     locking. We use named semaphores in this implementation. The
-     default priority is between pthread and sysvsem.
-     [Jim Jagielski]
-
-  *) Get flock-based mutexes to work in apps like Apache.  Use the
-     same permissions on flock- and fcntl-based mutexes as Apache
-     1.3.  [Jeff Trawick]
-
-  *) Fix apr-config so that it will not attempt to cd to a non-existent
-     directory.  [Justin Erenkrantz]
-
-  *) Change the ordering of the apr_lock implementation method to
-     better match what's done in Apache 1.3. The ordering is
-     now (highest to lowest): pthread -> sysvsem -> fcntl -> flock.
-     [Jim Jagielski]
-
-  *) Improve detection of the INT64_C macro to prevent problems
-     with HP-UX's ANSI C compiler.  PR 8932.  [Justin Erenkrantz]
-
-  *) Make sure gethostbyname() can handle 255.255.255.255 if we
-     are to trust it to handle numeric address strings in
-     apr_sockaddr_info_get().  This fixes a problem on HP-UX
-     which led to an assertion failure at Apache startup when
-     using vhosts.  [Jeff Trawick]
-
-  *) Don't mask SIGUSR2 [Jin Hong <jinh@cnet.com>]  
-
-  *) Load libraries if they not MH_BUNDLE, but if they are not, it 
-     just attempts to link them as shared libs.
-     [Pier Fumagalli <pier@betaversion.org>]
-
-  *) apr_atomic_dec now returns a zero value if the value of 
-     the atomic is zero, non-zero otherwise [Ian Holsman]
-
-  *) When opening a file, only create an internal thread mutex
-     if APR_XTHREAD is set.  [Brian Pane]
-
-  *) Move the kill_conditions enum in apr_thread_proc.h into the
-     APR namespace. kill_after_timeout et al have been renamed
-     appropriately (e.g., APR_KILL_AFTER_TIMEOUT).  [Jeff Trawick]
-
-  *) Fix a segfault in apr_thread_rwlock_destroy() on Win32.
-     [INOUE Seiichiro <inoue@ariel-networks.com>]
-  
-  *) configure now checks to see if we can change DNS timeout values
-     [Ian Holsman]
-
-  *) Fix a bug in apr_file_seek() on Unix when using buffered
-     files.  PR 10003 [Jeff Trawick]
-
-  *) Small table performance optimization: eliminate the
-     zero-fill of newly allocated elements when expanding
-     a table's size. [Brian Pane]
-
-  *) Allow APR to install its generated libtool(s) via the 
-     --with-installbuilddir option (defaults to ${datadir}/build).
-     [Justin Erenkrantz]
-
-  *) renames: apr_ansi_time_to_apr_time becomes apr_time_ansi_put
-     ap_exploded_time_t becomes apr_time_exp_t
-     [Thom May <thom@planetarytramp.net>]
-
-  *) Add the APR_FILE_NOCLEANUP flag to apr_file_open().
-     Adding the flag will prevent the file from being closed 
-     when the pool passed in on apr_file_open() is destroyed.
-     This feature is useful when using apr_os_file_get|put()
-     to manage the apr_os_file_t in apr_file_t (ie, file handle
-     caching in the HTTP server) [Bill Stoddard]
-
-  *) Win32: Fix APR_XTHREAD problems in apr_file_read()
-     and apr_file_write(). Multiple threads were using the
-     same overlapped structure and io event handle created
-     in the open call, which could cause unpredictable
-     file i/o results. [Bill Stoddard]
-
-  *) Win32: apr_proc_mutex_trylock and apr_proc_mutex_lock were 
-     incorrectly returning APR_BUSY if the lock was previously
-     held by a thread that exited before releasing the lock 
-     (ie, if the process holding the lock segfaults). The MSDN
-     doc says when WaitForSingleObject returns WAIT_ABANDONED,
-     the calling thread takes ownership of the mutex, so these
-     two routines should return APR_SUCCESS in this case, not
-     APR_BUSY. [Bill Stoddard]
-
-  *) Added a new m4 function APR_EXPAND_VAR that will iteratively
-     interpolate the contents of a variable, such as $sysconfdir,
-     for use in a borne script.  [Aaron Bannert]
-
-  *) apr-atomic support for old-sparc's and gas on solaris
-     [Dale Ghent <daleg@elemental.org>,  jean-frederic clere, Ian Holsman]
-
-  *) Change apr_proc_detach to take a parameter that can enable/disable
-     automatic forking (aka, to "daemonize").
-     [Jos Backus <josb@cncdsl.com>, Aaron Bannert]
-
-  *) Implement apr_global_lock_foo() on Win32
-     [Bill Stoddard]
-
-  *) Fix select() argument call when waiting for IO.  PR 9674.
-     [David MacKenzie <djm@pix.net>]
-
-  *) Add a new lock API (apr_global_mutex_t) to provide guaranteed
-     cross-process AND cross-thread mutual exclusion.  [Aaron Bannert]
-
-  *) Note: We are in the process of deprecating the apr_lock.h API.
-     The new and improved lock/synchronization APIs now reside
-     in apr_thread_mutex.h, apr_proc_mutex.h, apr_thread_rwlock.h,
-     and apr_thread_cond.h.  [Aaron Bannert]
-
-  *) Enable autoconf 2.52{f,g} build support.
-     [Blair Zajac <blair@orcaware.com>]
-
-  *) Added new functions for atomic operations. These are experimental
-     at the moment, so use in apps is discouraged [Ian Holsman]
-
-  *) Correct serious problems with the Win32 apr_file_dup2 
-     and apr_file_open_stdxxx() fns.  [William Rowe]
-
-  *) Begin implementation of the WinCE port.
-     [Mladen Turk <mturk@mappingsoft.com>]
-
-  *) Disable SHMEM_MMAP_ZERO on HPUX 11.x where it is not supported.
-     Use SHMEM_SHMGET_ANON instead.  [Aaron Bannert]
-
-  *) Fix a few attempts to add to a void * ptr in the Unix shared
-     memory support code.  PR #9710  Per Ekman [pek@pdc.kth.se]
-
-  *) In the Linux apr_sendfile(), fix the types of some parameters 
-     to apr_send() and apr_recv().  Breakage was seen in 64-bit mode
-     on s/390.  PR #9712  [Neale.Ferguson@SoftwareAG-usa.coom]
-
-  *) added APR_PROGRAM_ENV and APR_PROGRAM_PATH options for starting
-     processes via apr_proc_create() [Greg Stein]
-
-  *) Deprecated apr_pool_free_blocks_num_bytes() [Sander Striker]
-
-  *) Add --enable-pool-debug to make it easier for people to
-     enable pool debug mode.  Removed the APR_POOL_DEBUG_VERBOSE
-     define that was previously being used. [Sander Striker]
-     
-  *) Changed the apr_file_dup2() function prototype. It can only
-     take and reuse an apr_file_t*, and will no longer create one
-     if *new_file == NULL (use apr_file_dup() for that).  [Aaron Bannert]
-
-  *) Implemented name-based shared memory on Unix.  [Aaron Bannert]
-
-  *) Fix spelling mistakes in APRDesign.  
-     [Blair Zajac <blair@orcaware.com>]
-
-  *) Ensure that apr_file_mktemp creates the temp file if it isn't there.
-     [John Sterling <sterling@covalent.net>]
-
-  *) Make sure to pre-mark anon SysV shared memory segments as
-     removed. [Jim Jagielski]
-
-  *) Add --with-efence to allow usage of Electric Fence.
-     [Justin Erenkrantz]
-
-  *) Updated the pools debug code.  Check if a pool is still
-     valid on the most common apr_pool_xxx functions.
-     Fix the way APR_POOL_DEBUG_VERBOSE was using stderr.
-     Make the output somewhat nicer in this debug mode. [Sander Striker]
-
-  *) Add new define APR_POOL_DEBUG_VERBOSE which spits out info
-     about pool creation/destruction [Ian Holsman]
-
-  *) Fix GMT offset adjustments for platforms that do not have native
-     GMT offset adjustments.  [Jon Travis <jtravis@covalent.net>]
-
-  *) Add new apr_shm_t API and remove old apr_shmem_t API. The new
-     API handles both anonymous and name-based shared memory. Anonymous
-     shared memory segments are only usable on systems with process
-     inheritance, and so the new API with name-based segments is
-     usable on platforms like Win32.  [Aaron Bannert and William Rowe
-     with much help from Justin Erenkrantz and Sander Striker]
-
-  *) Add --with-egd to support EGD-compatible entropy gatherers for 
-     those platforms without native support.  [Justin Erenkrantz]
-
-  *) apr_lock_create() and apr_proc_mutex_create() now have an
-     additional parameter for specifying the lock mechanism.  
-     apr_lock_create_np() and apr_proc_mutex_create_np() have been
-     removed.  [Jeff Trawick]
-
-  *) Change the prototype of apr_thread_exit() so that the apr_status_t
-     is no longer a pointer. It was difficult and sometimes hazardous
-     to return a apr_status_t* at times, and this allows us to return
-     the APR_* error codes directly.  [Aaron Bannert]
-
-  *) Add apr_sockaddr_equal() for comparing APR sockaddrs.
-     [Jeff Trawick]
-
-  *) Win32: apr_sendfile() should return APR_ENOTIMPL if
-     oslevel < WINNT. [Bill Stoddard]
-
-  *) Put new pools code in place which allows applications to
-     switch off locking on pools operations in case a pool is
-     guaranteed to never being used in more than one thread
-     at the same time.  We've seen a significant performance
-     improvement over the old code. [Sander Striker]
-
-  *) Add apr-config - a shell script to allow third-party programs
-     easy access to APR configuration parameters.  [Justin Erenkrantz]
-
-  *) Add find_apr.m4 to allow third-party programs that use APR to
-     have a standard m4 macro for detection.  [Greg Stein]
-
-  *) SEGV in apr_table_overlap [Brian Pane]
-
-  *) apr_array_copy speedup by removing the zero-fill [Brian Pane]
-
-  *) Fix build breakage on systems with getaddrinfo() but not 
-     gai_strerror() (e.g., RedHat 5.2).  [Jeff Trawick]
-
-  *) Fix a problem in Unix apr_file_dup() which caused 0 to be returned
-     by the first read.  [Stas Bekman <stas@stason.org>]
-
-  *) Fix a buglet that caused APR_FILE_BASED_SHM to be set inadvertently 
-     on some platforms (e.g., Linux, AIX).  [Jeff Trawick]
-
-  *) Speed up apr_table operations by using a cache/checksum and a
-     red-black tree in the overlay.
-     [Brian Pane <bpane@pacbell.net>, Cliff Woolley]
-
-  *) Speed up apr_pool_userdata_set[n] by letting hash_set figure out
-     the strings length.  [Brian Pane <bpane@pacbell.net>]
-
-  *) New function apr_mmap_dup. This is called in the mmap_setaside.
-     [Brian Pane <bpane@pacbell.net>]
-
-  *) Speed up the apr_hash_t implementation's handling of APR_HASH_KEY_STRING.
-     [Brian Pane <bpane@pacbell.net>]
-
-  *) Tweak apr_gethostname() so that it detects truncation of the
-     name and returns an error.  [Jeff Trawick]
-
-  *) Fix bug in Darwin DSO code.  [Sander Temme]
-
-  *) Fix apr_setup_signal_thread() to grab the right error code from
-     a sigprocmask() failure.  This only affects platforms that use
-     sigprocmask() in lieu of pthread_sigmask().  [Jeff Trawick]
-
-  *) Fix the Unix HAVE_POLL flavor of apr_poll_socket_mask() so that
-     it doesn't segfault.  Avoid some wasted storage in a poll-related
-     APR structure.  [INOUE Seiichiro <inoue@ariel-networks.com>]
-
-  *) Fix apr_setup_signal_thread() so that threads don't block
-     synchronous signals (e.g., SIGSEGV).  It is a programming error
-     to do so, and some platforms (e.g., Solaris, AIX) don't call any
-     registered signal handler when such signals are blocked.
-     [Jeff Trawick]
-
-  *) Change the apr_table_elts macro so that it provides access via
-     a const pointer instead of a non-const pointer.
-     [Brian Pane <bpane@pacbell.net>]
-
-  *) Use strerror_r() where available, since strerror() isn't always
-     thread-safe.  Example systems where strerror() isn't thread-safe:
-     Linux+glibc, AIX  [Jeff Trawick]
-
-  *) Fix some file cleanup problems in apr_proc_create() which could
-     result in the pipes for stdin/stdout/stderr being closed
-     immediately.  [Jeff Trawick]
-
-  *) New functions apr_hash_[merge|copy], change to overlay fn
-     so that it calls merge, which does a inline iteration instead
-     of calling the iterator function. [Brian Pane <bpane@pacbell.net>]
-
-  *) Introduce the apr_pool_userdata_setn() variant that doesn't 
-     strdup the key.  Allows both the _setn() and _set() variant to 
-     accept NULL for the cleanup.  [Brian Pane <bpane@pacbell.net>]
-
-  *) Re-vamp the apr_proc_wait and apr_proc_wait_all functions.  We
-     now return the exit code from the program and a reason that the
-     program died, either normal exit or signalled.
-     [Jeff Trawick and Ryan Bloom]
-
-  *) Implement portable accessors for proc mutex. These are equivalent
-     to apr_os_lock_get/set, but they work for apr_proc_mutex_t types
-     instead.   [Aaron Bannert]
-
-  *) Added a new parameter to apr_thread_mutex_init(). Now, by default,
-     thread mutexes are not nested (sometimes called "recursive"). To
-     enable nested mutexes, a flag must be passed to the init script.
-     Non-nested mutexes are much faster than nested ones.
-     [Aaron Bannert]
-
-  *) read_with_timeout in apr/file_io/win32/readwrite.c incorrectly 
-     returned APR_SUCCESS instead of APR_EOF when PeekNamedPipe failed
-     and the result from GetLastError() was ERROR_BROKEN_PIPE. Because 
-     of this, the pipe wasn't closed as soon as it could be.
-     [Tim Costello <tim.costello@zcmgroup.com.au>]
-
-  *) Fix a problem in the Win32 pipe creation code called by 
-     apr_proc_create():  It didn't register cleanups for either the 
-     read or the write ends of the pipe, so file handles (and event 
-     handles for pipes with asynchronous I/O mode set) are never 
-     closed.  [Tim Costello <tim.costello@zcmgroup.com.au>]
-
-  *) Add support for QNX 6.  [J.T. Conklin <jtc@acorntoolworks.com>]
-
-  *) We now create exports.c and export_vars.h, which in turn create
-     exports.c.  From this we generate two more files with different
-     purposes: apr.exp - list of exported symbols; and exports.lo
-     (exports.o) - an object file that can be linked with an executable
-     to force resolution of all apr symbols.   [Aaron Bannert]
-
-  *) Add the apr_thread_cond_timedwait function to the condition
-     variable API.   [Aaron Bannert]
-
-  *) Fixed apr_file_mktemp on systems without mkstemp (Win32, etc).
-     [Mladen Turk, Cliff Woolley]
-
-  *) Fix a segfault in apr_poll_clear on Unix.   Also fix the logic 
-     for the case where there are multiple events ORed together in 
-     the events list.   [Jamshid Mahdavi <mahdavi@volera.com>]
-
-  *) Files opened on Unix with the flag APR_DELONCLOSE are now
-     not unlinked until they are actually closed, rather than as
-     soon as they're opened.  The old approach worked but made
-     handling temp files harder.  [Cliff Woolley]
-
-  *) Fix potential segfault when closing a file on Unix.  If
-     apr_file_close() was called and it failed, it would not
-     deregister the file cleanup.  Therefore the cleanup would
-     be run again later on a now-invalid descriptor.  [Cliff Woolley]
-
-  *) Introduce apr_pool_lock for debugging, in combination with
-     ALLOC_USE_MALLOC + DEBUG_WITH_MPROTECT.  Only implemented
-     on Win32 today, very effective for debugging pool constness.
-     [William Rowe]
-
-  *) Optimize apr_pstrcat by caching lengths of first 6 strings
-     [Brian Pane <bpane@pacbell.net>]
-
-  *) Add pool accessors to the apr_thread_mutex_t datatype.
-     [Aaron Bannert <aaron@clove.org>]
-
-  *) Add the apr_file_mktemp function.  This creates and opens a 
-     temporary file, for use by the program.  This file is created
-     delete_on_close.  The initial implementation only works on
-     Unix, but Windows is coming soon.  [Ryan Bloom]
-
-  *) Make the unix version of apr_proc_wait_all_procs a simple wrapper 
-     around apr_proc_wait, and which extracts the exit code from the 
-     status returned by waitpid.  
-     [Kevin Pilch-Bisson <kevin@pilch-bisson.net>]
-
-  *) Add process locking API to APR. [Aaron Bannert <aaron@clove.org>]
-
-  *) Add condition variables for Windows.  [Ryan Bloom]
-
-  *) Add condition variables to the APR set of locking functions.
-     This does Unix, and provides stubs for all other platforms.
-     [Aaron Bannert <aaron@clove.org>]
-
-  *) Don't search for IPv6 names in apr_sockaddr_info_get() if the 
-     application doesn't specify the family (i.e., the application
-     passes in AF_UNSPEC) and APR isn't built with IPv6 support.  
-     [Jeff Trawick]
-
-  *) Fix the API for the apr_proc_create() call on Win32.  Several
-     bad assumptions are gone, including a mismatch between unix and
-     win32, where win32 was defaulting to create detached.  Also fixes
-     the apr_proc_t's pid member to a real pid (identity that works
-     across processes) instead of the handle (which is a new hproc
-     member value.)  [William Rowe]
-
-  *) Modify the external apr_filepath_get() fn to take a flags arg,
-     currently only for APR_FILEPATH_NATIVE.  This returns c:\foo
-     format on Win32, and should do the same on OS2, or sys\vol:\foo
-     on Netware.  Primarily for internals, but possibly useful to
-     others (and it mirrors some of the other apr_filepath_*() calls.)
-     [William Rowe]
-
-  *) Add the new thread read/write lock API to APR.
-     [Aaron Bannert <aaron@clove.org>]
-
-  *) Add the new thread mutex lock API to APR.
-     [Aaron Bannert <aaron@clove.org>]
-  
-  *) Cache GMT offset on platforms that don't store it in the tm struct.
-     This offset is normalized to be independent of daylight savings
-     time.  [Brian Pane <bpane@pacbell.net>]
-
-  *) Initial support for cygwin.  [Stipe Tolj <tolj@wapme-systems.de>]
-
-  *) Fix a problem with buffered files on Unix.  [Brian Havard]
-
-  *) Fix the bungling of getaddrinfo() error codes.  [Jeff Trawick]
-
-  *) Add an apr_thread_once function to APR.  This allows a
-     program to ensure that a function is only called once.
-     [Ryan Bloom]
-
-  *) APR Documentation is now in Doxygen format.
-     [Ian Holsman]
-
-  *) Get apr_ungetc() to work with buffered files on Unix.
-     [Jeff Trawick]
-
-  *) Fixed apr_filepath_root on Unix [William Rowe, Cliff Woolley].
-
-  *) Rename XtOffset to APR_XtOffset.  This namespace protection
-     is important to keep from conflicting with other packages.
-     [Perl]
-
-  *) Introduce a new --disable-ipv6 option to disable IPv6 support.
-     [Sterling Hughes <sterling@designmultimedia.com>, Jeff
-     Trawick]
-
-  *) Fix the new shared memory code.  We need to pass a pointer to
-     an apr_file_t to apr_file_open.  Also, apr_os_file_get returns
-     a status value, not the OS file descriptor.  [Ryan Bloom]
-
-  *) Fix the new shared memory configure script.  The APR_DECIDE
-     macros go in order, so the last set of dependancies that are
-     met are the ones used.  That means that when using those macros,
-     options should be listed with the least desirable option first,
-     and the most desirable last.  The new shared memory routines did
-     the opposite, so we chose the wrong shared memory option on Linux.
-     [Ryan Bloom]
-
-  *) Move the necessary shared memory code from MM into APR and remove
-     our dependency upon MM.  [Justin Erenkrantz]
-
-  *) Get apr_lock_file and apr_unlock_file working on Windows 9x.
-     [Mladen Turk, Bill Stoddard]
-
-  *) Make all APR pools be allocated out of the permanent pool.
-     This brings APR pools back to a tree structure.  There are
-     no longer any way to create a pool that is not a decendant
-     of the permanent_pool.  [Ryan Bloom]
-
-  *) Wrap all functions in APR_DECLARE macro. 
-     [Sterling Hughes <sterling@designmultimedia.com>]
-
-  *) Non-blocking connects shouldn't be calling connect a second
-     time.  According to Single Unix, a non-blocking connect has
-     succeeded when the select pops successfully.  It has failed
-     if the select failed.  The second connect was causing 502's
-     in the httpd-proxy.  [John Barbee barbee@veribox.net]
-
-  *) Fix apr_dir_rewind() for Win32 to avoid returning a bogus error.
-     [Jeff Trawick, William Rowe]
-
-  *) Detect required libraries first.  This minimizes the libraries
-     needed in apr_hints.m4.  [Justin Erenkrantz]
-
-  *) Support the AIX, glibc2, and Solaris variants of gethostby{name|addr}_r.
-     Use gethostbyaddr_r function when available.
-     [Sterling Hughes <sterling@designmultimedia.com>]
-
-  *) Add new socket option, APR_INCOMPLETE_READ, that should be
-     set when you expect the first non-blocking read to fail with
-     EAGAIN. Setting APR_INCOMPLETE_READ prior to calling apr_read
-     will cause select() to be called first to wait for bytes
-     to read. [Brian Pane, Dean Gaudet]
-
-  *) Better installation.  This makes us install the APRVARS file,
-     as well as MM.  [Ryan Bloom]
-
-  *) Provide new number conversion functions apr_itoa, apr_ltoa, and 
-     apr_off_t_toa, and inline code in inet_ntop4, to reduce CPU
-     consumption. [Brian Pane]
-
-  *) Updated APR to pass the thread worker_function prototype 
-     (apr_thread_start_t) two parameters, the apr private data 
-     (apr_thread_t*) and the application private data (void*).  
-     Applications' worker_thread() routines may use apr_thread_pool_get
-     to access the pool (implemented using APR_POOL_*_ACCESSOR() macros.)
-     [Aaron Bannert <aaron@ebuilt.com>]
-
-  *) Add Solaris 8's sendfilev() support.  This requires the following 
-     patches from Sun: 111297 (Sparc), 111298 (x86).  You'll need the
-     other patches listed in the patch description.  [Justin Erenkrantz]
-
-  *) Close file descriptor when we are done with fcntl or flock-based
-     cross-process lock.  Otherwise, we leak descriptors.
-     [Justin Erenkrantz]
- 
-  *) Fix a possible data corruption problem with the use of getpwnam_r() on 
-     all platforms where that function is used.
-     Use getpwnam_r() and getgrgid_r() instead of getpwnam() and getgrgid()
-     with threaded builds on glibc (2.1, at least) to avoid thread safety
-     issues.  [Jeff Trawick]
-
-  *) Added apr_lock_tryacquire.  It will attempt to acquire the lock, but 
-     will not block if it can not acquire the lock.  Returns APR_EBUSY if 
-     acquistion can not happen.  [Justin Erenkrantz]
-
-  *) Added an inherit flag to apr_socket_create and other socket creation
-     functions.  This allows APR programs to specify that a socket should
-     be passed to any child processes that are created.  The inherit flag
-     is only meaningful if programs use apr_process_create().  This
-     also adds a couple of macros that allow APR types to set and unset
-     the inherit flag.  [Ryan Bloom]
-
-  *) apr_connect()on Windows: Handle timeouts and returning the proper
-     status code when a connect is in progress. [Bill Stoddard]
-
-  *) apr_connect() on Unix: Handle EINTR during connect().  Handle timeouts.
-     [Jeff Trawick]
-
-  *) Handle the weird case where getpwnam() returns NULL but errno is zero.
-     [Jeff Trawick]
-
-  *) Add apr_file_flags_get() which returns the flags that were originally
-     passed in to apr_file_open().  [Cliff Woolley]
-
-  *) Added APR_HAS_XTHREAD_FILES macro that indicates whether or not the
-     platform handles files opened in APR_XTHREAD mode natively.  Currently
-     only Win32 has such native support.  [Cliff Woolley]
-
-  *) Fix gmt offset handling on Solaris.  Apache log messages now show
-     local time again. PR #7902 [Taketo Kabe <kabe@sra-tohoku.co.jp>]
-
-  *) apr_pstrcat() optimizations [Doug MacEachern, Jeff Trawick]
-
-  *) Make the apr_pool_is_ancestor logic public.  This is required for 
-     some new logic that is going into HTTPD.  I have left the join logic
-     in that function debug only.  [Ryan Bloom]
-
-  *) Clean up Win32 locks when the pool goes away.
-     [Justin Erenkrantz, Jeff Trawick]
-
-  *) Implement apr_get_home_directory for Win32.  [William Rowe]
-
-  *) Complete the implementation of LARGEFILE support on Win32, although
-     the mmap semantics still need a touch of work.  [William Rowe]
-
-  *) Fix the APR_XTHREAD support, and apr_sendfile mechanics, so we can
-     handle cross-threaded file handles on Win32.  [William Rowe]
-
-  *) Implement APR_READWRITE locks on Unix with POSIX rwlocks.
-     Introduce new apr_lock_acquire_rw() function which takes in 
-     APR_READER or APR_WRITER.  [Justin Erenkrantz]
-
-  *) Add apr_open_stdin.  This mirrors apr_open_stderr, except it works
-     on stdin.  [Aaron Bannert <abannert@ebuilt.com>]
-
-  *) Add apr_strtok(), a thread-safe flavor of strtok() which has the
-     same interface as strtok_r().  [Jeff Trawick]
-     
-  *) Add other child support to Win32 [Bill Stoddard]
-
-  *) Other-child registrations are automatically removed when the
-     associated pool is destroyed.  This avoids garbage in the list
-     of registrations when a pool with a registration is freed.
-     [Jeff Trawick]
-
-  *) Allow LTFLAGS to be overridden by the configure command-line 
-     (default="--silent") and introduce LT_LDFLAGS.  [Roy Fielding]
-
-  *) Add memory code kindly donated to APR by  
-       Elrond  <elrond@samba-tng.org> 
-       Luke Kenneth Casson Leighton <lkcl@samba-tng.org>
-       Sander Striker <striker@samba-tng.org>
-     [David Reid]
-
-  *) Fix a problem with the FreeBSD flavor of apr_sendfile() where we 
-     could return APR_EAGAIN+bytes_sent.  [Jeff Trawick]
-
-  *) Fix a problem on unixware where clearing h_errno wouldn't work.
-     Use set_h_errno() instead.  PR #7651  [Jeff Trawick]
-
-  *) Add the test and build directories (when present) to the recursive
-     make process, being sure that they are run last.  test is only done
-     recursively for make *clean targets.  [Roy Fielding]
-
-  *) Make the apr_mmap_create() function use the native_flags variable.
-     This allows us to actually create WRITEABLE MMAPs.
-     [Ed Korthof <ed@apache.org>]
-
-  *) Completely revamp configure so that it preserves the standard make
-     variables CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS and LIBS by moving
-     the configure additions to EXTRA_* variables.  Also, allow the user
-     to specify NOTEST_* values for all of the above, which eliminates the
-     need for THREAD_CPPFLAGS, THREAD_CFLAGS, and OPTIM.  Fix the setting
-     of INCLUDES and EXTRA_INCLUDES.  Check flags as they are added to
-     avoid pointless duplications.  Fix the order in which flags are given
-     on the compile and link lines.  [Roy Fielding]
- 
-  *) Fix DSO code on HP/UX.  We have to use == not =, and it makes more
-     sense to actually return errno, so that the return code means 
-     something.  [Ryan Bloom]
-
-  *) Clean up conditionals in unix DSO code so that we decide based on
-     the dynamic loading implementation, which we noticed at configure
-     time, instead of by operating system.
-     [Wilfredo Sanchez]
-
-  *) Add DSO support for dyld platforms (Darwin/Mac OS and OpenStep).
-     [Wilfredo Sanchez]
-
-  *) Amend the time code to better deal with time zones.
-     [David Reid]
-
-  *) Carefully select an appropriate native type for apr_int64_t and
-     define its format as APR_INT64_T_FMT and literal using APR_INT64_C().
-     [Justin Erenkrantz, William Rowe]
-
-  *) Make clean, distclean, and extraclean consistently according to the
-     Gnu makefile guidelines.  [Justin Erenkrantz <jerenkrantz@ebuilt.com>]
-
-  *) Initial implementation of of apr_filepath (get/set/parse_root and 
-     merge) for Windows.  [William Rowe]
-
-  *) Cleaned up implementation of of apr_filepath (get/set/parse_root
-     and merge) for Unix.  [Greg Stein, William Rowe]
-
-  *) Fixup the --enable-libtool option.  This allows the test directory
-     to compile again.  The test directory still doesn't work when
-     APR is configured without libtool.  [Ryan Bloom]
-
-  *) If we don't have sigwait() in the system, see if sigsuspend() is
-     available, and use that instead. [Wilfredo Sanchez]
-
-  *) Make libtool optional at configure time.  This is done with 
-     --disable-libtool.  [Ryan Bloom]
-
-  *) Recognize systems where the TCP_NODELAY setting is inherited from
-     the listening socket, and optimize apr_setsockopt(APR_TCP_NODELAY)
-     accordingly.  [Jeff Trawick]
-
-  *) Recognize the presence of getnameinfo() on Tru64.  [David Reid]
-
-  *) Allow APR to be installed. [Ryan Bloom]
-
-  *) Generate config.nice for easy re-run of configure. [Roy Fielding]
-
-  *) Define preprocessor flags in CPPFLAGS instead of CFLAGS and
-     bring some sanity to the compiler command-lines. [Roy Fielding]
-
-  *) Use the dso/aix subdirectory for older versions of AIX and fix 
-     a number of bugs in the dso code in that directory.
-     [Victor Orlikowski]
-
-  *) Allow libtool 1.3b to be used.  [Victor Orlikowski]
-
-  *) Misc. Win32 fixes: Set the pool pointer in apr_sockaddr_t 
-     structures created with the apr_socket_t to prevent segfault 
-     in certain apps.  Flush unwritten buffered data when the file 
-     is closed.  [Jeff Trawick]
-
-  *) Win32: Get APR to compile with MSVC 5.0 (a.k.a. VC97).
-     PR #7489  [Jeff Trawick]
-
-  *) First draft implementation of apr_filepath (get/set/parse_root
-     and merge) for Unix.  [William Rowe]
-
-  *) Add apr_ipsubnet_create() and apr_ipsubnet_test() for testing
-     whether or not an address is within a subnet.  [Jeff Trawick]
-
-  *) Add apr_sendto and apr_recvfrom for Unix.  Start of adding UDP
-     support.  [David Reid]
-
-  *) Add a method to get the password from the system for a given
-     user.  [John Barbee <jbarbee@covalent.net>]
-
-  *) Change the include path order, so that we look for included files
-     in the APR paths first, and the system paths second.
-     [jean-frederic clere <jfrederic.clere@fujitsu-siemens.com>]
-
-  *) Add a with-sendfile option, so that people on platforms without a
-     sendfile implementation for APR can easily disable it from the 
-     configure line.  [Ryan Bloom]
-
-  *) Change the check for netinet/tcp.h to work around an issue with
-     that header file on IRIX 6.5 which prevented it from being
-     detected.  PR #6459  [Jeff Trawick]
-
-  *) Introduce apr_get_userid to return a named user's apr_uid_t and
-     apr_gid_t across platforms [Cliff Woolley, William Rowe]
-
-  *) In apr_shm_init(), check the retcode from mm_malloc().  Previously,
-     we segfaulted here if mm_malloc() failed to get a lock.  An example
-     error scenario is when the lock file lives on a filesystem which
-     doesn't support locking.  [Jeff Trawick]
-
-  *) Name protected the autoconf macros defined by APR.  Moved the
-     REENTRANCY_FLAGS settings into apr_hints.m4. Inlined the
-     APR_PREPARE_MM_DIR macro because it could only be used once.
-     Removed the unused macros MY_TRY_RUN, MY_TRY_RUN_NATIVE, and
-     AC_USE_FUNCTION.  Added some macro comments.  [Roy Fielding]
-
-  *) Cope with BSDi installations where the default make has been
-     replaced with GNU make.  [Joe Orton <joe@manyfish.co.uk>]
-
-  *) Changed apr/helpers to apr/build to be consistent with other Apache
-     source trees.  Added make variables to rules.mk.in that point to the
-     builders directory and its scripts.  Updated buildconf, configure.in,
-     and Makefile.in files to create and use the new scripts.  Moved scandoc
-     to scandoc.pl and its default.pl template to scandoc_template.pl.
-     [Roy Fielding]
-
-  *) Updated config.guess and config.sub to GNU libtool 1.3.5 features,
-     with the Apache additions for OS/390 and OS/2 emx.  [Roy Fielding]
-
-  *) Moved hints.m4, apr_common.m4, and helpers/apr-conf.m4 into the
-     new build directory as apr_hints.m4, apr_common.m4, apr_network.m4,
-     and apr_threads.m4.  [Roy Fielding]
-
-  *) Get apr_sendfile() working on HP-UX.  This gets APR to build on
-     HP-UX without having to turn off APR_HAS_SENDFILE.  [Jeff Trawick]
-
-  *) Force FreeBSD to compile without threads by default.  To enable
-     threads, use --enable-threads on the configure line.
-     [Ryan Bloom]
-
-  *) Purge system password buffer before returning from apr_password_get.
-     No longer abuses bufsize argument on return.  [William Rowe]
-
-  *) Moved the prototypes for apr_snprintf and apr_vsnprintf to the
-     apr_strings.h header, from apr_lib.h.  This location makes more
-     sense.  [Ryan Bloom]
-
-  *) Added the APR_TRY_COMPILE_NO_WARNING configure macro for testing a
-     compile with -Werror as well as the APR_CHECK_ICONV_INBUF macro to
-     test for annoying iconv prototype differences.
-     [Jeff Trawick, Roy Fielding]
-
-  *) Fix a problem with configure on NetBSD.  We must include sys/types.h
-     for some platforms.  [jun-ichiro hagino <itojun@kame.net>]
-
-  *) Some fixes in the Win32 time support.
-     (IsLeapYear): New macro for quickly figgerin' out if a given year is a 
-     leap year. (SystemTimeToAprExpTime): Perform the calculation of
-     tm_yday.  Also, negate the sign of the tm_gmtoff field to be
-     consistent with Unix platforms and APR header file comments.
-     [Mike Pilato]
-
-  *) Implement WinNT Unix'ish permissions. [William Rowe]
-
-  *) Corrected an OS2'ism of apr_get_home_directory.  OS2 now returns the
-     proper directory, including the user's name.
-
-  *) Removed private os2errno.h and integrated the OS2 network error codes
-     into apr_errno.h for optimized error tests (APR_STATUS_IS_EFOO(rv)).
-     [William Rowe]
-
-  *) Moved inclusion of <os2.h> header from multiple modules into apr.h
-     [William Rowe]
-
-  *) Added apr_compare_users() and apr_compare_groups() for more complex
-     apr_uid_t and apr_gid_t structures.  Enabled both .user and .group
-     results from WinNT/2000 stat/getfileinfo, but expect to find that 
-     .group is 'None' in most cases.  [William Rowe]
-
-  *) Replace configure --with-optim option by using the environment
-     variable OPTIM instead.  This is needed because configure options
-     do not support multiple flags separated by spaces.  [Roy Fielding]
-
-  *) Eliminate the APR_SIG* aliases for standard signal names,
-     since they serve no useful purpose.  [Roy Fielding]
-
-  *) Abstracted apr_get_username and apr_get_groupname for unix and win32.
-     Modified Win32 apr_uid_t and apr_gid_t to use PSIDs, and elimintated
-     the uid_t and gid_t definitions.  [William Rowe]
-
-  *) Radically refactored apr_stat/lstat/getfileinfo/dir_read for Win32
-     to assure we are retrieving what we expect to retrieve, and reporting
-     the correct result (APR_SUCCESS or APR_INCOMPLETE).  The potential
-     for a bit more optimization still remains.  [William Rowe]
-
-  *) While we have the future opportunity to cache the apr_stat'ed file
-     handle for a very fast open (dup handle) on Win32, patched to close
-     that file after a stat always.  Needs a new semantic before we leave
-     handles dangling when the user intends to rm.  [William Rowe]
-
-  *) Correct Win32 apr_stat/lstat/getfileinfo/dir_read to all zero out
-     the finfo buffer on success (or incomplete success).  [William Rowe]
-
-  *) Fix Win32/Unix apr_lstat to throw the .valid bit APR_FINFO_LINK to
-     indicate we attempted to open the link.  Only the .filetype APR_LNK
-     reflects if the file found was, in fact, a link.   [William Rowe]
-
-  *) Fixed apr_open and apr_rename to function on Win9x.
-     [Mike Pilato <cmpilato@collab.net>] 
-  
-  *) Add apr_open_stdout.  This mirrors apr_open_stderr, except it works
-     on stdout.  [Mike Pilato <cmpilato@collab.net>]
-
-  *) Fix bug in file_io/unix/dir.c.  There is no such thing as a dirent,
-     it must be a struct dirent.  
-     [Kevin Pilch-Bisson <kevin@pilch-bisson.net>]
-
-  *) Fix the configure script so that we can build from a different
-     directory.  [Kevin Pilch-Bisson <kevin@pilch-bisson.net>]
-
-  *) Introduce the wanted flag argument to the apr_stat/lstat/getfileinfo
-     family of functions.  This change allows the user to determine what
-     platform-specific file information is retrieved, to optimize both
-     portability and performance.  [William Rowe]
-
-  *) Fix make depend.  [Ryan Bloom]
-
-  *) All dso implementations now register a cleanup to unload the DSO
-     when it is loaded.  If the pool is removed, we really do need to
-     remove the DSO.  In the past, different platforms behaved differently
-     it this respect.  [Ryan Bloom]
-
-  *) Add linkage declarations to the DSO code.
-     [Gregory Nicholls <gnicholls@level8.com>]
-
-  *) Some adjustment of hints.m4 setting flags (used to check if null
-     first) and added some verbosity. [Jim Jagielski]
-
-  *) Specify APR_DECLARE to some of the APR functions.  This helps linking
-     on some operating systems.  [Gregory Nicholls <gnicholls@level8.com>]
-
-  *) Libtool'ized APR and converted all the makefiles to share rules
-     from helpers/rules.mk. [Greg Stein]
-
-  *) Remove a warning on FreeBSD.  FreeBSD defines TCP_NO_PUSH, but we
-     don't actually use it.  This causes os_cork to be defined but not
-     used.  This patch keeps us from defining os_cork and os_uncork on
-     FreeBSD.  [Ryan Bloom]
-
-  *) Keep apr_terminate from seg faulting on terminate.  This is
-     happening on systems that do not NULL out locks when they are
-     destroyed.  To keep this from happening, we set the locks to
-     NULL after destroying them in apr_terminate, and we have to 
-     check for NULL in free_blocks.  
-     [Allan Edwards and Gregory Nicholls <gnicholls@level8.com>]
-
-  *) Remove the ability to allocate memory out of a NULL pool.
-     [Ryan Bloom]
-
-  *) Add an APR_GET_POOL macro to get a pool from any APR type that has
-     a pool.  This requires that ALL apr types put the pool as the first
-     field in their structure. [Ryan Bloom]
-
-  *) Begin to remove the ability to allocate out of NULL pools.  The first
-     problem to solve, is that we need an apr_lock in order to allocate
-     pools, so that we can lock things out when allocating.  So, how do we
-     allocate locks without a pool to allocate from?  The answer is to create
-     a global_apr_pool, which is a bootstrapping pool.  There should NEVER
-     be a sub-pool off this pool, and it is static to an APR file.  This is
-     only used to allow us to allocate the locks cleanly, without using the
-     NULL pool hack.  [Ryan Bloom]
-
-  *) Fix a logic error in the poll code when implemented using select.
-     [Nick Caruso <ncaruso@gamesville.com>]
-
-  *) FreeBSD does not support sendfile() in combination with threads
-     before version 4.2.  We no longer even try to support it.
-     [Ryan Bloom]
-
-  *) On FreeBSD, it is possible for the first call to sendfile to
-     get EAGAIN, but still send some data.  This means that we cannot
-     call sendfile and then check for EAGAIN, and then wait and call
-     sendfile again.  If we do that, then we are likely to send the
-     first chunk of data twice, once in the first call and once in the
-     second.  If we are using a timed write, then we check to make sure
-     we can send data before trying to send it. [Ryan Bloom]
-
-  *) Cleanup to help Apache support programs build cleanly.
-     [Cliff Woolley <cliffwoolley@yahoo.com>]
-
-  *) Cleanup some compiler warnings on Solaris
-     [Dale Ghent <daleg@elemental.org>]
-
-  *) apr_getaddrinfo() can now return multiple addresses for a host
-     via the next field in apr_sockaddr_t.  [Jeff Trawick]
-
-  *) Tighten up the check for getaddrinfo().  If it can't figure out
-     the appropriate address family for 127.0.0.1, it fails.  
-     Unfortunately, Tru64 fails this test so we won't do IPv6 on
-     Tru64.  [Jeff Trawick]
-
-  *) Rename apr_opendir to apr_dir_open.  [Ryan Bloom]
-
-  *) apr_snprintf()'s %pI format string now takes apr_sockaddr_t *
-     instead of sockaddr_in *.  [Jeff Trawick]
-
-  *) Fix a bug in apr_accept() for Win32 and Unix where the local 
-     apr_sockaddr_t in the new connected socket was not initialized
-     properly.  This could result in a bad string for apr_get_ipaddr(),
-     among other things.  [Jeff Trawick]
-
-  *) Add apr_getnameinfo(), a replacement for apr_get_hostname() which
-     supports IPv6 and will be friendlier for use with eventual 
-     SOCK_DGRAM support.  apr_get_hostname() is gone.  [Jeff Trawick]
-
-
-Changes with APR a9
-
-  *) Removed the iconv implementation from the i18n/unix/iconv branch.
-     This now resides in the apr-iconv repository, and will be ported
-     over time to use native apr types (e.g. apr_dso) for portability.
-
-  *) Only support IPv6 if we have sockaddr_in and a working 
-     getaddrinfo().  [Jeff Trawick]
-
-  *) Add apr_parse_addr_port() for parsing the hostname:port portion
-     of URLs and similar strings.  [Jeff Trawick]
-
-  *) Add Win32 MMAP support [William Rowe]
-
-  *) Allow the APR programmer to specify if the MMAP is read-only or
-     write-able.
-     [Ryan Bloom and Will Rowe]
-
-  *) Check more carefully for getaddrinfo().  Accept those that
-     require <netdb.h> to be included (e.g., Tru64).  Reject those that 
-     fail a very basic operational test (e.g., AIX).  [Jeff Trawick]
-
-  *) Add apr_make_os_sock() for constructing a fully-capable APR
-     socket.  [Jeff Trawick]
-
-  *) Make APR's shared memory routines always allocate enough memory
-     for the requested segment, the MM internal types, and the APR
-     internal types.
-     [Ryan Bloom]
-
-  *) Add APR_SIZE_T_FMT.  Get the other APR_xx_T_FMT variables
-     defined properly on AIX.  [Jeff Trawick]
-
-  *) network API changes: get rid of apr_get_socket_inaddr(), 
-     apr_get_remote_name(), and apr_get_local_name()  [Jeff Trawick]
-
-  *) Add a step at configure time to create a file at the top-level,
-     apr.exports, which lists every function exported by APR.  The
-     file is generated by a script in helpers, that reads each header
-     file.
-     [Ryan Bloom]
-
-  *) Lock config changes: Detect SysV sem capability by the presence of
-     sempaphore functions, not by the presence of union semun.  New
-     config variable apr_lock_method can override autodetection of the 
-     apr_lock implementation method.  For now, hints.m4 uses it to select 
-     SysV semaphores for OS/390.  New config variable 
-     apr_process_lock_is_global specifies that the selected inter-process
-     lock method is sufficient for APR_LOCKALL (i.e., it blocks all
-     threads and processes).  For now, hints.m4 turns on this flag for
-     OS/390.  [Jeff Trawick]
-     
-  *) Get APR_OFF_T_FMT defined properly on Solaris Sparc.
-     [Jeff Trawick]
-
-
-Changes with APR a8
-
-  *) Change the name of the sa_len field in apr_sockaddr_t to salen.
-     Some platforms have a macro named sa_len.
-     [Tony Finch]
-
-  *) apr_set_port(), apr_get_port(), apr_set_ipaddr(), and apr_get_ipaddr()
-     now take apr_sockaddr_t as a parameter instead of apr_socket_t +
-     apr_interface_e.  This will allow the same routines to be used with
-     datagram APIs to be added later.  Note that code which calls 
-     apr_set_ipaddr() should probably be changed to call apr_getaddrinfo()
-     for protocol independence.  [Jeff Trawick]
-
-  *) apr_create_tcp_socket() has been removed.  Use apr_create_socket()
-     instead.  [Jeff Trawick]
-
-  *) Source was moved from the apache-2.0 repository.  For all CHANGES
-     prior to this time, please see the apache-2.0 repository
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/LICENSE b/rubbos/app/httpd-2.0.64/srclib/apr/LICENSE
deleted file mode 100644
index af1c4695..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/LICENSE
+++ /dev/null
@@ -1,370 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       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.
-
-
-
-APACHE PORTABLE RUNTIME SUBCOMPONENTS: 
-
-The Apache Portable Runtime includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses. 
-
-From strings/apr_fnmatch.c, include/apr_fnmatch.h, misc/unix/getopt.c,
-file_io/unix/mktemp.c, strings/apr_strings.c:
-
-/* 
- * Copyright (c) 1987, 1993, 1994
- *      The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
-
-From network_io/unix/inet_ntop.c, network_io/unix/inet_pton.c:
-
-/* Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
-
-From dso/aix/dso.c:
-
- *  Based on libdl (dlfcn.c/dlfcn.h) which is
- *  Copyright (c) 1992,1993,1995,1996,1997,1988
- *  Jens-Uwe Mager, Helios Software GmbH, Hannover, Germany.
- *
- *  Not derived from licensed software.
- *
- *  Permission is granted to freely use, copy, modify, and redistribute
- *  this software, provided that the author is not construed to be liable
- *  for any results of using the software, alterations are clearly marked
- *  as such, and this notice is not modified.
-
-From strings/apr_strnatcmp.c, include/apr_strings.h:
-
-  strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
-  Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-
-From test/CuTest.c, test/CuTest.h:
-
- * Copyright (c) 2002-2006 Asim Jalis
- * 
- * This library is released under the zlib/libpng license as described at
- * 
- * http://www.opensource.org/licenses/zlib-license.html
- * 
- * Here is the statement of the license:
- * 
- * This software is provided 'as-is', without any express or implied warranty. 
- * In no event will the authors be held liable for any damages arising from 
- * the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose, 
- * including commercial applications, and to alter it and redistribute it 
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not 
- * claim that you wrote the original software. If you use this software in a 
- * product, an acknowledgment in the product documentation would be 
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source distribution.
-
-
-From strings/apr_snprintf.c:
-
-  *
-  * cvt - IEEE floating point formatting routines.
-  *       Derived from UNIX V7, Copyright(C) Caldera International Inc.
-  *
-
-  Copyright(C) Caldera International Inc.  2001-2002.  All rights reserved.
-  
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are
-  met:
-
-  Redistributions of source code and documentation must retain the above
-  copyright notice, this list of conditions and the following disclaimer.
-
-  Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-
-  All advertising materials mentioning features or use of this software
-  must display the following acknowledgement:
-
-     This product includes software developed or owned by  Caldera
-     International, Inc.
-
-  Neither the name of Caldera International, Inc. nor the names of other
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-  USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
-  INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED
-  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
-  NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT,
-  INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/Makefile
deleted file mode 100644
index ad3c4319..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/Makefile
+++ /dev/null
@@ -1,149 +0,0 @@
-#
-# APR (Apache Portable Runtime) library Makefile.
-#
-CPP = gcc -E
-
-# get substituted into some targets
-APR_MAJOR_VERSION=0
-
-#
-# Macros for supporting directories
-#
-INCDIR=./include
-INCDIR1=../include
-INCLUDES=-I$(INCDIR) -I$(INCDIR1)
-
-#
-# Macros for target determination
-#
-SUBDIRS=strings passwd tables  file_io/unix  network_io/unix  threadproc/unix  misc/unix  locks/unix  time/unix  mmap/unix  shmem/unix  user/unix  memory/unix  atomic/unix  poll/unix  support/unix  dso/unix 
-CLEAN_SUBDIRS= . test build
-INSTALL_SUBDIRS=none
-
-TARGET_LIB = libapr-${APR_MAJOR_VERSION}.la
-
-#
-# Rules for building specific targets, starting with 'all' for
-# building the entire package.
-#
-TARGETS = delete-lib $(TARGET_LIB) delete-exports export_vars.c apr.exp
-
-# bring in rules.mk for standard functionality
-include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
-
-CLEAN_TARGETS = apr.exp exports.c export_vars.c apr-config.out \
-	build/apr_rules.out
-DISTCLEAN_TARGETS = config.cache config.log config.status \
-	include/apr.h include/arch/unix/apr_private.h \
-	libtool apr-config
-EXTRACLEAN_TARGETS = configure aclocal.m4 include/arch/unix/apr_private.h.in
-
-prefix=/bottlenecks/rubbos/app/apache2
-exec_prefix=/bottlenecks/rubbos/app/apache2
-bindir=${prefix}/bin
-libdir=${prefix}/lib
-includedir=/bottlenecks/rubbos/app/apache2/include
-installbuilddir=${prefix}/build
-srcdir=.
-
-top_srcdir=/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr
-top_blddir=/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr
-
-EXPORT_FILES = $(top_srcdir)/include/*.h
-
-delete-lib:
-	@if test -f $(TARGET_LIB); then \
-	    for i in $(SUBDIRS); do objects="$$objects $$i/*.lo"; done ; \
-	    if test -n "`find $$objects -newer $(TARGET_LIB)`"; then \
-		echo Found newer objects. Will relink $(TARGET_LIB). ; \
-		echo $(RM) -f $(TARGET_LIB) ; \
-		$(RM) -f $(TARGET_LIB) ; \
-	    fi \
-	fi
-
-# Create apr-config script suitable for the install tree
-apr-config.out: apr-config
-	sed 's,^\(location=\).*$$,\1installed,' < apr-config > $@
-
-# Create apr_rules.mk suitable for the install tree
-build/apr_rules.out: build/apr_rules.mk
-	sed 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
-
-install: $(TARGET_LIB) apr-config.out build/apr_rules.out
-	if [ ! -d $(DESTDIR)$(includedir) ]; then \
-	    $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(includedir); \
-	fi;
-	cp -p $(top_srcdir)/include/*.h $(DESTDIR)$(includedir);
-
-	if test -n "$(top_blddir)"; then \
-	    cp -p $(top_blddir)/include/*.h $(DESTDIR)$(includedir); \
-	fi;
-	if [ ! -d $(DESTDIR)$(libdir) ]; then \
-	    $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(libdir); \
-	fi;
-	$(LIBTOOL) --mode=install cp $(TARGET_LIB) $(DESTDIR)$(libdir)
-	$(LIBTOOL) --mode=install cp apr.exp $(DESTDIR)$(libdir)
-	if [ ! -d $(DESTDIR)$(installbuilddir) ]; then \
-	   	$(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir); \
-	fi; 
-	if [ -f libtool ]; then \
-		$(LIBTOOL) --mode=install cp libtool $(DESTDIR)$(installbuilddir); \
-	fi;
-	if [ -f shlibtool ]; then \
-		$(LIBTOOL) --mode=install cp shlibtool $(DESTDIR)$(installbuilddir); \
-	fi;
-	for f in mkdir.sh make_exports.awk make_var_export.awk; do \
-	        cp $(top_srcdir)/build/$${f} $(DESTDIR)$(installbuilddir); \
-	done
-	cp build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
-	if [ ! -d $(DESTDIR)$(bindir) ]; then \
-	    $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(bindir); \
-	fi;
-	$(LIBTOOL) --mode=install cp apr-config.out $(DESTDIR)$(bindir)/apr-config
-	chmod 755 $(DESTDIR)$(bindir)/apr-config
-	@if [ $(INSTALL_SUBDIRS) != "none" ]; then \
-            for i in $(INSTALL_SUBDIRS); do \
-	        ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
-	    done \
-	fi
-
-$(TARGET_LIB):
-	@for i in $(SUBDIRS); do objects="$$objects $$i/*.lo"; done ; \
-	    tmpcmd="$(LINK) -rpath $(libdir) $$objects $(ALL_LIBS)"; \
-	    echo $$tmpcmd; \
-	    $$tmpcmd && touch $@
-
-delete-exports:
-	@if test -f apr.exp; then \
-	    headers="`find include/*.h -newer apr.exp`" ; \
-	    if test -n "$$headers"; then \
-		echo Found newer headers. Will rebuild apr.exp. ; \
-		echo $(RM) -f apr.exp exports.c export_vars.h ; \
-		$(RM) -f apr.exp exports.c export_vars.h ; \
-	    fi \
-	fi
-
-exports.c:
-	$(APR_MKEXPORT) $(EXPORT_FILES) > $@
-
-export_vars.c:
-	$(APR_MKVAREXPORT) $(EXPORT_FILES) > $@
-
-apr.exp: exports.c export_vars.c
-	@echo "#! libapr-${APR_MAJOR_VERSION}.so" > $@
-	@echo "* This file was AUTOGENERATED at build time." >> $@
-	@echo "* Please do not edit by hand." >> $@
-	$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@
-	$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.c | sed -e 's/^\#[^!]*//' | sed -e '/^$$/d' >> $@
-
-dox:
-	doxygen $(top_srcdir)/docs/doxygen.conf
-
-check: $(TARGET_LIB)
-	(cd test && $(MAKE) check)
-
-# DO NOT REMOVE
-docs: $(INCDIR)/*.h
-
-.PHONY: delete-lib delete-exports
-.NOTPARALLEL: delete-lib delete-exports
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/Makefile.in
deleted file mode 100644
index 42139ea9..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/Makefile.in
+++ /dev/null
@@ -1,149 +0,0 @@
-#
-# APR (Apache Portable Runtime) library Makefile.
-#
-CPP = @CPP@
-
-# get substituted into some targets
-APR_MAJOR_VERSION=@APR_MAJOR_VERSION@
-
-#
-# Macros for supporting directories
-#
-INCDIR=./include
-INCDIR1=../include
-INCLUDES=-I$(INCDIR) -I$(INCDIR1)
-
-#
-# Macros for target determination
-#
-SUBDIRS=@SUBDIRS@
-CLEAN_SUBDIRS= . test build
-INSTALL_SUBDIRS=@INSTALL_SUBDIRS@
-
-TARGET_LIB = lib@APR_LIBNAME@.la
-
-#
-# Rules for building specific targets, starting with 'all' for
-# building the entire package.
-#
-TARGETS = delete-lib $(TARGET_LIB) delete-exports export_vars.c apr.exp
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-CLEAN_TARGETS = apr.exp exports.c export_vars.c apr-config.out \
-	build/apr_rules.out
-DISTCLEAN_TARGETS = config.cache config.log config.status \
-	include/apr.h include/arch/unix/apr_private.h \
-	libtool apr-config
-EXTRACLEAN_TARGETS = configure aclocal.m4 include/arch/unix/apr_private.h.in
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libdir=@libdir@
-includedir=@includedir@
-installbuilddir=@installbuilddir@
-srcdir=@srcdir@
-VPATH=@srcdir@
-top_srcdir=@apr_srcdir@
-top_blddir=@apr_builddir@
-
-EXPORT_FILES = $(top_srcdir)/include/*.h
-
-delete-lib:
-	@if test -f $(TARGET_LIB); then \
-	    for i in $(SUBDIRS); do objects="$$objects $$i/*.@so_ext@"; done ; \
-	    if test -n "`find $$objects -newer $(TARGET_LIB)`"; then \
-		echo Found newer objects. Will relink $(TARGET_LIB). ; \
-		echo $(RM) -f $(TARGET_LIB) ; \
-		$(RM) -f $(TARGET_LIB) ; \
-	    fi \
-	fi
-
-# Create apr-config script suitable for the install tree
-apr-config.out: apr-config
-	sed 's,^\(location=\).*$$,\1installed,' < apr-config > $@
-
-# Create apr_rules.mk suitable for the install tree
-build/apr_rules.out: build/apr_rules.mk
-	sed 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
-
-install: $(TARGET_LIB) apr-config.out build/apr_rules.out
-	if [ ! -d $(DESTDIR)$(includedir) ]; then \
-	    $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(includedir); \
-	fi;
-	cp -p $(top_srcdir)/include/*.h $(DESTDIR)$(includedir);
-
-	if test -n "$(top_blddir)"; then \
-	    cp -p $(top_blddir)/include/*.h $(DESTDIR)$(includedir); \
-	fi;
-	if [ ! -d $(DESTDIR)$(libdir) ]; then \
-	    $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(libdir); \
-	fi;
-	$(LIBTOOL) --mode=install cp $(TARGET_LIB) $(DESTDIR)$(libdir)
-	$(LIBTOOL) --mode=install cp apr.exp $(DESTDIR)$(libdir)
-	if [ ! -d $(DESTDIR)$(installbuilddir) ]; then \
-	   	$(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir); \
-	fi; 
-	if [ -f libtool ]; then \
-		$(LIBTOOL) --mode=install cp libtool $(DESTDIR)$(installbuilddir); \
-	fi;
-	if [ -f shlibtool ]; then \
-		$(LIBTOOL) --mode=install cp shlibtool $(DESTDIR)$(installbuilddir); \
-	fi;
-	for f in mkdir.sh make_exports.awk make_var_export.awk; do \
-	        cp $(top_srcdir)/build/$${f} $(DESTDIR)$(installbuilddir); \
-	done
-	cp build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
-	if [ ! -d $(DESTDIR)$(bindir) ]; then \
-	    $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(bindir); \
-	fi;
-	$(LIBTOOL) --mode=install cp apr-config.out $(DESTDIR)$(bindir)/apr-config
-	chmod 755 $(DESTDIR)$(bindir)/apr-config
-	@if [ $(INSTALL_SUBDIRS) != "none" ]; then \
-            for i in $(INSTALL_SUBDIRS); do \
-	        ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
-	    done \
-	fi
-
-$(TARGET_LIB):
-	@for i in $(SUBDIRS); do objects="$$objects $$i/*.@so_ext@"; done ; \
-	    tmpcmd="$(LINK) @lib_target@ $(ALL_LIBS)"; \
-	    echo $$tmpcmd; \
-	    $$tmpcmd && touch $@
-
-delete-exports:
-	@if test -f apr.exp; then \
-	    headers="`find include/*.h -newer apr.exp`" ; \
-	    if test -n "$$headers"; then \
-		echo Found newer headers. Will rebuild apr.exp. ; \
-		echo $(RM) -f apr.exp exports.c export_vars.h ; \
-		$(RM) -f apr.exp exports.c export_vars.h ; \
-	    fi \
-	fi
-
-exports.c:
-	$(APR_MKEXPORT) $(EXPORT_FILES) > $@
-
-export_vars.c:
-	$(APR_MKVAREXPORT) $(EXPORT_FILES) > $@
-
-apr.exp: exports.c export_vars.c
-	@echo "#! lib@APR_LIBNAME@.so" > $@
-	@echo "* This file was AUTOGENERATED at build time." >> $@
-	@echo "* Please do not edit by hand." >> $@
-	$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@
-	$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.c | sed -e 's/^\#[^!]*//' | sed -e '/^$$/d' >> $@
-
-dox:
-	doxygen $(top_srcdir)/docs/doxygen.conf
-
-check: $(TARGET_LIB)
-	(cd test && $(MAKE) check)
-
-# DO NOT REMOVE
-docs: $(INCDIR)/*.h
-
-.PHONY: delete-lib delete-exports
-.NOTPARALLEL: delete-lib delete-exports
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/NOTICE b/rubbos/app/httpd-2.0.64/srclib/apr/NOTICE
deleted file mode 100644
index 1e0abd3a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/NOTICE
+++ /dev/null
@@ -1,15 +0,0 @@
-Apache Portable Runtime
-Copyright (c) 2009 The Apache Software Foundation.
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were developed at the National Center
-for Supercomputing Applications (NCSA) at the University of
-Illinois at Urbana-Champaign.
-
-This software contains code derived from the RSA Data Security
-Inc. MD5 Message-Digest Algorithm.
-
-This software contains code derived from UNIX V7, Copyright(C)
-Caldera International Inc.
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/NWGNUmakefile b/rubbos/app/httpd-2.0.64/srclib/apr/NWGNUmakefile
deleted file mode 100644
index 49830ca8..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/NWGNUmakefile
+++ /dev/null
@@ -1,440 +0,0 @@
-#
-# Declare the sub-directories to be built here
-#
-
-SUBDIRS = \
-		build \
-		..\apr-util \
-		$(EOLIST) 
-
-#
-# Get the 'head' of the build environment.  This includes default targets and
-# paths to tools
-#
-
-include $(APR_WORK)\build\NWGNUhead.inc
-
-#
-# build this level's files
-
-#
-# Make sure all needed macro's are defined
-#
-
-#
-# These directories will be at the beginning of the include list, followed by
-# INCDIRS
-#
-XINCDIRS	+= \
-			$(APR_WORK)/include \
-			$(APR_WORK)/include/arch/NetWare \
-			$(APR_WORK)/include/arch/unix \
-			$(APR_WORK)/memory/unix \
-			$(APRUTIL)/xml \
-			$(EOLIST)
-
-#
-# These flags will come after CFLAGS
-#
-XCFLAGS		+= \
-			$(EOLIST)
-
-#
-# These defines will come after DEFINES
-#
-XDEFINES	+= \
-			$(EOLIST)
-
-#
-# These flags will be added to the link.opt file
-#
-XLFLAGS		+= \
-			$(EOLIST)
-
-#
-# These values will be appended to the correct variables based on the value of
-# RELEASE
-#
-ifeq "$(RELEASE)" "debug"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "noopt"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "release"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-endif
-
-#
-# These are used by the link target if an NLM is being generated
-# This is used by the link 'name' directive to name the nlm.  If left blank
-# TARGET_nlm (see below) will be used.
-#
-NLM_NAME		= aprlib
-
-#
-# This is used by the link '-desc ' directive. 
-# If left blank, NLM_NAME will be used.
-#
-NLM_DESCRIPTION	= Apache Portability Runtime Library $(VERSION_STR)
-
-#
-# This is used by the '-threadname' directive.  If left blank,
-# NLM_NAME Thread will be used.
-#
-NLM_THREAD_NAME	= 
-#
-# If this is specified, it will override VERSION value in 
-# $(APR_WORK)\build\NWGNUenvironment.inc
-#
-NLM_VERSION		=
-
-#
-# If this is specified, it will override the default of 64K
-#
-NLM_STACK_SIZE	= 
-
-#
-# If this is specified it will be used by the link '-entry' directive
-#
-NLM_ENTRY_SYM	= _LibCPrelude
-
-#
-# If this is specified it will be used by the link '-exit' directive
-#
-NLM_EXIT_SYM	= _LibCPostlude
-
-#
-# If this is specified it will be used by the link '-check' directive
-#
-NLM_CHECK_SYM	=
-
-#
-# If this is specified it will be used by the link '-flags' directive
-#
-NLM_FLAGS		= AUTOUNLOAD, PSEUDOPREEMPTION
- 
-#
-# If this is specified it will be linked in with the XDCData option in the def 
-# file instead of the default of $(APR)/misc/netware/apache.xdc.  XDCData can 
-# be disabled by setting APACHE_UNIPROC in the environment
-#
-XDCDATA         = 
-
-#
-# Declare all target files (you must add your files here)
-#
-
-#
-# If there is an NLM target, put it here
-#
-TARGET_nlm = \
-	$(OBJDIR)/aprlib.nlm \
-	$(EOLIST)
-
-#
-# If there is an LIB target, put it here
-#
-TARGET_lib = \
-	$(OBJDIR)/aprlib.lib \
-	$(EOLIST)
-
-#
-# These are the OBJ files needed to create the NLM target above.
-# Paths must all use the '/' character
-#
-FILES_nlm_objs = \
-	$(OBJDIR)/libprews.o \
-	$(EOLIST)
-
-#
-# These are the LIB files needed to create the NLM target above.
-# These will be added as a library command in the link.opt file.
-#
-FILES_nlm_libs = \
-	libcpre.o \
-	$(APRLIB) \
-	$(APRUTLIB) \
-	$(XMLLIB) \
-	$(EOLIST)
-
-#
-# These are the modules that the above NLM target depends on to load.
-# These will be added as a module command in the link.opt file.
-#
-FILES_nlm_modules = \
-	Libc \
-	ws2_32 \
-	$(EOLIST)
-
-#
-# If the nlm has a msg file, put it's path here
-#
-FILE_nlm_msg =
- 
-#
-# If the nlm has a hlp file put it's path here
-#
-FILE_nlm_hlp =
-
-#
-# If this is specified, it will override $(NWOS)\copyright.txt.
-#
-FILE_nlm_copyright =
-
-#
-# Any additional imports go here
-#
-FILES_nlm_Ximports = \
-	@libc.imp \
-	@ws2nlm.imp \
-	@netware.imp \
-	WSAStartupRTags \
-	WSACleanupRTag \
-	$(EOLIST)
- 
-#   
-# Any symbols exported to here
-#
-FILES_nlm_exports = \
-	@aprlib.imp	\
-	$(EOLIST)
-	
-#   
-# These are the OBJ files needed to create the LIB target above.
-# Paths must all use the '/' character
-#
-FILES_lib_objs = \
-	$(OBJDIR)/apr_cpystrn.o \
-	$(OBJDIR)/apr_fnmatch.o \
-	$(OBJDIR)/apr_getpass.o \
-	$(OBJDIR)/apr_hash.o \
-	$(OBJDIR)/apr_pools.o \
-	$(OBJDIR)/apr_snprintf.o \
-	$(OBJDIR)/apr_strings.o \
-	$(OBJDIR)/apr_strnatcmp.o \
-	$(OBJDIR)/apr_strtok.o \
-	$(OBJDIR)/apr_tables.o \
-	$(OBJDIR)/charset.o \
-	$(OBJDIR)/copy.o \
-	$(OBJDIR)/common.o \
-	$(OBJDIR)/dir.o \
-	$(OBJDIR)/dso.o \
-	$(OBJDIR)/errorcodes.o \
-	$(OBJDIR)/env.o \
-	$(OBJDIR)/fileacc.o \
-	$(OBJDIR)/filedup.o \
-	$(OBJDIR)/filepath.o \
-	$(OBJDIR)/filepath_util.o \
-	$(OBJDIR)/filestat.o \
-	$(OBJDIR)/filesys.o \
-	$(OBJDIR)/flock.o \
-	$(OBJDIR)/fullrw.o \
-	$(OBJDIR)/getopt.o \
-	$(OBJDIR)/groupinfo.o \
-	$(OBJDIR)/inet_pton.o \
-	$(OBJDIR)/inet_ntop.o \
-	$(OBJDIR)/libprews.o \
-	$(OBJDIR)/mktemp.o \
-	$(OBJDIR)/mmap.o \
-	$(OBJDIR)/open.o \
-	$(OBJDIR)/pipe.o \
-	$(OBJDIR)/otherchild.o \
-	$(OBJDIR)/poll.o \
-	$(OBJDIR)/pollacc.o \
-	$(OBJDIR)/proc.o \
-	$(OBJDIR)/procsup.o \
-	$(OBJDIR)/proc_mutex.o \
-	$(OBJDIR)/rand.o \
-	$(OBJDIR)/readwrite.o \
-	$(OBJDIR)/seek.o \
-	$(OBJDIR)/sendrecv.o \
-	$(OBJDIR)/shm.o \
-	$(OBJDIR)/signals.o \
-	$(OBJDIR)/sockaddr.o \
-	$(OBJDIR)/sockets.o \
-	$(OBJDIR)/sockopt.o \
-	$(OBJDIR)/start.o \
-	$(OBJDIR)/tempdir.o \
-	$(OBJDIR)/thread.o \
-	$(OBJDIR)/thread_cond.o \
-	$(OBJDIR)/thread_mutex.o \
-	$(OBJDIR)/thread_rwlock.o \
-	$(OBJDIR)/threadpriv.o \
-	$(OBJDIR)/time.o \
-	$(OBJDIR)/timestr.o \
-	$(OBJDIR)/userinfo.o \
-	$(OBJDIR)/version.o \
-	$(OBJDIR)/waitio.o \
-	$(EOLIST)
-
-
-#
-# implement targets and dependancies (leave this section alone)
-#
-
-libs :: $(OBJDIR) $(TARGET_lib)
-
-nlms :: libs $(TARGET_nlm)
-
-#
-# Updated this target to create necessary directories and copy files to the 
-# correct place.  (See $(APR_WORK)\build\NWGNUhead.inc for examples)
-#
-install :: nlms $(INSTDIRS) FORCE
-	copy $(OBJDIR)\aprlib.nlm                          $(INSTALLBASE)\*.*
-ifndef DEST
-	-copy $(subst /,\,$(APR))\STATUS                   $(INSTALLBASE)\*.apr
-	-copy $(subst /,\,$(APR))\LICENSE                  $(INSTALLBASE)\*
-	-copy $(subst /,\,$(APR))\CHANGES                  $(INSTALLBASE)\*.apr
-	-copy $(subst /,\,$(APRUTIL))\STATUS               $(INSTALLBASE)\*.apu
-	-copy $(subst /,\,$(APRUTIL))\CHANGES              $(INSTALLBASE)\*.apu
-	@echo rem copying the docs directories > xc.bat
-	@echo xcopy docs $(INSTALLBASE)\docs\*.* $(XCOPYSW) >> xc.bat
-	$(CMD) xc.bat
-	$(DEL) xc.bat
-	
-endif	
-	
-$(INSTDIRS) ::
-	$(CHKNOT) $@\NUL mkdir $@
-
-ifndef DEST
-installdev :: $(INSTDEVDIRS) FORCE
-	-copy $(subst /,\,$(APR))\include\*.h               $(INSTALLBASE)\include\*.*
-	-copy $(subst /,\,$(APRUTIL))\include\*.h           $(INSTALLBASE)\include\*.*
-	-copy $(subst /,\,$(APR))\*.imp                     $(INSTALLBASE)\lib\*.*
-	-copy $(subst /,\,$(APR))\misc\netware\*.xdc        $(INSTALLBASE)\lib\*.*
-	
-$(INSTDEVDIRS) ::
-	$(CHKNOT) $@\NUL mkdir $@
-endif	
-
-#
-# Any specialized rules here
-#
-
-$(OBJDIR)/%.o: strings/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) strings\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: tables/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) tables\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: passwd/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) passwd\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: lib/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) lib\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: time/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) time\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: file_io/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) file_io\netware\$(<F) -cwd source -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: file_io/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) file_io\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: locks/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) locks\netware\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: misc/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) misc\netware\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: misc/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) misc\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: threadproc/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) threadproc\netware\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: dso/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) dso\netware\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: memory/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) memory\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: mmap/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) mmap\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: user/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) user\netware\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: network_io/win32/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) network_io\win32\$(<F) -cwd source -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: network_io/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) network_io\unix\$(<F) -cwd source -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-	
-$(OBJDIR)/%.o: poll/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) poll\unix\$(<F) -cwd source -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: file_io/os2/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) file_io\os2\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: shmem/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) shmem\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)/%.o: support/unix/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) support\unix\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-#
-# Include the 'tail' makefile that has targets that depend on variables defined
-# in this makefile
-#
-
-include $(APR_WORK)\build\NWGNUtail.inc
-
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/README.dev b/rubbos/app/httpd-2.0.64/srclib/apr/README.dev
deleted file mode 100644
index 26bdc93c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/README.dev
+++ /dev/null
@@ -1,15 +0,0 @@
-Apache Portable Runtime
-=======================
-
-If you are building APR from SVN, you need to use a slightly non-standard
-build process.  You must have autoconf and libtool installed for this to
-work.  There are three steps:
-
-1) ./buildconf
-2) ./configure
-3) make
-
-If you are building APR from a distribution tarball, buildconf will have
-already been run for you, and you therefore do not need to have either
-autoconf or libtool installed, and you do not need to run buildconf.  Skip
-step one above and just run configure then make.
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/acconfig.h b/rubbos/app/httpd-2.0.64/srclib/apr/acconfig.h
deleted file mode 100644
index cbd03e53..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/acconfig.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef APR_PRIVATE_H
-#define APR_PRIVATE_H
-
-@TOP@
-
-/* Various #defines we need to know about */
-#undef USE_THREADS
-#undef EGD_DEFAULT_SOCKET
-#undef HAVE_isascii
-#undef DIRENT_INODE
-#undef DIRENT_TYPE
-
-/* Cross process serialization techniques */
-#undef USE_FLOCK_SERIALIZE
-#undef USE_SYSVSEM_SERIALIZE
-#undef USE_FCNTL_SERIALIZE
-#undef USE_PROC_PTHREAD_SERIALIZE
-#undef USE_PTHREAD_SERIALIZE
-
-#undef POSIXSEM_IS_GLOBAL
-#undef SYSVSEM_IS_GLOBAL
-#undef FCNTL_IS_GLOBAL
-#undef FLOCK_IS_GLOBAL
-
-#undef HAVE_INT64_C
-
-@BOTTOM@
-
-/* Make sure we have ssize_t defined to be something */
-#undef ssize_t
-
-/* switch this on if we have a BeOS version below BONE */
-#if BEOS && !HAVE_BONE_VERSION
-#define BEOS_R5 1
-#else
-#define BEOS_BONE 1
-#endif
-
-#ifdef SIGWAIT_TAKES_ONE_ARG
-#define apr_sigwait(a,b) ((*(b)=sigwait((a)))<0?-1:0)
-#else
-#define apr_sigwait(a,b) sigwait((a),(b))
-#endif
-
-/*
- * Include common private declarations.
- */
-#include "../apr_private_common.h"
-
-#endif /* APR_PRIVATE_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/apr-config b/rubbos/app/httpd-2.0.64/srclib/apr/apr-config
deleted file mode 100755
index fce0f7a0..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/apr-config
+++ /dev/null
@@ -1,249 +0,0 @@
-#!/bin/sh
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# APR script designed to allow easy command line access to APR configuration
-# parameters.
-
-APR_MAJOR_VERSION="0"
-APR_DOTTED_VERSION="0.9.19"
-
-prefix="/bottlenecks/rubbos/app/apache2"
-exec_prefix="/bottlenecks/rubbos/app/apache2"
-bindir="${prefix}/bin"
-libdir="${prefix}/lib"
-datarootdir="/bottlenecks/rubbos/app/apache2"
-datadir="/bottlenecks/rubbos/app/apache2"
-installbuilddir="${prefix}/build"
-includedir="/bottlenecks/rubbos/app/apache2/include"
-
-CC="gcc"
-CPP="gcc -E"
-SHELL="/bin/bash"
-CPPFLAGS="-D_REENTRANT -D_GNU_SOURCE"
-CFLAGS="-g -O2 -pthread"
-LDFLAGS=""
-LIBS="-lrt -lm -lcrypt -lnsl  -lpthread -ldl"
-EXTRA_INCLUDES=""
-SHLIBPATH_VAR="LD_LIBRARY_PATH"
-APR_SOURCE_DIR="/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr"
-APR_BUILD_DIR="/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr"
-APR_SO_EXT="lo"
-APR_LIB_TARGET="-rpath \$(libdir) \$\$objects"
-APR_LIBNAME="apr-${APR_MAJOR_VERSION}"
-
-# NOTE: the following line is modified during 'make install': alter with care!
-location=source
-
-show_usage()
-{
-    cat << EOF
-Usage: apr-config [OPTION]
-
-Known values for OPTION are:
-  --prefix[=DIR]    change prefix to DIR
-  --bindir          print location where binaries are installed
-  --includedir      print location where headers are installed
-  --cc              print C compiler name
-  --cpp             print C preprocessor name and any required options
-  --cflags          print C compiler flags
-  --cppflags        print cpp flags
-  --includes        print include information
-  --ldflags         print linker flags
-  --libs            print additional libraries to link against
-  --srcdir          print APR source directory
-  --installbuilddir print APR build helper directory
-  --link-ld         print link switch(es) for linking to APR
-  --link-libtool    print the libtool inputs for linking to APR
-  --shlib-path-var  print the name of the shared library path env var
-  --apr-la-file     print the path to the .la file, if available
-  --apr-so-ext      print the extensions of shared objects on this platform
-  --apr-lib-target  print the libtool target information
-  --apr-libtool     print the path to APR's libtool
-  --version         print the APR's version as a dotted triple
-  --help            print this help
-
-When linking with libtool, an application should do something like:
-  APR_LIBS="\`apr-config --link-libtool --libs\`"
-or when linking directly:
-  APR_LIBS="\`apr-config --link-ld --libs\`"
-
-An application should use the results of --cflags, --cppflags, --includes,
-and --ldflags in their build process.
-EOF
-}
-
-if test $# -eq 0; then
-    show_usage
-    exit 1
-fi
-
-if test "$location" = "installed"; then
-    LA_FILE="$libdir/lib${APR_LIBNAME}.la"
-else
-    LA_FILE="$APR_BUILD_DIR/lib${APR_LIBNAME}.la"
-fi
-
-flags=""
-
-while test $# -gt 0; do
-    # Normalize the prefix.
-    case "$1" in
-    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-    *) optarg= ;;
-    esac
-
-    case "$1" in
-    # It is possible for the user to override our prefix.
-    --prefix=*)
-    prefix=$optarg
-    ;;
-    --prefix)
-    echo $prefix
-    exit 0
-    ;;
-    --bindir)
-    echo $bindir
-    exit 0
-    ;;
-    --includedir)
-    if test "$location" = "installed"; then
-        flags="$includedir"
-    elif test "$location" = "source"; then
-        flags="$APR_SOURCE_DIR/include"
-    else
-        # this is for VPATH builds
-        flags="$APR_BUILD_DIR/include $APR_SOURCE_DIR/include"
-    fi
-    echo $flags
-    exit 0
-    ;;
-    --cc)
-    echo $CC
-    exit 0
-    ;;
-    --cpp)
-    echo $CPP
-    exit 0
-    ;;
-    --cflags)
-    flags="$flags $CFLAGS"
-    ;;
-    --cppflags)
-    flags="$flags $CPPFLAGS"
-    ;;
-    --libs)
-    flags="$flags $LIBS"
-    ;;
-    --ldflags)
-    flags="$flags $LDFLAGS"
-    ;;
-    --includes)
-    if test "$location" = "installed"; then
-        flags="$flags -I$includedir $EXTRA_INCLUDES"
-    elif test "$location" = "source"; then
-        flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES"
-    else
-        # this is for VPATH builds
-        flags="$flags -I$APR_BUILD_DIR/include -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES"
-    fi
-    ;;
-    --srcdir)
-    echo $APR_SOURCE_DIR
-    exit 0
-    ;;
-    --installbuilddir)
-    if test "$location" = "installed"; then
-        echo "${installbuilddir}"
-    elif test "$location" = "source"; then
-        echo "$APR_SOURCE_DIR/build"
-    else
-        # this is for VPATH builds
-        echo "$APR_BUILD_DIR/build"
-    fi
-    exit 0
-    ;;
-    --version)
-    echo $APR_DOTTED_VERSION
-    exit 0
-    ;;
-    --link-ld)
-    if test "$location" = "installed"; then
-        ### avoid using -L if libdir is a "standard" location like /usr/lib
-        flags="$flags -L$libdir -l${APR_LIBNAME}"
-    else
-        ### this surely can't work since the library is in .libs?
-        flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}"
-    fi
-    ;;
-    --link-libtool)
-    # If the LA_FILE exists where we think it should be, use it.  If we're
-    # installed and the LA_FILE does not exist, assume to use -L/-l
-    # (the LA_FILE may not have been installed).  If we're building ourselves,
-    # we'll assume that at some point the .la file be created.
-    if test -f "$LA_FILE"; then
-        flags="$flags $LA_FILE"
-    elif test "$location" = "installed"; then
-        ### avoid using -L if libdir is a "standard" location like /usr/lib
-        flags="$flags -L$libdir -l${APR_LIBNAME}"
-    else
-        flags="$flags $LA_FILE"
-    fi
-    ;;
-    --shlib-path-var)
-    echo "$SHLIBPATH_VAR"
-    exit 0
-    ;;
-    --apr-la-file)
-    if test -f "$LA_FILE"; then
-        flags="$flags $LA_FILE"
-    fi
-    ;;
-    --apr-so-ext)
-    echo "$APR_SO_EXT"
-    exit 0
-    ;;
-    --apr-lib-target)
-    echo "$APR_LIB_TARGET"
-    exit 0
-    ;;
-    --apr-libtool)
-    if test "$location" = "installed"; then
-        echo "${installbuilddir}/libtool"
-    else
-        echo "$APR_BUILD_DIR/libtool"
-    fi
-    exit 0
-    ;;
-    --help)
-    show_usage
-    exit 0
-    ;;
-    *)
-    show_usage
-    exit 1
-    ;;
-    esac
-
-    # Next please.
-    shift
-done
-
-if test -n "$flags"; then
-  echo "$flags"
-fi
-
-exit 0
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/apr-config.in b/rubbos/app/httpd-2.0.64/srclib/apr/apr-config.in
deleted file mode 100644
index 9eae645d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/apr-config.in
+++ /dev/null
@@ -1,249 +0,0 @@
-#!/bin/sh
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# APR script designed to allow easy command line access to APR configuration
-# parameters.
-
-APR_MAJOR_VERSION="@APR_MAJOR_VERSION@"
-APR_DOTTED_VERSION="@APR_DOTTED_VERSION@"
-
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-bindir="@bindir@"
-libdir="@libdir@"
-datarootdir="@datadir@"
-datadir="@datadir@"
-installbuilddir="@installbuilddir@"
-includedir="@includedir@"
-
-CC="@CC@"
-CPP="@CPP@"
-SHELL="@SHELL@"
-CPPFLAGS="@EXTRA_CPPFLAGS@"
-CFLAGS="@EXTRA_CFLAGS@"
-LDFLAGS="@EXTRA_LDFLAGS@"
-LIBS="@EXTRA_LIBS@"
-EXTRA_INCLUDES="@EXTRA_INCLUDES@"
-SHLIBPATH_VAR="@shlibpath_var@"
-APR_SOURCE_DIR="@apr_srcdir@"
-APR_BUILD_DIR="@apr_builddir@"
-APR_SO_EXT="@so_ext@"
-APR_LIB_TARGET="@export_lib_target@"
-APR_LIBNAME="@APR_LIBNAME@"
-
-# NOTE: the following line is modified during 'make install': alter with care!
-location=@APR_CONFIG_LOCATION@
-
-show_usage()
-{
-    cat << EOF
-Usage: apr-config [OPTION]
-
-Known values for OPTION are:
-  --prefix[=DIR]    change prefix to DIR
-  --bindir          print location where binaries are installed
-  --includedir      print location where headers are installed
-  --cc              print C compiler name
-  --cpp             print C preprocessor name and any required options
-  --cflags          print C compiler flags
-  --cppflags        print cpp flags
-  --includes        print include information
-  --ldflags         print linker flags
-  --libs            print additional libraries to link against
-  --srcdir          print APR source directory
-  --installbuilddir print APR build helper directory
-  --link-ld         print link switch(es) for linking to APR
-  --link-libtool    print the libtool inputs for linking to APR
-  --shlib-path-var  print the name of the shared library path env var
-  --apr-la-file     print the path to the .la file, if available
-  --apr-so-ext      print the extensions of shared objects on this platform
-  --apr-lib-target  print the libtool target information
-  --apr-libtool     print the path to APR's libtool
-  --version         print the APR's version as a dotted triple
-  --help            print this help
-
-When linking with libtool, an application should do something like:
-  APR_LIBS="\`apr-config --link-libtool --libs\`"
-or when linking directly:
-  APR_LIBS="\`apr-config --link-ld --libs\`"
-
-An application should use the results of --cflags, --cppflags, --includes,
-and --ldflags in their build process.
-EOF
-}
-
-if test $# -eq 0; then
-    show_usage
-    exit 1
-fi
-
-if test "$location" = "installed"; then
-    LA_FILE="$libdir/lib${APR_LIBNAME}.la"
-else
-    LA_FILE="$APR_BUILD_DIR/lib${APR_LIBNAME}.la"
-fi
-
-flags=""
-
-while test $# -gt 0; do
-    # Normalize the prefix.
-    case "$1" in
-    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-    *) optarg= ;;
-    esac
-
-    case "$1" in
-    # It is possible for the user to override our prefix.
-    --prefix=*)
-    prefix=$optarg
-    ;;
-    --prefix)
-    echo $prefix
-    exit 0
-    ;;
-    --bindir)
-    echo $bindir
-    exit 0
-    ;;
-    --includedir)
-    if test "$location" = "installed"; then
-        flags="$includedir"
-    elif test "$location" = "source"; then
-        flags="$APR_SOURCE_DIR/include"
-    else
-        # this is for VPATH builds
-        flags="$APR_BUILD_DIR/include $APR_SOURCE_DIR/include"
-    fi
-    echo $flags
-    exit 0
-    ;;
-    --cc)
-    echo $CC
-    exit 0
-    ;;
-    --cpp)
-    echo $CPP
-    exit 0
-    ;;
-    --cflags)
-    flags="$flags $CFLAGS"
-    ;;
-    --cppflags)
-    flags="$flags $CPPFLAGS"
-    ;;
-    --libs)
-    flags="$flags $LIBS"
-    ;;
-    --ldflags)
-    flags="$flags $LDFLAGS"
-    ;;
-    --includes)
-    if test "$location" = "installed"; then
-        flags="$flags -I$includedir $EXTRA_INCLUDES"
-    elif test "$location" = "source"; then
-        flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES"
-    else
-        # this is for VPATH builds
-        flags="$flags -I$APR_BUILD_DIR/include -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES"
-    fi
-    ;;
-    --srcdir)
-    echo $APR_SOURCE_DIR
-    exit 0
-    ;;
-    --installbuilddir)
-    if test "$location" = "installed"; then
-        echo "${installbuilddir}"
-    elif test "$location" = "source"; then
-        echo "$APR_SOURCE_DIR/build"
-    else
-        # this is for VPATH builds
-        echo "$APR_BUILD_DIR/build"
-    fi
-    exit 0
-    ;;
-    --version)
-    echo $APR_DOTTED_VERSION
-    exit 0
-    ;;
-    --link-ld)
-    if test "$location" = "installed"; then
-        ### avoid using -L if libdir is a "standard" location like /usr/lib
-        flags="$flags -L$libdir -l${APR_LIBNAME}"
-    else
-        ### this surely can't work since the library is in .libs?
-        flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}"
-    fi
-    ;;
-    --link-libtool)
-    # If the LA_FILE exists where we think it should be, use it.  If we're
-    # installed and the LA_FILE does not exist, assume to use -L/-l
-    # (the LA_FILE may not have been installed).  If we're building ourselves,
-    # we'll assume that at some point the .la file be created.
-    if test -f "$LA_FILE"; then
-        flags="$flags $LA_FILE"
-    elif test "$location" = "installed"; then
-        ### avoid using -L if libdir is a "standard" location like /usr/lib
-        flags="$flags -L$libdir -l${APR_LIBNAME}"
-    else
-        flags="$flags $LA_FILE"
-    fi
-    ;;
-    --shlib-path-var)
-    echo "$SHLIBPATH_VAR"
-    exit 0
-    ;;
-    --apr-la-file)
-    if test -f "$LA_FILE"; then
-        flags="$flags $LA_FILE"
-    fi
-    ;;
-    --apr-so-ext)
-    echo "$APR_SO_EXT"
-    exit 0
-    ;;
-    --apr-lib-target)
-    echo "$APR_LIB_TARGET"
-    exit 0
-    ;;
-    --apr-libtool)
-    if test "$location" = "installed"; then
-        echo "${installbuilddir}/libtool"
-    else
-        echo "$APR_BUILD_DIR/libtool"
-    fi
-    exit 0
-    ;;
-    --help)
-    show_usage
-    exit 0
-    ;;
-    *)
-    show_usage
-    exit 1
-    ;;
-    esac
-
-    # Next please.
-    shift
-done
-
-if test -n "$flags"; then
-  echo "$flags"
-fi
-
-exit 0
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/apr-config.out b/rubbos/app/httpd-2.0.64/srclib/apr/apr-config.out
deleted file mode 100644
index 84f95e73..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/apr-config.out
+++ /dev/null
@@ -1,249 +0,0 @@
-#!/bin/sh
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# APR script designed to allow easy command line access to APR configuration
-# parameters.
-
-APR_MAJOR_VERSION="0"
-APR_DOTTED_VERSION="0.9.19"
-
-prefix="/bottlenecks/rubbos/app/apache2"
-exec_prefix="/bottlenecks/rubbos/app/apache2"
-bindir="${prefix}/bin"
-libdir="${prefix}/lib"
-datarootdir="/bottlenecks/rubbos/app/apache2"
-datadir="/bottlenecks/rubbos/app/apache2"
-installbuilddir="${prefix}/build"
-includedir="/bottlenecks/rubbos/app/apache2/include"
-
-CC="gcc"
-CPP="gcc -E"
-SHELL="/bin/bash"
-CPPFLAGS="-D_REENTRANT -D_GNU_SOURCE"
-CFLAGS="-g -O2 -pthread"
-LDFLAGS=""
-LIBS="-lrt -lm -lcrypt -lnsl  -lpthread -ldl"
-EXTRA_INCLUDES=""
-SHLIBPATH_VAR="LD_LIBRARY_PATH"
-APR_SOURCE_DIR="/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr"
-APR_BUILD_DIR="/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr"
-APR_SO_EXT="lo"
-APR_LIB_TARGET="-rpath \$(libdir) \$\$objects"
-APR_LIBNAME="apr-${APR_MAJOR_VERSION}"
-
-# NOTE: the following line is modified during 'make install': alter with care!
-location=installed
-
-show_usage()
-{
-    cat << EOF
-Usage: apr-config [OPTION]
-
-Known values for OPTION are:
-  --prefix[=DIR]    change prefix to DIR
-  --bindir          print location where binaries are installed
-  --includedir      print location where headers are installed
-  --cc              print C compiler name
-  --cpp             print C preprocessor name and any required options
-  --cflags          print C compiler flags
-  --cppflags        print cpp flags
-  --includes        print include information
-  --ldflags         print linker flags
-  --libs            print additional libraries to link against
-  --srcdir          print APR source directory
-  --installbuilddir print APR build helper directory
-  --link-ld         print link switch(es) for linking to APR
-  --link-libtool    print the libtool inputs for linking to APR
-  --shlib-path-var  print the name of the shared library path env var
-  --apr-la-file     print the path to the .la file, if available
-  --apr-so-ext      print the extensions of shared objects on this platform
-  --apr-lib-target  print the libtool target information
-  --apr-libtool     print the path to APR's libtool
-  --version         print the APR's version as a dotted triple
-  --help            print this help
-
-When linking with libtool, an application should do something like:
-  APR_LIBS="\`apr-config --link-libtool --libs\`"
-or when linking directly:
-  APR_LIBS="\`apr-config --link-ld --libs\`"
-
-An application should use the results of --cflags, --cppflags, --includes,
-and --ldflags in their build process.
-EOF
-}
-
-if test $# -eq 0; then
-    show_usage
-    exit 1
-fi
-
-if test "$location" = "installed"; then
-    LA_FILE="$libdir/lib${APR_LIBNAME}.la"
-else
-    LA_FILE="$APR_BUILD_DIR/lib${APR_LIBNAME}.la"
-fi
-
-flags=""
-
-while test $# -gt 0; do
-    # Normalize the prefix.
-    case "$1" in
-    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-    *) optarg= ;;
-    esac
-
-    case "$1" in
-    # It is possible for the user to override our prefix.
-    --prefix=*)
-    prefix=$optarg
-    ;;
-    --prefix)
-    echo $prefix
-    exit 0
-    ;;
-    --bindir)
-    echo $bindir
-    exit 0
-    ;;
-    --includedir)
-    if test "$location" = "installed"; then
-        flags="$includedir"
-    elif test "$location" = "source"; then
-        flags="$APR_SOURCE_DIR/include"
-    else
-        # this is for VPATH builds
-        flags="$APR_BUILD_DIR/include $APR_SOURCE_DIR/include"
-    fi
-    echo $flags
-    exit 0
-    ;;
-    --cc)
-    echo $CC
-    exit 0
-    ;;
-    --cpp)
-    echo $CPP
-    exit 0
-    ;;
-    --cflags)
-    flags="$flags $CFLAGS"
-    ;;
-    --cppflags)
-    flags="$flags $CPPFLAGS"
-    ;;
-    --libs)
-    flags="$flags $LIBS"
-    ;;
-    --ldflags)
-    flags="$flags $LDFLAGS"
-    ;;
-    --includes)
-    if test "$location" = "installed"; then
-        flags="$flags -I$includedir $EXTRA_INCLUDES"
-    elif test "$location" = "source"; then
-        flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES"
-    else
-        # this is for VPATH builds
-        flags="$flags -I$APR_BUILD_DIR/include -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES"
-    fi
-    ;;
-    --srcdir)
-    echo $APR_SOURCE_DIR
-    exit 0
-    ;;
-    --installbuilddir)
-    if test "$location" = "installed"; then
-        echo "${installbuilddir}"
-    elif test "$location" = "source"; then
-        echo "$APR_SOURCE_DIR/build"
-    else
-        # this is for VPATH builds
-        echo "$APR_BUILD_DIR/build"
-    fi
-    exit 0
-    ;;
-    --version)
-    echo $APR_DOTTED_VERSION
-    exit 0
-    ;;
-    --link-ld)
-    if test "$location" = "installed"; then
-        ### avoid using -L if libdir is a "standard" location like /usr/lib
-        flags="$flags -L$libdir -l${APR_LIBNAME}"
-    else
-        ### this surely can't work since the library is in .libs?
-        flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}"
-    fi
-    ;;
-    --link-libtool)
-    # If the LA_FILE exists where we think it should be, use it.  If we're
-    # installed and the LA_FILE does not exist, assume to use -L/-l
-    # (the LA_FILE may not have been installed).  If we're building ourselves,
-    # we'll assume that at some point the .la file be created.
-    if test -f "$LA_FILE"; then
-        flags="$flags $LA_FILE"
-    elif test "$location" = "installed"; then
-        ### avoid using -L if libdir is a "standard" location like /usr/lib
-        flags="$flags -L$libdir -l${APR_LIBNAME}"
-    else
-        flags="$flags $LA_FILE"
-    fi
-    ;;
-    --shlib-path-var)
-    echo "$SHLIBPATH_VAR"
-    exit 0
-    ;;
-    --apr-la-file)
-    if test -f "$LA_FILE"; then
-        flags="$flags $LA_FILE"
-    fi
-    ;;
-    --apr-so-ext)
-    echo "$APR_SO_EXT"
-    exit 0
-    ;;
-    --apr-lib-target)
-    echo "$APR_LIB_TARGET"
-    exit 0
-    ;;
-    --apr-libtool)
-    if test "$location" = "installed"; then
-        echo "${installbuilddir}/libtool"
-    else
-        echo "$APR_BUILD_DIR/libtool"
-    fi
-    exit 0
-    ;;
-    --help)
-    show_usage
-    exit 0
-    ;;
-    *)
-    show_usage
-    exit 1
-    ;;
-    esac
-
-    # Next please.
-    shift
-done
-
-if test -n "$flags"; then
-  echo "$flags"
-fi
-
-exit 0
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/apr.dsp b/rubbos/app/httpd-2.0.64/srclib/apr/apr.dsp
deleted file mode 100644
index b029f777..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/apr.dsp
+++ /dev/null
@@ -1,631 +0,0 @@
-# Microsoft Developer Studio Project File - Name="apr" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=apr - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "apr.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "apr.mak" CFG="apr - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "apr - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "apr - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "apr - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "LibR"
-# PROP BASE Intermediate_Dir "LibR"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "LibR"
-# PROP Intermediate_Dir "LibR"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibR\apr_src" /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "apr - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "LibD"
-# PROP BASE Intermediate_Dir "LibD"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "LibD"
-# PROP Intermediate_Dir "LibD"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibD\apr_src" /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "apr - Win32 Release"
-# Name "apr - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ".c"
-# Begin Group "dso"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\dso\win32\dso.c
-# End Source File
-# End Group
-# Begin Group "file_io"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\file_io\unix\copy.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\win32\dir.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\unix\fileacc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\win32\filedup.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\win32\filepath.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\unix\filepath_util.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\win32\filestat.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\win32\filesys.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\win32\flock.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\unix\fullrw.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\unix\mktemp.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\win32\open.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\win32\pipe.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\win32\readwrite.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\win32\seek.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\unix\tempdir.c
-# End Source File
-# End Group
-# Begin Group "locks"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\locks\win32\proc_mutex.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\locks\win32\thread_cond.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\locks\win32\thread_mutex.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\locks\win32\thread_rwlock.c
-# End Source File
-# End Group
-# Begin Group "memory"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\memory\unix\apr_pools.c
-# End Source File
-# End Group
-# Begin Group "misc"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\misc\win32\apr_app.c
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\win32\charset.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\win32\env.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\unix\errorcodes.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\unix\getopt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\win32\internal.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\win32\misc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\unix\otherchild.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\win32\rand.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\win32\start.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\win32\utf8.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\unix\version.c
-# End Source File
-# End Group
-# Begin Group "mmap"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\mmap\unix\common.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mmap\win32\mmap.c
-# End Source File
-# End Group
-# Begin Group "network_io"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\network_io\unix\inet_ntop.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\network_io\unix\inet_pton.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\poll\unix\poll.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\poll\unix\pollacc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\network_io\win32\sendrecv.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\network_io\unix\sockaddr.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\network_io\win32\sockets.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\network_io\win32\sockopt.c
-# End Source File
-# End Group
-# Begin Group "passwd"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\passwd\apr_getpass.c
-# End Source File
-# End Group
-# Begin Group "shmem"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\shmem\win32\shm.c
-# End Source File
-# End Group
-# Begin Group "strings"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\strings\apr_cpystrn.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\strings\apr_fnmatch.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\strings\apr_snprintf.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\strings\apr_strings.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\strings\apr_strnatcmp.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\strings\apr_strtok.c
-# End Source File
-# End Group
-# Begin Group "tables"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\tables\apr_hash.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tables\apr_tables.c
-# End Source File
-# End Group
-# Begin Group "threadproc"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\threadproc\win32\proc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\threadproc\win32\signals.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\threadproc\win32\thread.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\threadproc\win32\threadpriv.c
-# End Source File
-# End Group
-# Begin Group "time"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\time\win32\access.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\time\win32\time.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\time\win32\timestr.c
-# End Source File
-# End Group
-# Begin Group "user"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\user\win32\groupinfo.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\user\win32\userinfo.c
-# End Source File
-# End Group
-# End Group
-# Begin Group "Private Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_arch_atime.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_arch_dso.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_arch_file_io.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_arch_inherit.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_arch_misc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_arch_networkio.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_arch_thread_mutex.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_arch_thread_rwlock.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_arch_threadproc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_arch_utf8.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_private.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\apr_private_common.h
-# End Source File
-# End Group
-# Begin Group "Public Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\include\apr.h.in
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr.hnw
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr.hw
-
-!IF  "$(CFG)" == "apr - Win32 Release"
-
-# Begin Custom Build - Creating apr.h from apr.hw
-InputPath=.\include\apr.hw
-
-".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	type .\include\apr.hw > .\include\apr.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "apr - Win32 Debug"
-
-# Begin Custom Build - Creating apr.h from apr.hw
-InputPath=.\include\apr.hw
-
-".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	type .\include\apr.hw > .\include\apr.h
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_allocator.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_atomic.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_compat.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_dso.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_env.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_errno.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_file_info.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_file_io.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_fnmatch.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_general.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_getopt.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_global_mutex.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_hash.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_inherit.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_lib.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_mmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_network_io.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_poll.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_pools.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_portable.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_proc_mutex.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_ring.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_shm.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_signal.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_strings.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_support.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_tables.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_thread_cond.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_thread_mutex.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_thread_proc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_thread_rwlock.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_time.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_user.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_version.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_want.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/apr.dsw b/rubbos/app/httpd-2.0.64/srclib/apr/apr.dsw
deleted file mode 100644
index dc0871bb..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/apr.dsw
+++ /dev/null
@@ -1,71 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "apr"=".\apr.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "apr_app"=".\build\apr_app.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name apr
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libapr"=".\libapr.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libapr_app"=".\build\libapr_app.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libapr
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/apr.exp b/rubbos/app/httpd-2.0.64/srclib/apr/apr.exp
deleted file mode 100644
index 830875dc..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/apr.exp
+++ /dev/null
@@ -1,419 +0,0 @@
-#! libapr-0.so
-* This file was AUTOGENERATED at build time.
-* Please do not edit by hand.
-apr_allocator_create
-apr_allocator_destroy
-apr_allocator_alloc
-apr_allocator_free
-apr_allocator_owner_set
-apr_allocator_set_owner
-apr_allocator_owner_get
-apr_allocator_get_owner
-apr_allocator_max_free_set
-apr_allocator_set_max_free
-apr_allocator_mutex_set
-apr_allocator_set_mutex
-apr_allocator_mutex_get
-apr_allocator_get_mutex
-apr_dso_load
-apr_dso_unload
-apr_dso_sym
-apr_dso_error
-apr_env_get
-apr_env_set
-apr_env_delete
-apr_strerror
-apr_stat
-apr_lstat
-apr_dir_open
-apr_dir_close
-apr_dir_read
-apr_dir_rewind
-apr_filepath_root
-apr_filepath_merge
-apr_filepath_list_split
-apr_filepath_list_merge
-apr_filepath_get
-apr_filepath_set
-apr_filepath_encoding
-apr_file_open
-apr_file_close
-apr_file_remove
-apr_file_rename
-apr_file_copy
-apr_file_append
-apr_file_eof
-apr_file_open_stderr
-apr_file_open_stdout
-apr_file_open_stdin
-apr_file_read
-apr_file_write
-apr_file_writev
-apr_file_read_full
-apr_file_write_full
-apr_file_putc
-apr_file_getc
-apr_file_ungetc
-apr_file_gets
-apr_file_puts
-apr_file_flush
-apr_file_dup
-apr_file_dup2
-apr_file_setaside
-apr_file_seek
-apr_file_pipe_create
-apr_file_namedpipe_create
-apr_file_pipe_timeout_get
-apr_file_pipe_timeout_set
-apr_file_lock
-apr_file_unlock
-apr_file_name_get
-apr_file_data_get
-apr_file_data_set
-apr_file_printf
-apr_file_perms_set
-apr_file_attrs_set
-apr_file_mtime_set
-apr_dir_make
-apr_dir_make_recursive
-apr_dir_remove
-apr_file_info_get
-apr_file_trunc
-apr_file_flags_get
-apr_file_pool_get
-apr_file_inherit_set
-apr_file_set_inherit
-apr_file_inherit_unset
-apr_file_unset_inherit
-apr_file_mktemp
-apr_temp_dir_get
-apr_fnmatch
-apr_fnmatch_test
-apr_is_fnmatch
-apr_initialize
-apr_app_initialize
-apr_terminate
-apr_terminate2
-apr_generate_random_bytes
-apr_getopt_init
-apr_getopt
-apr_getopt_long
-apr_global_mutex_create
-apr_global_mutex_child_init
-apr_global_mutex_lock
-apr_global_mutex_trylock
-apr_global_mutex_unlock
-apr_global_mutex_destroy
-apr_global_mutex_pool_get
-apr_hash_make
-apr_hash_copy
-apr_hash_set
-apr_hash_get
-apr_hash_first
-apr_hash_next
-apr_hash_this
-apr_hash_count
-apr_hash_overlay
-apr_hash_merge
-apr_hash_pool_get
-apr_filepath_name_get
-apr_filename_of_pathname
-apr_vformatter
-apr_password_get
-apr_mmap_create
-apr_mmap_dup
-apr_mmap_delete
-apr_mmap_offset
-apr_socket_create
-apr_socket_create_ex
-apr_socket_shutdown
-apr_shutdown
-apr_socket_close
-apr_socket_bind
-apr_bind
-apr_socket_listen
-apr_listen
-apr_socket_accept
-apr_accept
-apr_socket_connect
-apr_connect
-apr_sockaddr_info_get
-apr_getnameinfo
-apr_parse_addr_port
-apr_gethostname
-apr_socket_data_get
-apr_socket_data_set
-apr_socket_send
-apr_send
-apr_socket_sendv
-apr_sendv
-apr_socket_sendto
-apr_sendto
-apr_socket_recvfrom
-apr_recvfrom
-apr_socket_sendfile
-apr_sendfile
-apr_socket_recv
-apr_recv
-apr_socket_opt_set
-apr_setsocketopt
-apr_socket_timeout_set
-apr_socket_opt_get
-apr_getsocketopt
-apr_socket_timeout_get
-apr_socket_atmark
-apr_socket_addr_get
-apr_sockaddr_port_set
-apr_sockaddr_port_get
-apr_sockaddr_ip_set
-apr_sockaddr_ip_get
-apr_sockaddr_equal
-apr_socket_from_file
-apr_getservbyname
-apr_ipsubnet_create
-apr_ipsubnet_test
-apr_socket_protocol_get
-apr_socket_inherit_set
-apr_socket_set_inherit
-apr_socket_inherit_unset
-apr_socket_unset_inherit
-apr_poll_setup
-apr_poll
-apr_poll_socket_add
-apr_poll_socket_mask
-apr_poll_socket_remove
-apr_poll_socket_clear
-apr_poll_revents_get
-apr_pollset_create
-apr_pollset_destroy
-apr_pollset_add
-apr_pollset_remove
-apr_pollset_poll
-apr_pool_initialize
-apr_pool_terminate
-apr_pool_create_ex
-apr_pool_create_ex_debug
-apr_pool_allocator_get
-apr_pool_clear
-apr_pool_clear_debug
-apr_pool_destroy
-apr_pool_destroy_debug
-apr_palloc
-apr_palloc_debug
-apr_pcalloc_debug
-apr_pool_abort_set
-apr_pool_set_abort
-apr_pool_abort_get
-apr_pool_get_abort
-apr_pool_parent_get
-apr_pool_get_parent
-apr_pool_is_ancestor
-apr_pool_tag
-apr_pool_userdata_set
-apr_pool_userdata_setn
-apr_pool_userdata_get
-apr_pool_cleanup_register
-apr_pool_cleanup_kill
-apr_pool_child_cleanup_set
-apr_pool_cleanup_run
-apr_pool_cleanup_null
-apr_pool_cleanup_for_exec
-apr_os_global_mutex_get
-apr_os_file_get
-apr_os_dir_get
-apr_os_sock_get
-apr_os_proc_mutex_get
-apr_os_exp_time_get
-apr_os_imp_time_get
-apr_os_shm_get
-apr_os_thread_get
-apr_os_threadkey_get
-apr_os_thread_put
-apr_os_threadkey_put
-apr_os_thread_current
-apr_os_thread_equal
-apr_os_file_put
-apr_os_pipe_put
-apr_os_pipe_put_ex
-apr_os_dir_put
-apr_os_sock_put
-apr_os_sock_make
-apr_os_proc_mutex_put
-apr_os_imp_time_put
-apr_os_exp_time_put
-apr_os_shm_put
-apr_os_dso_handle_put
-apr_os_dso_handle_get
-apr_os_default_encoding
-apr_os_locale_encoding
-apr_proc_mutex_create
-apr_proc_mutex_child_init
-apr_proc_mutex_lock
-apr_proc_mutex_trylock
-apr_proc_mutex_unlock
-apr_proc_mutex_destroy
-apr_proc_mutex_cleanup
-apr_proc_mutex_lockfile
-apr_proc_mutex_name
-apr_proc_mutex_defname
-apr_proc_mutex_pool_get
-apr_shm_create
-apr_shm_destroy
-apr_shm_attach
-apr_shm_detach
-apr_shm_baseaddr_get
-apr_shm_size_get
-apr_shm_pool_get
-apr_signal
-apr_signal_description_get
-apr_signal_get_description
-apr_strnatcmp
-apr_strnatcasecmp
-apr_pstrdup
-apr_pstrmemdup
-apr_pstrndup
-apr_pmemdup
-apr_pstrcat
-apr_pstrcatv
-apr_pvsprintf
-apr_psprintf
-apr_cpystrn
-apr_collapse_spaces
-apr_tokenize_to_argv
-apr_strtok
-apr_snprintf
-apr_vsnprintf
-apr_itoa
-apr_ltoa
-apr_off_t_toa
-apr_strtoi64
-apr_atoi64
-apr_strfsize
-apr_table_elts
-apr_is_empty_table
-apr_is_empty_array
-apr_array_make
-apr_array_push
-apr_array_pop
-apr_array_cat
-apr_array_copy
-apr_array_copy_hdr
-apr_array_append
-apr_array_pstrcat
-apr_table_make
-apr_table_copy
-apr_table_clear
-apr_table_get
-apr_table_set
-apr_table_setn
-apr_table_unset
-apr_table_merge
-apr_table_mergen
-apr_table_add
-apr_table_addn
-apr_table_overlay
-apr_table_do
-apr_table_vdo
-apr_table_overlap
-apr_table_compress
-apr_thread_cond_create
-apr_thread_cond_wait
-apr_thread_cond_timedwait
-apr_thread_cond_signal
-apr_thread_cond_broadcast
-apr_thread_cond_destroy
-apr_thread_cond_pool_get
-apr_thread_mutex_create
-apr_thread_mutex_lock
-apr_thread_mutex_trylock
-apr_thread_mutex_unlock
-apr_thread_mutex_destroy
-apr_thread_mutex_pool_get
-apr_threadattr_create
-apr_threadattr_detach_set
-apr_threadattr_detach_get
-apr_threadattr_stacksize_set
-apr_thread_create
-apr_thread_exit
-apr_thread_join
-apr_thread_yield
-apr_thread_once_init
-apr_thread_once
-apr_thread_detach
-apr_thread_data_get
-apr_thread_data_set
-apr_threadkey_private_create
-apr_threadkey_private_get
-apr_threadkey_private_set
-apr_threadkey_private_delete
-apr_threadkey_data_get
-apr_threadkey_data_set
-apr_procattr_create
-apr_procattr_io_set
-apr_procattr_child_in_set
-apr_procattr_child_out_set
-apr_procattr_child_err_set
-apr_procattr_dir_set
-apr_procattr_cmdtype_set
-apr_procattr_detach_set
-apr_procattr_limit_set
-apr_procattr_child_errfn_set
-apr_procattr_error_check_set
-apr_procattr_addrspace_set
-apr_proc_fork
-apr_proc_create
-apr_proc_wait
-apr_proc_wait_all_procs
-apr_proc_detach
-apr_proc_other_child_register
-apr_proc_other_child_unregister
-apr_proc_other_child_alert
-apr_proc_other_child_refresh
-apr_proc_other_child_refresh_all
-apr_proc_other_child_check
-apr_proc_other_child_read
-apr_proc_kill
-apr_pool_note_subprocess
-apr_setup_signal_thread
-apr_signal_thread
-apr_thread_pool_get
-apr_thread_rwlock_create
-apr_thread_rwlock_rdlock
-apr_thread_rwlock_tryrdlock
-apr_thread_rwlock_wrlock
-apr_thread_rwlock_trywrlock
-apr_thread_rwlock_unlock
-apr_thread_rwlock_destroy
-apr_thread_rwlock_pool_get
-apr_time_now
-apr_time_ansi_put
-apr_time_exp_tz
-apr_explode_time
-apr_time_exp_gmt
-apr_time_exp_lt
-apr_explode_localtime
-apr_time_exp_get
-apr_time_exp_gmt_get
-apr_implode_gmt
-apr_sleep
-apr_rfc822_date
-apr_ctime
-apr_strftime
-apr_time_clock_hires
-apr_uid_current
-apr_current_userid
-apr_uid_name_get
-apr_get_username
-apr_uid_get
-apr_get_userid
-apr_uid_homepath_get
-apr_get_home_directory
-apr_gid_name_get
-apr_group_name_get
-apr_get_groupname
-apr_gid_get
-apr_get_groupid
-apr_version
-apr_version_string
-apr_month_snames
-apr_day_snames
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/atomic/netware/apr_atomic.c b/rubbos/app/httpd-2.0.64/srclib/apr/atomic/netware/apr_atomic.c
deleted file mode 100644
index 82336cde..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/atomic/netware/apr_atomic.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "apr.h"
-#include "apr_atomic.h"
-
-int apr_atomic_dec(apr_atomic_t *mem) 
-{
-    atomic_dec(mem);
-    return *mem; 
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/atomic/os390/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/atomic/os390/Makefile.in
deleted file mode 100644
index 28cc1b6d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/atomic/os390/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = atomic.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/@OSDIR@
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/atomic/os390/atomic.c b/rubbos/app/httpd-2.0.64/srclib/apr/atomic/os390/atomic.c
deleted file mode 100644
index ce971e3f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/atomic/os390/atomic.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "apr.h"
-#include "apr_atomic.h"
-
-#if APR_HAS_THREADS
-
-apr_int32_t apr_atomic_add(volatile apr_atomic_t *mem, apr_int32_t val) 
-{
-    apr_atomic_t old, new_val; 
-
-    old = *mem;   /* old is automatically updated on cs failure */
-    do {
-        new_val = old + val;
-    } while (__cs(&old, (cs_t *)mem, new_val)); 
-
-    return new_val;
-}
-
-apr_uint32_t apr_atomic_cas(volatile apr_atomic_t *mem, apr_uint32_t swap, 
-                            apr_uint32_t cmp)
-{
-    apr_uint32_t old = cmp;
-    
-    __cs(&old, (cs_t *)mem, swap);
-    return old; /* old is automatically updated from mem on cs failure */
-}
-
-#endif /* APR_HAS_THREADS */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/atomic/unix/.libs/apr_atomic.o b/rubbos/app/httpd-2.0.64/srclib/apr/atomic/unix/.libs/apr_atomic.o
deleted file mode 100644
index f31389f7..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/atomic/unix/.libs/apr_atomic.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/atomic/unix/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/atomic/unix/Makefile
deleted file mode 100644
index b7002192..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/atomic/unix/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-srcdir = .
-
-
-TARGETS = apr_atomic.lo
-
-# bring in rules.mk for standard functionality
-include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
-
-DEFOSDIR=$(INCDIR)/arch/unix
-INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/atomic/unix/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/atomic/unix/Makefile.in
deleted file mode 100644
index 188d0d24..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/atomic/unix/Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = apr_atomic.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/atomic/unix/apr_atomic.c b/rubbos/app/httpd-2.0.64/srclib/apr/atomic/unix/apr_atomic.c
deleted file mode 100644
index d7a223a0..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/atomic/unix/apr_atomic.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_atomic.h"
-#include "apr_thread_mutex.h"
-
-#if !defined(apr_atomic_init) && !defined(APR_OVERRIDE_ATOMIC_INIT)
-
-#if APR_HAS_THREADS
-#define NUM_ATOMIC_HASH 7
-/* shift by 2 to get rid of alignment issues */
-#define ATOMIC_HASH(x) (unsigned int)(((unsigned long)(x)>>2)%(unsigned int)NUM_ATOMIC_HASH)
-static apr_thread_mutex_t **hash_mutex;
-#endif /* APR_HAS_THREADS */
-
-apr_status_t apr_atomic_init(apr_pool_t *p)
-{
-#if APR_HAS_THREADS
-    int i;
-    apr_status_t rv;
-    hash_mutex = apr_palloc(p, sizeof(apr_thread_mutex_t*) * NUM_ATOMIC_HASH);
-
-    for (i = 0; i < NUM_ATOMIC_HASH; i++) {
-        rv = apr_thread_mutex_create(&(hash_mutex[i]),
-                                     APR_THREAD_MUTEX_DEFAULT, p);
-        if (rv != APR_SUCCESS) {
-           return rv;
-        }
-    }
-#endif /* APR_HAS_THREADS */
-    return APR_SUCCESS;
-}
-#endif /*!defined(apr_atomic_init) && !defined(APR_OVERRIDE_ATOMIC_INIT) */
-
-#if !defined(apr_atomic_add) && !defined(APR_OVERRIDE_ATOMIC_ADD)
-void apr_atomic_add(volatile apr_atomic_t *mem, apr_uint32_t val) 
-{
-#if APR_HAS_THREADS
-    apr_thread_mutex_t *lock = hash_mutex[ATOMIC_HASH(mem)];
-    apr_uint32_t prev;
-       
-    if (apr_thread_mutex_lock(lock) == APR_SUCCESS) {
-        prev = *mem;
-        *mem += val;
-        apr_thread_mutex_unlock(lock);
-    }
-#else
-    *mem += val;
-#endif /* APR_HAS_THREADS */
-}
-#endif /*!defined(apr_atomic_add) && !defined(APR_OVERRIDE_ATOMIC_ADD) */
-
-#if !defined(apr_atomic_set) && !defined(APR_OVERRIDE_ATOMIC_SET)
-void apr_atomic_set(volatile apr_atomic_t *mem, apr_uint32_t val) 
-{
-#if APR_HAS_THREADS
-    apr_thread_mutex_t *lock = hash_mutex[ATOMIC_HASH(mem)];
-    apr_uint32_t prev;
-
-    if (apr_thread_mutex_lock(lock) == APR_SUCCESS) {
-        prev = *mem;
-        *mem = val;
-        apr_thread_mutex_unlock(lock);
-    }
-#else
-    *mem = val;
-#endif /* APR_HAS_THREADS */
-}
-#endif /*!defined(apr_atomic_set) && !defined(APR_OVERRIDE_ATOMIC_SET) */
-
-#if !defined(apr_atomic_inc) && !defined(APR_OVERRIDE_ATOMIC_INC)
-void apr_atomic_inc(volatile apr_uint32_t *mem) 
-{
-#if APR_HAS_THREADS
-    apr_thread_mutex_t *lock = hash_mutex[ATOMIC_HASH(mem)];
-    apr_uint32_t prev;
-
-    if (apr_thread_mutex_lock(lock) == APR_SUCCESS) {
-        prev = *mem;
-        (*mem)++;
-        apr_thread_mutex_unlock(lock);
-    }
-#else
-    (*mem)++;
-#endif /* APR_HAS_THREADS */
-}
-#endif /*!defined(apr_atomic_inc) && !defined(APR_OVERRIDE_ATOMIC_INC) */
-
-#if !defined(apr_atomic_dec) && !defined(APR_OVERRIDE_ATOMIC_DEC)
-int apr_atomic_dec(volatile apr_atomic_t *mem) 
-{
-#if APR_HAS_THREADS
-    apr_thread_mutex_t *lock = hash_mutex[ATOMIC_HASH(mem)];
-    apr_uint32_t new;
-
-    if (apr_thread_mutex_lock(lock) == APR_SUCCESS) {
-        (*mem)--;
-        new = *mem;
-        apr_thread_mutex_unlock(lock);
-        return new; 
-    }
-#else
-    (*mem)--;
-#endif /* APR_HAS_THREADS */
-    return *mem; 
-}
-#endif /*!defined(apr_atomic_dec) && !defined(APR_OVERRIDE_ATOMIC_DEC) */
-
-#if !defined(apr_atomic_cas) && !defined(APR_OVERRIDE_ATOMIC_CAS)
-apr_uint32_t apr_atomic_cas(volatile apr_uint32_t *mem, long with, long cmp)
-{
-    apr_uint32_t prev;
-#if APR_HAS_THREADS
-    apr_thread_mutex_t *lock = hash_mutex[ATOMIC_HASH(mem)];
-
-    if (apr_thread_mutex_lock(lock) == APR_SUCCESS) {
-        prev = *mem;
-        if (prev == (apr_uint32_t)cmp) {
-            *mem = (apr_uint32_t)with;
-        }
-        apr_thread_mutex_unlock(lock);
-        return prev;
-    }
-    return *mem;
-#else
-    prev = *mem;
-    if (prev == (apr_uint32_t)cmp) {
-        *mem = (apr_uint32_t)with;
-    }
-    return prev;
-#endif /* APR_HAS_THREADS */
-}
-#endif /*!defined(apr_atomic_cas) && !defined(APR_OVERRIDE_ATOMIC_CAS) */
-
-#if !defined(apr_atomic_casptr) && !defined(APR_OVERRIDE_ATOMIC_CASPTR)
-void *apr_atomic_casptr(volatile void **mem, void *with, const void *cmp)
-{
-    void *prev;
-#if APR_HAS_THREADS
-    apr_thread_mutex_t *lock = hash_mutex[ATOMIC_HASH(mem)];
-
-    if (apr_thread_mutex_lock(lock) == APR_SUCCESS) {
-        prev = *(void **)mem;
-        if (prev == cmp) {
-            *mem = with;
-        }
-        apr_thread_mutex_unlock(lock);
-        return prev;
-    }
-    return *(void **)mem;
-#else
-    prev = *(void **)mem;
-    if (prev == cmp) {
-        *mem = with;
-    }
-    return prev;
-#endif /* APR_HAS_THREADS */
-}
-#endif /*!defined(apr_atomic_cas) && !defined(APR_OVERRIDE_ATOMIC_CAS) */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/atomic/unix/apr_atomic.lo b/rubbos/app/httpd-2.0.64/srclib/apr/atomic/unix/apr_atomic.lo
deleted file mode 100644
index 3b16143d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/atomic/unix/apr_atomic.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# apr_atomic.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/apr_atomic.o'
-
-# Name of the non-PIC object.
-non_pic_object='apr_atomic.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/atomic/unix/apr_atomic.o b/rubbos/app/httpd-2.0.64/srclib/apr/atomic/unix/apr_atomic.o
deleted file mode 100644
index f5cb1491..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/atomic/unix/apr_atomic.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/MakeEtags b/rubbos/app/httpd-2.0.64/srclib/apr/build/MakeEtags
deleted file mode 100755
index c4e957c9..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/MakeEtags
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# This file illustrates how to generate a useful TAGS file via etags
-# for emacs.  This should be invoked from the top source directory i.e.:
-#   > build/MakeEtags
-# and will create a TAGS file in the top source directory.
-
-# This script falls under the Apache License.
-# See http://www.apache.org/docs/LICENSE
-
-# Once you have created ./TAGS in emacs you'll need to setup
-# tag-table-alist with an entry to assure it finds the single ./TAGS
-# file from the many source directories.  Something along these lines:
-# (setq tag-table-alist
-#	'(("/home/me/work/httpd-2.0/" 
-#	   . "/home/me/work/httpd-2.0/")
-#	 ))
-
-# This requires a special version of etags, i.e. the
-# one called "Exuberant ctags" available at:
-#    http://fly.hiwaay.net/~darren/ctags/
-# Once that is setup you'll need to point to the
-# executable here:
-
-etags=~/local/bin/etags
-
-# Exuberant etags is necessary since it can ignore some defined symbols
-# that obscure the function signatures.
-
-ignore=AP_DECLARE,AP_DECLARE_NONSTD,__declspec
-
-# Create an etags file at the root of the source
-# tree, then create symbol links to it from each
-# directory in the source tree.  By passing etags
-# absolute pathnames we get a tag file that is
-# NOT portable when we move the directory tree.
-
-find . -name '*.[ch]' -print | $etags -I "$ignore"  -L -
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/build/Makefile
deleted file mode 100644
index 8d888e70..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-srcdir = .
-
-
-TARGETS=
-INCLUDES=
-DISTCLEAN_TARGETS = apr_rules.mk
-EXTRACLEAN_TARGETS = ltcf-c.sh ltmain.sh libtool.m4
-
-# bring in rules.mk for standard functionality
-include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/build/Makefile.in
deleted file mode 100644
index c05665a1..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS=
-INCLUDES=
-DISTCLEAN_TARGETS = apr_rules.mk
-EXTRACLEAN_TARGETS = ltcf-c.sh ltmain.sh libtool.m4
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/NWGNUenvironment.inc b/rubbos/app/httpd-2.0.64/srclib/apr/build/NWGNUenvironment.inc
deleted file mode 100644
index c93b940c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/NWGNUenvironment.inc
+++ /dev/null
@@ -1,302 +0,0 @@
-#
-# Setup needed Tools and Libraries
-#
-
-ifeq "$(wildcard $(APR_WORK)\build\NWGNUcustom.inc)" "$(APR_WORK)\build\NWGNUcustom.inc"
-include $(APR_WORK)\build\NWGNUcustom.inc
-CUSTOM_INI = $(AP_WORK)\NWGNUcustom.ini
-endif
-
-ifndef VERBOSE
-.SILENT:
-endif
-
-#
-# Treat like an include
-#
-ifndef EnvironmentDefined
-
-#
-# simple macros for parsing makefiles
-#
-EOLIST:=
-EMPTY :=
-COMMA := ,
-SPACE := $(EMPTY) $(EMPTY)
-
-#
-# Base environment
-#
-
-# Try and handle case issues
-ifndef NOVELLLIBC
-ifdef NovellLibC
-NOVELLLIBC = $(NovellLibC)
-endif
-endif
-
-ifndef NOVELLLIBC
-NOVELLLIBC = C:/novell/ndk/libc
-endif
-
-# This is a placeholder
-# ifndef LDAPSDK
-# LDAPSDK = C:/novell/ndk/cldapsdk
-# endif
-
-ifndef METROWERKS
-METROWERKS = C:\Program Files\Metrowerks\CodeWarrior
-endif
-
-# If LM_LICENSE_FILE isn't defined, define a variable that can be used to
-# restart make with it defined
-ifndef LM_LICENSE_FILE
-NO_LICENSE_FILE = NO_LICENSE_FILE
-endif
-
-#
-# Set the Release type that you want to build, possible values are:
-#
-#  debug		- full debug switches are set
-#  noopt		- normal switches are set (default)
-#  optimized	- optimization switches are set
-
-ifdef reltype
-RELEASE=$(reltype)
-endif
-
-ifdef RELTYPE
-RELEASE=$(RELTYPE)
-endif
-
-ifdef debug
-RELEASE=debug
-endif
-
-ifdef DEBUG
-RELEASE=debug
-endif
-
-ifdef optimized
-RELEASE=optimized
-endif
-
-ifdef OPTIMIZED
-RELEASE=optimized
-endif
-
-ifndef RELEASE
-RELEASE = optimized
-endif
-
-ifeq "$(RELEASE)" "debug"
-OBJDIR = Debug
-endif
-
-ifeq "$(RELEASE)" "noopt"
-OBJDIR = Noopt
-endif
-
-ifeq "$(RELEASE)" "optimized"
-OBJDIR = Release
-endif
-
-#
-# Setup compiler information
-#
-
-# MetroWerks NLM tools
-CC	= mwccnlm
-CPP	= mwccnlm
-LINK	= mwldnlm
-LIB	= mwldnlm -type library -w nocmdline
-WIN_CC	= mwcc
-
-# Setup build tools
-AWK	= awk
-
-NOVI	= $(NOVELLLIBC)\imports
-
-INCDIRS	= $(NOVELLLIBC)\include;$(NOVELLLIBC)\include\nks;$(NOVELLLIBC)\include\winsock;
-
-DEFINES	= -DNETWARE
-ifndef DEBUG
-DEFINES += -DNDEBUG
-endif
-
-# MetroWerks static Libraries
-CLIB3S	= $(METROWERKS)\Novell Support\Metrowerks Support\Libraries\Runtime\mwcrtl.lib
-MATH3S	=
-PLIB3S	= $(METROWERKS)\Novell Support\Metrowerks Support\Libraries\MSL C++\MWCPP.lib
-
-# MetroWerks Win32 build flags to create build tool
-MWCW_MSL   = "$(METROWERKS)/MSL"
-MWCW_W32   = "$(METROWERKS)/Win32-x86 Support"
-WIN_CFLAGS =  -O2 -gccinc -nodefaults -proc 586 -w off
-WIN_CFLAGS += -ir $(MWCW_MSL) -ir $(MWCW_W32) -lr $(MWCW_MSL) -lr $(MWCW_W32)
-WIN_CFLAGS += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib
-
-# Base compile flags
-# and prefix or precompiled header added here.
-
-# The default flags are as follows:
-#
-# -c                    compile only, no link
-# -nosyspath            treat #include <...> like #include "..."
-# -Cpp_exceptions off   disable C++ exceptions
-# -RTTI off             disable C++ run-time typing information
-# -align 4              align on 4 byte bounderies
-# -w nocmdline          disable command-line driver/parser warnings
-# -proc PII             generate code base on Pentium II instruction set
-# -inst mmx             use MMX extensions (not used)
-
-CFLAGS = -c -nosyspath -Cpp_exceptions off -RTTI off -align 4 -w nocmdline -proc PII
-
-# -g                    generate debugging information
-# -O0                   level 0 optimizations
-
-ifeq "$(RELEASE)" "debug"
-CFLAGS += -g -O0
-endif
-
-# -O4,p                 level 4 optimizations, optimize for speed
-ifeq "$(RELEASE)" "optimized"
-CFLAGS += -O4,p
-endif
-
-# -prefix apr_arch_pre_nw.h      #include pre_nw.h for all files
-
-CFLAGS += -prefix apr_arch_pre_nw.h
-
-
-PATH:=$(PATH);$(METROWERKS)\bin;$(METROWERKS)\Other Metrowerks Tools\Command Line Tools
-
-#
-# Declare major project deliverables output directories here
-#
-
-ifdef DEST
-INSTALL = $(DEST)
-ifeq (\, $(findstring \,$(INSTALL)))
-INSTDIRS = $(DEST)
-endif
-endif
-
-ifdef dest
-INSTALL = $(dest)
-ifeq (\, $(findstring \,$(INSTALL)))
-INSTDIRS = $(dest)
-endif
-endif
-
-ifndef INSTALL
-INSTALL = $(APR_WORK)\Dist
-INSTDIRS = $(APR_WORK)\Dist
-endif
-
-# Add support for building IPV6 alongside
-ifneq "$(IPV6)" ""
-DEFINES += -DNW_BUILD_IPV6
-INCDIRS := $(NOVELLLIBC)\include\winsock\IPV6;$(INCDIRS)
-
-ifneq "$(findstring IPV6,$(OBJDIR))" "IPV6"
-OBJDIR := $(OBJDIR)_IPV6
-endif
-        
-ifneq "$(findstring IPV6,$(INSTALL))" "IPV6"
-INSTALL := $(INSTALL)_IPV6
-endif        
-
-ifneq "$(findstring IPV6,$(INSTDIRS))" "IPV6"
-INSTDIRS := $(INSTDIRS)_IPV6
-endif
-
-endif
-
-ifdef DEST
-INSTALLBASE := $(INSTALL)\Apache2
-
-INSTDEVDIRS := \
-    $(INSTDIRS) \
-	$(INSTALLBASE) \
-	$(INSTALLBASE)\include \
-	$(INSTALLBASE)\lib \
-
-INSTDIRS += \
-	$(INSTALLBASE) \
-	
-else
-INSTALLBASE := $(INSTALL)\apr
-
-INSTDEVDIRS := \
-    $(INSTDIRS) \
-	$(INSTALLBASE) \
-	$(INSTALLBASE)\include \
-	$(INSTALLBASE)\lib \
-
-INSTDIRS += \
-	$(INSTALLBASE) \
-	
-endif	
-
-#
-# Declare Command and tool macros here
-#
-
-# Os2LibPath is an extra check to see if we are on NT
-ifdef Os2LibPath
-OS = Windows_NT
-endif
-
-ifeq "$(OS)" "Windows_NT"
-CMD=cmd /C
-CHK=cmd /C if exist
-CHKNOT=cmd /C if not exist
-DEL = del /F
-DELTREE = cmd /C rd /s/q
-WINNT=1
-XCOPYSW = /E
-else
-CMD=command /C
-CHK=command /C if exist
-CHKNOT=command /C if not exist
-DEL = del
-DELTREE = deltree /y
-XCOPYSW = /E /Y
-endif
-
-
-#
-# Setup base C compiler flags
-#
-
-#
-# Common directories
-#
-
-APR			= $(APR_WORK)
-APRTEST		= $(APR_WORK)/test
-APRUTIL		= $(APR_WORK)/../apr-util
-XML			= $(APRUTIL)/xml
-
-#
-# Internal Libraries
-#
-
-APRLIB		= $(APR)/$(OBJDIR)/aprlib.lib
-APRUTLIB	= $(APRUTIL)/$(OBJDIR)/aprutil.lib
-XMLLIB		= $(XML)/$(OBJDIR)/xmllib.lib
-
-#
-# Additional general defines
-#
-
-EnvironmentDefined = 1
-endif # ifndef EnvironmentDefined
-
-# This is always set so that it will show up in lower directories
-
-ifdef Path
-Path = $(PATH)
-endif
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/NWGNUhead.inc b/rubbos/app/httpd-2.0.64/srclib/apr/build/NWGNUhead.inc
deleted file mode 100644
index 17f149ca..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/NWGNUhead.inc
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# Obtain the global build environment
-#
-
-include $(APR_WORK)\build\NWGNUenvironment.inc
-
-#
-# Define base targets and rules
-# 
-
-TARGETS = libs nlms install clobber_libs clobber_nlms clean installdev
-
-.PHONY : $(TARGETS) default all help $(NO_LICENSE_FILE)
-
-# Here is where we will use the NO_LICENSE_FILE variable to see if we need to
-# restart the make with it defined
-
-ifdef NO_LICENSE_FILE
-
-default: NO_LICENSE_FILE
-
-all: NO_LICENSE_FILE
-
-install :: NO_LICENSE_FILE
-
-installdev :: NO_LICENSE_FILE
-
-NO_LICENSE_FILE :
-	$(MAKE) $(MAKECMDGOALS) -f NWGNUmakefile RELEASE=$(RELEASE) DEST="$(INSTALL)" LM_LICENSE_FILE="$(METROWERKS)\license.dat"
-
-else # LM_LICENSE_FILE must be defined so use the real targets
-
-default: $(SUBDIRS) libs nlms
-
-all: $(SUBDIRS) libs nlms install
-
-$(TARGETS) :: $(SUBDIRS)
-
-endif #NO_LICENSE_FILE check
-
-help :
-	@echo targets for RELEASE=$(RELEASE):
-	@echo (default) . . . . libs nlms
-	@echo all . . . . . . . does everything (libs nlms install)
-	@echo libs. . . . . . . builds all libs
-	@echo nlms. . . . . . . builds all nlms
-	@echo install . . . . . builds libs and nlms and copies install files to
-	@echo                   "$(INSTALL)"
-	@echo installdev. . . . copies headers and files needed for development to
-	@echo                   "$(INSTALL)"
-	@echo clean . . . . . . deletes $(OBJDIR) dirs, *.err, and *.map
-	@echo clobber_all . . . deletes all possible output from the make
-	@echo clobber_install . deletes all files in $(INSTALL)
-	@$(CMD) echo.
-	@echo Multiple targets can be used on a single nmake command line -
-	@echo (i.e. $(MAKE) clean all)
-	@$(CMD) echo.
-	@echo You can also specify RELEASE=debug, RELEASE=noopt, or RELEASE=optimized
-	@echo The default is RELEASE=optimized
-
-clobber_all :: clean clobber_install
-
-clobber_install ::
-	-$(DELTREE) $(INSTALL) 2>NUL
-
-#
-# build recursive targets
-#
-
-$(SUBDIRS) : FORCE
-ifneq "$(MAKECMDGOALS)" "clean"
-	$(CMD) echo.
-	@echo Building $(CURDIR)/$@
-endif
-	$(MAKE) -C $@ $(MAKECMDGOALS) -f NWGNUmakefile RELEASE=$(RELEASE) DEST="$(INSTALL)" LM_LICENSE_FILE="$(LM_LICENSE_FILE)"
-	$(CMD) echo.
-
-FORCE:
-
-#
-# Standard targets
-#
-
-clean :: $(SUBDIRS)
-	@echo Cleaning up $(CURDIR)
-	-$(DELTREE) $(OBJDIR) 2> NUL
-	$(CHK) *.err $(DEL) *.err
-	$(CHK) *.map $(DEL) *.map
-	$(CHK) *.d $(DEL) *.d
-	$(CHK) *.tmp $(DEL) *.tmp
-	$(CHK) xc.bat $(DEL) xc.bat
-	-$(DELTREE) $(OBJDIR) 2> NUL
-
-$(OBJDIR) ::
-	$(CHKNOT) $(OBJDIR)\nul mkdir $(OBJDIR)
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/NWGNUmakefile b/rubbos/app/httpd-2.0.64/srclib/apr/build/NWGNUmakefile
deleted file mode 100644
index b097bcb0..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/NWGNUmakefile
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# Declare the sub-directories to be built here
-#
-
-SUBDIRS = \
-	$(EOLIST) 
-
-#
-# Get the 'head' of the build environment.  This includes default targets and
-# paths to tools
-#
-
-include $(APR_WORK)\build\NWGNUhead.inc
-
-#
-# build this level's files
-
-FILES_prebuild_headers = \
-	$(APR)/include/apr.h \
-	$(APRUTIL)/include/apu.h \
-	$(APRUTIL)/include/apu_want.h \
-	$(APRUTIL)/include/apr_ldap.h \
-	$(APRUTIL)/include/private/apu_config.h \
-	$(APRUTIL)/include/private/apu_select_dbm.h \
-	$(APRUTIL)/xml/expat/lib/expat_config.h \
-	$(APRUTIL)/uri/uri_delims.h \
-	$(EOLIST) 
-
-nlms :: $(APR)/aprlib.imp
-
-$(APR)/aprlib.imp : make_nw_export.awk nw_export.i
-	@echo Generating $(subst /,\,$@)
-	awk -f make_nw_export.awk nw_export.i | sort >$(APR)/aprlib.imp
-    
-nw_export.i : nw_export.inc $(FILES_prebuild_headers) $(NLM_NAME)_cc.opt
-	@echo Generating $(subst /,\,$@)
-	$(CC) $< @$(NLM_NAME)_cc.opt
-
-$(NLM_NAME)_cc.opt : NWGNUmakefile $(APR_WORK)\build\NWGNUenvironment.inc $(APR_WORK)\build\NWGNUhead.inc $(APR_WORK)\build\NWGNUtail.inc $(CUSTOM_INI)
-	$(CHK) $@ $(DEL) $@
-	@echo -P >> $@
-	@echo -EP >> $@
-	@echo -nosyspath >> $@
-	@echo -w nocmdline >> $@
-	@echo -DNETWARE >> $@
-	@echo -I..\include >> $@
-	@echo -I..\include\arch\netware >> $@
-	@echo -I..\include\arch\unix >> $@
-	@echo -I$(APRUTIL)\include >> $@
-	@echo -ir $(NOVELLLIBC)\include >> $@
-
-$(APR)/include/%.h: $(subst /,\,$(APR))\include\%.hnw
-	@echo Creating $(subst /,\,$@)
-	copy $< $(subst /,\,$(APR))\include\$(@F)
-
-$(APRUTIL)/include/%.h: $(subst /,\,$(APRUTIL))\include\%.hnw
-	@echo Creating $(subst /,\,$@)
-	copy $< $(subst /,\,$(APRUTIL))\include\$(@F)
-
-$(APRUTIL)/include/private/%.h: $(subst /,\,$(APRUTIL))\include\private\%.hw
-	@echo Creating $(subst /,\,$@)
-	copy $< $(subst /,\,$(APRUTIL))\include\private\$(@F)
-
-$(APRUTIL)/xml/expat/lib/%.h: $(subst /,\,$(APRUTIL))\xml\expat\lib\%.hnw
-	@echo Creating $(subst /,\,$@)
-	copy $< $(subst /,\,$(APRUTIL))\xml\expat\lib\$(@F)
-
-ifneq "$(BUILDTOOL_AS_NLM)" "1"
-
-$(APRUTIL)/uri/uri_delims.h: gen_uri_delims.exe $(APRUTIL)/uri/gen_uri_delims.c
-	@echo Creating $(subst /,\,$@)
-	@$< > $@
-
-%.exe: $(APRUTIL)/uri/%.c
-	@echo Creating $@
-	@$(WIN_CC) $(WIN_CFLAGS) $< -o $@
-
-else
-
-ifneq "$(wildcard $(APRUTIL)/uri/uri_delims.h)" "$(APRUTIL)/uri/uri_delims.h"
-$(error Error: required header $(abspath $(APRUTIL)/uri/uri_delims.h) not found!)
-endif
-
-endif
-
-#
-# You can use this target if all that is needed is to copy files to the
-# installation area
-#
-install :: nlms FORCE
-
-clean ::
-	$(CHK) nw_export.i                                              $(DEL) nw_export.i
-	$(CHK) $(NLM_NAME)_cc.opt                                       $(DEL) $(NLM_NAME)_cc.opt
-	$(CHK) NWGNUversion.inc                                         $(DEL) NWGNUversion.inc	
-	$(CHK) $(subst /,\,$(APR))\include\apr.h                        $(DEL) $(subst /,\,$(APR))\include\apr.h
-	$(CHK) $(subst /,\,$(APRUTIL))\include\apu.h                    $(DEL) $(subst /,\,$(APRUTIL))\include\apu.h
-	$(CHK) $(subst /,\,$(APRUTIL))\include\apr_ldap.h               $(DEL) $(subst /,\,$(APRUTIL))\include\apr_ldap.h
-	$(CHK) $(subst /,\,$(APRUTIL))\include\private\apu_config.h     $(DEL) $(subst /,\,$(APRUTIL))\include\private\apu_config.h
-	$(CHK) $(subst /,\,$(APRUTIL))\include\private\apu_select_dbm.h $(DEL) $(subst /,\,$(APRUTIL))\include\private\apu_select_dbm.h
-	$(CHK) $(subst /,\,$(APRUTIL))\xml\expat\lib\expat_config.h     $(DEL) $(subst /,\,$(APRUTIL))\xml\expat\lib\expat_config.h
-	$(CHK) $(subst /,\,$(APR))\aprlib.imp                           $(DEL) $(subst /,\,$(APR))\aprlib.imp
-ifneq "$(BUILDTOOL_AS_NLM)" "1"
-	$(CHK) $(subst /,\,$(APRUTIL))\uri\uri_delims.h                 $(DEL) $(subst /,\,$(APRUTIL))\uri\uri_delims.h
-	$(CHK) gen_uri_delims.exe                                       $(DEL) gen_uri_delims.exe
-endif
-    
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/NWGNUtail.inc b/rubbos/app/httpd-2.0.64/srclib/apr/build/NWGNUtail.inc
deleted file mode 100644
index 6d76df67..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/NWGNUtail.inc
+++ /dev/null
@@ -1,323 +0,0 @@
-#
-# This contains final targets and should be included at the end of any
-# NWGNUmakefile file
-#
-
-#
-# If we are going to create an nlm, make sure we have assigned variables to
-# use during the link.
-#
-echo NLM_NAME=$(NLM_NAME)
-ifndef NLM_NAME
-NLM_NAME = $(TARGET_nlm)
-endif
-
-ifndef NLM_DESCRIPTION
-NLM_DESCRIPTION = $(NLM_NAME)
-endif
-
-ifndef NLM_THREAD_NAME
-NLM_THREAD_NAME = $(NLM_NAME) Thread
-endif
-
-ifndef NLM_SCREEN_NAME
-NLM_SCREEN_NAME = DEFAULT
-endif
-
-ifndef NLM_COPYRIGHT
-NLM_COPYRIGHT = Licensed under the Apache License Version 2.0
-endif
-
-#
-# Create dependency lists based on the files available
-#
-
-
-CCOPT_DEPENDS 	= \
-				$(APR_WORK)\build\NWGNUhead.inc \
-				$(APR_WORK)\build\NWGNUenvironment.inc \
-				$(APR_WORK)\build\NWGNUtail.inc \
-				NWGNUmakefile \
-				$(CUSTOM_INI) \
-				$(EOLIST)
-
-CPPOPT_DEPENDS	= \
-				$(APR_WORK)\build\NWGNUhead.inc \
-				$(APR_WORK)\build\NWGNUenvironment.inc \
-				$(APR_WORK)\build\NWGNUtail.inc \
-				NWGNUmakefile \
-				$(CUSTOM_INI) \
-				$(EOLIST)
-
-$(NLM_NAME)_LINKOPT_DEPENDS	= \
-				$(TARGET_lib) \
-				$(APR_WORK)\build\NWGNUenvironment.inc \
-				NWGNUmakefile \
-				$(APR_WORK)\build\NWGNUtail.inc \
-				$(CUSTOM_INI) \
-				$(VERSION_INC) \
-				$(EOLIST)
-
-ifeq "$(words $(strip $(TARGET_lib)))" "1"
-LIB_NAME					= $(basename $(notdir $(TARGET_lib)))
-$(LIB_NAME)_LIBLST_DEPENDS	= \
-				$(FILES_lib_objs) \
-				$(APR_WORK)\build\NWGNUenvironment.inc \
-				NWGNUmakefile \
-				$(APR_WORK)\build\NWGNUtail.inc \
-				$(CUSTOM_INI) \
-				$(EOLIST)
-endif
-
-ifeq "$(wildcard NWGNU$(LIB_NAME))" "NWGNU$(LIB_NAME)"
-$(LIB_NAME)_LIBLST_DEPENDS	+= NWGNU$(LIB_NAME)
-endif
-
-ifeq "$(wildcard NWGNU$(NLM_NAME))" "NWGNU$(NLM_NAME)"
-$(NLM_NAME)_LINKOPT_DEPENDS	+= NWGNU$(NLM_NAME)
-CCOPT_DEPENDS 	+= NWGNU$(NLM_NAME)
-CPPOPT_DEPENDS 	+= NWGNU$(NLM_NAME)
-endif
-
-#
-# Generic compiler rules
-#
-
-ifneq ($(MAKECMDGOALS),clean)
-$(APR_WORK)\build\NWGNUversion.inc : $(APR_WORK)\build\nw_ver.awk $(APR_WORK)\include\apr_version.h
-	@echo Generating $(subst /,\,$@)
-	@$(AWK) -f $^ > $@
-
--include $(APR_WORK)\build\NWGNUversion.inc
-
-ifneq "$(strip $(VERSION_STR))" ""
-VERSION_INC = $(APR_WORK)\build\NWGNUversion.inc
-else
-VERSION		= 0,9,0
-VERSION_STR	= 0.9.0
-endif
-endif
-
-ifeq "$(words $(strip $(TARGET_nlm)))" "1"
-INCLUDE_BLDCMDS=1
-endif
-
-ifeq "$(words $(strip $(TARGET_lib)))" "1"
-INCLUDE_BLDCMDS=1
-endif
-
-ifeq "$(INCLUDE_BLDCMDS)" "1"
-
-$(OBJDIR)/%.o: %.c $(OBJDIR)\$(NLM_NAME)_cc.opt
-	@echo Compiling $<
-	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
-
-$(OBJDIR)\$(NLM_NAME)_cc.opt: $(CCOPT_DEPENDS)
-	@echo CCOPT_DEPENDS=$(CCOPT_DEPENDS)
-	$(CHK) $@ $(DEL) $@
-	@echo Generating $@
-ifneq "$(strip $(CFLAGS))" ""
-	@echo $(CFLAGS) >> $@
-endif
-ifneq "$(strip $(XCFLAGS))" ""
-	@echo $(XCFLAGS) >> $@
-endif
-ifneq "$(strip $(XINCDIRS))" ""
-	@echo $(foreach xincdir,$(strip $(subst ;,$(SPACE),$(XINCDIRS))),-I$(xincdir)) >> $@
-endif
-ifneq "$(strip $(INCDIRS))" ""
-	@echo $(foreach incdir,$(strip $(subst ;,$(SPACE),$(INCDIRS))),-I$(incdir)) >> $@
-endif
-ifneq "$(strip $(DEFINES))" ""
-	@echo $(DEFINES) >> $@
-endif
-ifneq "$(strip $(XDEFINES))" ""
-	@echo $(XDEFINES) >> $@
-endif
-
-$(OBJDIR)/%.o: %.cpp $(OBJDIR)\cpp.opt
-	@echo Compiling $<
-	$(CPP) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cpp.opt
-
-$(OBJDIR)\cpp.opt: $(CPPOPT_DEPENDS)
-	$(CHK) $@ $(DEL) $@
-	@echo Generating $@
-ifneq "$(strip $(CFLAGS))" ""
-	@echo $(CFLAGS) >> $@
-endif
-ifneq "$(strip $(XCFLAGS))" ""
-	@echo $(XCFLAGS) >> $@
-endif
-ifneq "$(strip $(XINCDIRS))" ""
-	@echo $(foreach xincdir,$(strip $(subst ;,$(SPACE),$(XINCDIRS))),-I$(xincdir)) >> $@
-endif
-ifneq "$(strip $(INCDIRS))" ""
-	@echo $(foreach incdir,$(strip $(subst ;,$(SPACE),$(INCDIRS))),-I$(incdir)) >> $@
-endif
-ifneq "$(strip $(DEFINES))" ""
-	@echo $(DEFINES) >> $@
-endif
-ifneq "$(strip $(XDEFINES))" ""
-	@echo $(XDEFINES) >> $@
-endif
-
-endif # one target nlm
-
-#
-# Rules to build libraries
-#
-
-# If we only have one target library then build it
-
-ifeq "$(words $(strip $(TARGET_lib)))" "1"
-
-$(TARGET_lib) : $(OBJDIR)\$(LIB_NAME)_lib.lst
-	@echo Generating $@
-	$(CHK) $(OBJDIR)\$(@F) $(DEL) $(OBJDIR)\$(@F)
-	$(LIB) -o $(OBJDIR)\$(@F) @$?
-
-$(OBJDIR)\$(LIB_NAME)_lib.lst: $($(LIB_NAME)_LIBLST_DEPENDS)
-	$(CHK) $@ $(DEL) $@
-	@echo Generating $@
-ifneq "$(strip $(FILES_lib_objs))" ""
-	@echo $(foreach objfile,$(FILES_lib_objs),$(subst /,\,$(objfile)) ) >> $@
-endif
-
-else # We must have more than one target library so load the individual makefiles
-
-$(OBJDIR)/%.lib: NWGNU% $(APR_WORK)\build\NWGNUhead.inc $(APR_WORK)\build\NWGNUtail.inc $(APR_WORK)\build\NWGNUenvironment.inc FORCE
-	@echo Calling $<
-	$(MAKE) -f $< $(MAKECMDGOALS) RELEASE=$(RELEASE)
-
-endif
-
-#
-# Rules to build nlms.
-#
-
-vpath libcpre.o $(NOVELLLIBC)\imports
-
-# If we only have one target NLM then build it
-ifeq "$(words $(strip $(TARGET_nlm)))" "1"
-
-$(TARGET_nlm) : $(FILES_nlm_objs) $(FILES_nlm_libs) $(OBJDIR)\$(NLM_NAME)_link.opt
-	@echo Linking $@
-	$(LINK) @$(OBJDIR)\$(NLM_NAME)_link.opt
-
-# This will force the link option file to be rebuilt if we change the
-# corresponding makefile
-
-$(OBJDIR)\$(NLM_NAME)_link.opt : $($(NLM_NAME)_LINKOPT_DEPENDS)
-	$(CHK) $(OBJDIR)\$(@F) $(DEL) $(OBJDIR)\$(@F)
-	$(CHK) $(OBJDIR)\$(NLM_NAME)_link.def $(DEL) $(OBJDIR)\$(NLM_NAME)_link.def
-	@echo Generating $@
-	@echo -warnings off >> $@
-	@echo -zerobss >> $@
-	@echo -desc "$(NLM_DESCRIPTION)" >> $@
-	@echo -o $(TARGET_nlm) >> $@
-ifneq "$(FILE_nlm_copyright)" ""
-	@-type $(FILE_nlm_copyright) >> $@
-else
-	@echo -copy "$(NLM_COPYRIGHT)" >> $@
-endif
-ifeq "$(RELEASE)" "debug"
-	@echo -g >> $@
-	@echo -sym internal >> $@
-	@echo -sym codeview4 >> $@
-	@echo -osym $(OBJDIR)\$(NLM_NAME).sym >> $@
-else
-	@echo -sym internal >> $@
-endif
-	@echo -screenname "$(NLM_SCREEN_NAME)" >> $@
-ifneq "$(NLM_VERSION)" ""
-	@echo -nlmversion=$(NLM_VERSION) >> $@
-else
-	@echo -nlmversion=$(VERSION) >> $@
-endif
-	@echo -l $(APR)/$(OBJDIR) >> $@
-	@echo -l $(APRUTIL)/$(OBJDIR) >> $@
-	@echo -l $(XML)/$(OBJDIR) >> $@
-	@echo -l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/Runtime" >> $@
-	@echo -l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++" >> $@
-ifneq "$(IPV6)" ""
-	@echo -l $(NOVELLLIBC)\include\winsock\IPV6 >> $@
-endif
-		@echo -l $(NOVELLLIBC)/imports >> $@
-ifneq "$(LDAPSDK)" ""
-	@echo -l $(LDAPSDK)/lib/nlm >> $@
-endif
-	@echo -nodefaults >> $@
-	@echo -map $(OBJDIR)\$(NLM_NAME).map>> $@
-	@echo -threadname "$(NLM_THREAD_NAME)" >> $@
-ifneq "$(NLM_STACK_SIZE)" ""
-	@echo -stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE)))) >> $@
-else
-	@echo -stacksize 64000 >> $@
-endif
-ifneq "$(NLM_ENTRY_SYM)" ""
-	@echo -entry $(NLM_ENTRY_SYM) >> $@
-endif
-ifneq "$(NLM_EXIT_SYM)" ""
-	@echo -exit $(NLM_EXIT_SYM) >> $@
-endif
-ifneq "$(NLM_CHECK_SYM)" ""
-	@echo -check $(NLM_CHECK_SYM) >> $@
-endif
-ifneq "$(NLM_FLAGS)" ""
-	@echo -flags $(NLM_FLAGS) >> $@
-endif
-ifneq "$(strip $(XLFLAGS))" ""
-	@echo $(XLFLAGS) >> $@
-endif
-ifneq "$(strip $(FILES_nlm_objs))" ""
-	@echo $(foreach objfile,$(strip $(FILES_nlm_objs)),$(subst /,\,$(objfile))) >> $@
-endif
-ifneq "$(FILES_nlm_libs)" ""
-	@echo $(foreach libfile, $(notdir $(strip $(FILES_nlm_libs))),-l$(subst /,\,$(libfile))) >> $@
-endif
-	@echo -commandfile $(OBJDIR)\$(NLM_NAME)_link.def >> $@
-ifneq "$(FILE_nlm_msg)" ""
-	@echo Messages $(FILE_nlm_msg) >> $(OBJDIR)\$(NLM_NAME)_link.def
-endif
-ifneq "$(FILE_nlm_hlp)" ""
-	@echo Help $(FILE_nlm_hlp) >> $(OBJDIR)\$(NLM_NAME)_link.def
-endif
-ifneq "$(FILES_nlm_modules)" ""
-	@echo module $(foreach module,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_modules))),$(subst /,\,$(module))) >> $(OBJDIR)\$(NLM_NAME)_link.def
-endif
-ifneq "$(FILES_nlm_Ximports)" ""
-	@echo Import $(foreach import,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_Ximports))),$(subst /,\,$(import))) >> $(OBJDIR)\$(NLM_NAME)_link.def
-endif
-ifneq "$(FILES_nlm_exports)" ""
-	@echo Export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(subst /,\,$(export))) >> $(OBJDIR)\$(NLM_NAME)_link.def
-endif
-
-# if APACHE_UNIPROC is defined, don't include XDCData
-ifndef APACHE_UNIPROC
-ifneq "$(string $(XDCDATA))" ""
-	@echo XDCData $(XDCDATA) >> $(OBJDIR)\$(NLM_NAME)_link.def
-else
-	@echo XDCData $(APR)\misc\netware\apr.xdc >> $(OBJDIR)\$(NLM_NAME)_link.def
-endif
-endif
-
-else # more than one target so look for individual makefiles.
-
-# Only include these if NO_LICENSE_FILE isn't set to prevent excessive
-# recursion
-
-ifndef NO_LICENSE_FILE
-
-$(OBJDIR)/%.nlm: NWGNU% $(APR_WORK)\build\NWGNUhead.inc $(APR_WORK)\build\NWGNUtail.inc $(APR_WORK)\build\NWGNUenvironment.inc $(CUSTOM_INI) $(VERSION_INC) FORCE
-	@echo Calling $<
-	$(MAKE) -f $< $(MAKECMDGOALS) RELEASE=$(RELEASE)
-	$(CMD) echo.
-
-else
-
-$(TARGET_nlm):
-
-endif # NO_LICENSE_FILE
-
-endif # multiple targets
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/PrintPath b/rubbos/app/httpd-2.0.64/srclib/apr/build/PrintPath
deleted file mode 100755
index 2a2b48b6..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/PrintPath
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-#
-# Look for program[s] somewhere in $PATH.
-#
-# Options:
-#  -s
-#    Do not print out full pathname. (silent)
-#  -pPATHNAME
-#    Look in PATHNAME instead of $PATH
-#
-# Usage:
-#  PrintPath [-s] [-pPATHNAME] program [program ...]
-#
-# Initially written by Jim Jagielski for the Apache configuration mechanism
-#  (with kudos to Kernighan/Pike)
-
-##
-# Some "constants"
-##
-pathname=$PATH
-echo="yes"
-
-##
-# Find out what OS we are running for later on
-##
-os=`(uname) 2>/dev/null`
-
-##
-# Parse command line
-##
-for args in $*
-do
-    case $args in
-	-s  ) echo="no" ;;
-	-p* ) pathname="`echo $args | sed 's/^..//'`" ;;
-	*   ) programs="$programs $args" ;;
-    esac
-done
-
-##
-# Now we make the adjustments required for OS/2 and everyone
-# else :)
-#
-# First of all, all OS/2 programs have the '.exe' extension.
-# Next, we adjust PATH (or what was given to us as PATH) to
-# be whitespace separated directories.
-# Finally, we try to determine the best flag to use for
-# test/[] to look for an executable file. OS/2 just has '-r'
-# but with other OSs, we do some funny stuff to check to see
-# if test/[] knows about -x, which is the prefered flag.
-##
-
-if [ "x$os" = "xOS/2" ]
-then
-    ext=".exe"
-    pathname=`echo -E $pathname |
-     sed 's/^;/.;/
-	  s/;;/;.;/g
-	  s/;$/;./
-	  s/;/ /g
-	  s/\\\\/\\//g' `
-    test_exec_flag="-r"
-else
-    ext=""	# No default extensions
-    pathname=`echo $pathname |
-     sed 's/^:/.:/
-	  s/::/:.:/g
-	  s/:$/:./
-	  s/:/ /g' `
-    # Here is how we test to see if test/[] can handle -x
-    testfile="pp.t.$$"
-
-    cat > $testfile <<ENDTEST
-#!/bin/sh
-if [ -x / ] || [ -x /bin ] || [ -x /bin/ls ]; then
-    exit 0
-fi
-exit 1
-ENDTEST
-
-    if `/bin/sh $testfile 2>/dev/null`; then
-	test_exec_flag="-x"
-    else
-	test_exec_flag="-r"
-    fi
-    rm -f $testfile
-fi
-
-for program in $programs
-do
-    for path in $pathname
-    do
-	if [ $test_exec_flag $path/${program}${ext} ] && \
-	   [ ! -d $path/${program}${ext} ]; then
-	    if [ "x$echo" = "xyes" ]; then
-		echo $path/${program}${ext}
-	    fi
-	    exit 0
-	fi
-
-# Next try without extension (if one was used above)
-	if [ "x$ext" != "x" ]; then
-            if [ $test_exec_flag $path/${program} ] && \
-               [ ! -d $path/${program} ]; then
-                if [ "x$echo" = "xyes" ]; then
-                    echo $path/${program}
-                fi
-                exit 0
-            fi
-        fi
-    done
-done
-exit 1
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/aplibtool.c b/rubbos/app/httpd-2.0.64/srclib/apr/build/aplibtool.c
deleted file mode 100644
index 110700ab..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/aplibtool.c
+++ /dev/null
@@ -1,751 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <process.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <dirent.h>
-
-typedef char bool;
-#define false 0
-#define true (!false)
-
-bool silent = false;
-bool shared = false;
-bool export_all = false;
-enum mode_t { mCompile, mLink, mInstall };
-enum output_type_t { otGeneral, otObject, otProgram, otStaticLibrary, otDynamicLibrary };
-
-#ifdef __EMX__
-#  define SHELL_CMD  "sh"
-#  define CC         "gcc"
-#  define GEN_EXPORTS "emxexp"
-#  define DEF2IMPLIB_CMD "emximp"
-#  define SHARE_SW   "-Zdll -Zmtd"
-#  define USE_OMF true
-#  define TRUNCATE_DLL_NAME
-#  define DYNAMIC_LIB_EXT "dll"
-#  define EXE_EXT ".exe"
-
-#  if USE_OMF
-     /* OMF is the native format under OS/2 */
-#    define STATIC_LIB_EXT "lib"
-#    define OBJECT_EXT     "obj"
-#    define LIBRARIAN      "emxomfar"
-#  else
-     /* but the alternative, a.out, can fork() which is sometimes necessary */
-#    define STATIC_LIB_EXT "a"
-#    define OBJECT_EXT     "o"
-#    define LIBRARIAN      "ar"
-#  endif
-#endif
-
-
-typedef struct {
-    char *arglist[1024];
-    int num_args;
-    enum mode_t mode;
-    enum output_type_t output_type;
-    char *output_name;
-    char *stub_name;
-    char *tmp_dirs[1024];
-    int num_tmp_dirs;
-    char *obj_files[1024];
-    int num_obj_files;
-} cmd_data_t;
-
-void parse_args(int argc, char *argv[], cmd_data_t *cmd_data);
-bool parse_long_opt(char *arg, cmd_data_t *cmd_data);
-int parse_short_opt(char *arg, cmd_data_t *cmd_data);
-bool parse_input_file_name(char *arg, cmd_data_t *cmd_data);
-bool parse_output_file_name(char *arg, cmd_data_t *cmd_data);
-void post_parse_fixup(cmd_data_t *cmd_data);
-bool explode_static_lib(char *lib, cmd_data_t *cmd_data);
-int execute_command(cmd_data_t *cmd_data);
-char *shell_esc(const char *str);
-void cleanup_tmp_dirs(cmd_data_t *cmd_data);
-void generate_def_file(cmd_data_t *cmd_data);
-char *nameof(char *fullpath);
-char *truncate_dll_name(char *path);
-
-
-int main(int argc, char *argv[])
-{
-    int rc;
-    cmd_data_t cmd_data;
-
-    memset(&cmd_data, 0, sizeof(cmd_data));
-    cmd_data.mode = mCompile;
-    cmd_data.output_type = otGeneral;
-
-    parse_args(argc, argv, &cmd_data);
-    rc = execute_command(&cmd_data);
-
-    if (rc == 0 && cmd_data.stub_name) {
-        fopen(cmd_data.stub_name, "w");
-    }
-
-    cleanup_tmp_dirs(&cmd_data);
-    return rc;
-}
-
-
-
-void parse_args(int argc, char *argv[], cmd_data_t *cmd_data)
-{
-    int a;
-    char *arg;
-    bool argused;
-
-    for (a=1; a < argc; a++) {
-        arg = argv[a];
-        argused = false;
-
-        if (arg[0] == '-') {
-            if (arg[1] == '-') {
-                argused = parse_long_opt(arg + 2, cmd_data);
-            } else if (arg[1] == 'o' && a+1 < argc) {
-                cmd_data->arglist[cmd_data->num_args++] = arg;
-                arg = argv[++a];
-                argused = parse_output_file_name(arg, cmd_data);
-            } else {
-                int num_used = parse_short_opt(arg + 1, cmd_data);
-                argused = num_used > 0;
-
-                if (num_used > 1) {
-                    a += num_used - 1;
-                }
-            }
-        } else {
-            argused = parse_input_file_name(arg, cmd_data);
-        }
-
-        if (!argused) {
-            cmd_data->arglist[cmd_data->num_args++] = arg;
-        }
-    }
-
-    post_parse_fixup(cmd_data);
-}
-
-
-
-bool parse_long_opt(char *arg, cmd_data_t *cmd_data)
-{
-    char *equal_pos = strchr(arg, '=');
-    char var[50];
-    char value[500];
-
-    if (equal_pos) {
-        strncpy(var, arg, equal_pos - arg);
-        var[equal_pos - arg] = 0;
-        strcpy(value, equal_pos + 1);
-    } else {
-        strcpy(var, arg);
-    }
-
-    if (strcmp(var, "silent") == 0) {
-        silent = true;
-    } else if (strcmp(var, "mode") == 0) {
-        if (strcmp(value, "compile") == 0) {
-            cmd_data->mode = mCompile;
-            cmd_data->output_type = otObject;
-        }
-
-        if (strcmp(value, "link") == 0) {
-            cmd_data->mode = mLink;
-        }
-
-        if (strcmp(value, "install") == 0) {
-            cmd_data->mode = mInstall;
-        }
-    } else if (strcmp(var, "shared") == 0) {
-        shared = true;
-    } else if (strcmp(var, "export-all") == 0) {
-        export_all = true;
-    } else {
-        return false;
-    }
-
-    return true;
-}
-
-
-
-int parse_short_opt(char *arg, cmd_data_t *cmd_data)
-{
-    if (strcmp(arg, "export-dynamic") == 0) {
-        return 1;
-    }
-
-    if (strcmp(arg, "module") == 0) {
-        return 1;
-    }
-
-    if (strcmp(arg, "Zexe") == 0) {
-        return 1;
-    }
-
-    if (strcmp(arg, "avoid-version") == 0) {
-        return 1;
-    }
-
-    if (strcmp(arg, "prefer-pic") == 0) {
-        return 1;
-    }
-
-    if (strcmp(arg, "prefer-non-pic") == 0) {
-        return 1;
-    }
-
-    if (strcmp(arg, "version-info") == 0 ) {
-        return 2;
-    }
-
-    return 0;
-}
-
-
-
-bool parse_input_file_name(char *arg, cmd_data_t *cmd_data)
-{
-    char *ext = strrchr(arg, '.');
-    char *name = strrchr(arg, '/');
-    int pathlen;
-    char *newarg;
-
-    if (!ext) {
-        return false;
-    }
-
-    ext++;
-
-    if (name == NULL) {
-        name = strrchr(arg, '\\');
-
-        if (name == NULL) {
-            name = arg;
-        } else {
-            name++;
-        }
-    } else {
-        name++;
-    }
-
-    pathlen = name - arg;
-
-    if (strcmp(ext, "lo") == 0) {
-        newarg = (char *)malloc(strlen(arg) + 10);
-        strcpy(newarg, arg);
-        strcpy(newarg + (ext - arg), OBJECT_EXT);
-        cmd_data->arglist[cmd_data->num_args++] = newarg;
-        cmd_data->obj_files[cmd_data->num_obj_files++] = newarg;
-        return true;
-    }
-
-    if (strcmp(ext, "la") == 0) {
-        newarg = (char *)malloc(strlen(arg) + 10);
-        strcpy(newarg, arg);
-        newarg[pathlen] = 0;
-        strcat(newarg, ".libs/");
-
-        if (strncmp(name, "lib", 3) == 0) {
-            name += 3;
-        }
-
-        strcat(newarg, name);
-        ext = strrchr(newarg, '.') + 1;
-
-        if (shared && cmd_data->mode == mInstall) {
-          strcpy(ext, DYNAMIC_LIB_EXT);
-          newarg = truncate_dll_name(newarg);
-        } else {
-          strcpy(ext, STATIC_LIB_EXT);
-        }
-
-        cmd_data->arglist[cmd_data->num_args++] = newarg;
-        return true;
-    }
-
-    if (strcmp(ext, "c") == 0) {
-        if (cmd_data->stub_name == NULL) {
-            cmd_data->stub_name = (char *)malloc(strlen(arg) + 4);
-            strcpy(cmd_data->stub_name, arg);
-            strcpy(strrchr(cmd_data->stub_name, '.') + 1, "lo");
-        }
-    }
-
-    if (strcmp(name, CC) == 0 || strcmp(name, CC EXE_EXT) == 0) {
-        if (cmd_data->output_type == otGeneral) {
-            cmd_data->output_type = otObject;
-        }
-    }
-
-    return false;
-}
-
-
-
-bool parse_output_file_name(char *arg, cmd_data_t *cmd_data)
-{
-    char *name = strrchr(arg, '/');
-    char *ext = strrchr(arg, '.');
-    char *newarg = NULL, *newext;
-    int pathlen;
-
-    if (name == NULL) {
-        name = strrchr(arg, '\\');
-
-        if (name == NULL) {
-            name = arg;
-        } else {
-            name++;
-        }
-    } else {
-        name++;
-    }
-
-    if (!ext) {
-        cmd_data->stub_name = arg;
-        cmd_data->output_type = otProgram;
-        newarg = (char *)malloc(strlen(arg) + 5);
-        strcpy(newarg, arg);
-        strcat(newarg, EXE_EXT);
-        cmd_data->arglist[cmd_data->num_args++] = newarg;
-        cmd_data->output_name = newarg;
-        return true;
-    }
-
-    ext++;
-    pathlen = name - arg;
-
-    if (strcmp(ext, "la") == 0) {
-        cmd_data->stub_name = arg;
-        cmd_data->output_type = shared ? otDynamicLibrary : otStaticLibrary;
-        newarg = (char *)malloc(strlen(arg) + 10);
-        mkdir(".libs", 0);
-        strcpy(newarg, ".libs/");
-
-        if (strncmp(arg, "lib", 3) == 0) {
-            arg += 3;
-        }
-
-        strcat(newarg, arg);
-        newext = strrchr(newarg, '.') + 1;
-        strcpy(newext, shared ? DYNAMIC_LIB_EXT : STATIC_LIB_EXT);
-
-#ifdef TRUNCATE_DLL_NAME
-        if (shared) {
-          newarg = truncate_dll_name(newarg);
-        }
-#endif
-
-        cmd_data->arglist[cmd_data->num_args++] = newarg;
-        cmd_data->output_name = newarg;
-        return true;
-    }
-
-    if (strcmp(ext, "lo") == 0) {
-        cmd_data->stub_name = arg;
-        cmd_data->output_type = otObject;
-        newarg = (char *)malloc(strlen(arg) + 2);
-        strcpy(newarg, arg);
-        ext = strrchr(newarg, '.') + 1;
-        strcpy(ext, OBJECT_EXT);
-        cmd_data->arglist[cmd_data->num_args++] = newarg;
-        cmd_data->output_name = newarg;
-        return true;
-    }
-
-    return false;
-}
-
-
-
-void post_parse_fixup(cmd_data_t *cmd_data)
-{
-    int a;
-    char *arg;
-    char *ext;
-
-    if (cmd_data->output_type == otStaticLibrary && cmd_data->mode == mLink) {
-        /* We do a real hatchet job on the args when making a static library
-         * removing all compiler switches & any other cruft that ar won't like
-         * We also need to explode any libraries listed
-         */
-
-        for (a=0; a < cmd_data->num_args; a++) {
-            arg = cmd_data->arglist[a];
-
-            if (arg) {
-                ext = strrchr(arg, '.');
-
-                if (ext) {
-                    ext++;
-                }
-
-                if (arg[0] == '-') {
-                    cmd_data->arglist[a] = NULL;
-
-                    if (strcmp(arg, "-rpath") == 0 && a+1 < cmd_data->num_args) {
-                        cmd_data->arglist[a+1] = NULL;
-                    }
-
-                    if (strcmp(arg, "-R") == 0 && a+1 < cmd_data->num_args) {
-                        cmd_data->arglist[a+1] = NULL;
-                    }
-
-                    if (strcmp(arg, "-version-info") == 0 && a+1 < cmd_data->num_args) {
-                        cmd_data->arglist[a+1] = NULL;
-                    }
-
-                    if (strcmp(arg, "-Zstack") == 0 && a+1 < cmd_data->num_args) {
-                        cmd_data->arglist[a+1] = NULL;
-                    }
-
-                    if (strcmp(arg, "-o") == 0) {
-                        a++;
-                    }
-                }
-
-                if (strcmp(arg, CC) == 0 || strcmp(arg, CC EXE_EXT) == 0) {
-                    cmd_data->arglist[a] = LIBRARIAN " cr";
-                }
-
-                if (ext) {
-                    if (strcmp(ext, "h") == 0 || strcmp(ext, "c") == 0) {
-                        /* ignore source files, they don't belong in a library */
-                        cmd_data->arglist[a] = NULL;
-                    }
-
-                    if (strcmp(ext, STATIC_LIB_EXT) == 0) {
-                        cmd_data->arglist[a] = NULL;
-                        explode_static_lib(arg, cmd_data);
-                    }
-                }
-            }
-        }
-    }
-
-    if (cmd_data->output_type == otDynamicLibrary) {
-        for (a=0; a < cmd_data->num_args; a++) {
-            arg = cmd_data->arglist[a];
-
-            if (arg) {
-                if (strcmp(arg, "-rpath") == 0 && a+1 < cmd_data->num_args) {
-                    cmd_data->arglist[a] = NULL;
-                    cmd_data->arglist[a+1] = NULL;
-                }
-            }
-        }
-
-        if (export_all) {
-            generate_def_file(cmd_data);
-        }
-    }
-
-#if USE_OMF
-    if (cmd_data->output_type == otObject ||
-        cmd_data->output_type == otProgram ||
-        cmd_data->output_type == otDynamicLibrary) {
-        cmd_data->arglist[cmd_data->num_args++] = "-Zomf";
-    }
-#endif
-
-    if (shared && (cmd_data->output_type == otObject || cmd_data->output_type == otDynamicLibrary)) {
-        cmd_data->arglist[cmd_data->num_args++] = SHARE_SW;
-    }
-}
-
-
-
-int execute_command(cmd_data_t *cmd_data)
-{
-    int target = 0;
-    char *command;
-    int a, total_len = 0;
-    char *args[4];
-
-    for (a=0; a < cmd_data->num_args; a++) {
-        if (cmd_data->arglist[a]) {
-            total_len += strlen(cmd_data->arglist[a]) + 1;
-        }
-    }
-
-    command = (char *)malloc( total_len );
-    command[0] = 0;
-
-    for (a=0; a < cmd_data->num_args; a++) {
-        if (cmd_data->arglist[a]) {
-            strcat(command, cmd_data->arglist[a]);
-            strcat(command, " ");
-        }
-    }
-
-    command[strlen(command)-1] = 0;
-
-    if (!silent) {
-        puts(command);
-    }
-
-    cmd_data->num_args = target;
-    cmd_data->arglist[cmd_data->num_args] = NULL;
-    command = shell_esc(command);
-
-    args[0] = SHELL_CMD;
-    args[1] = "-c";
-    args[2] = command;
-    args[3] = NULL;
-    return spawnvp(P_WAIT, args[0], args);
-}
-
-
-
-char *shell_esc(const char *str)
-{
-    char *cmd;
-    unsigned char *d;
-    const unsigned char *s;
-
-    cmd = (char *)malloc(2 * strlen(str) + 1);
-    d = (unsigned char *)cmd;
-    s = (const unsigned char *)str;
-
-    for (; *s; ++s) {
-        if (*s == '"' || *s == '\\') {
-	    *d++ = '\\';
-	}
-	*d++ = *s;
-    }
-
-    *d = '\0';
-    return cmd;
-}
-
-
-
-bool explode_static_lib(char *lib, cmd_data_t *cmd_data)
-{
-    char tmpdir[1024];
-    char savewd[1024];
-    char cmd[1024];
-    char *name;
-    DIR *dir;
-    struct dirent *entry;
-
-    strcpy(tmpdir, lib);
-    strcat(tmpdir, ".exploded");
-
-    mkdir(tmpdir, 0);
-    cmd_data->tmp_dirs[cmd_data->num_tmp_dirs++] = strdup(tmpdir);
-    getcwd(savewd, sizeof(savewd));
-
-    if (chdir(tmpdir) != 0)
-        return false;
-
-    strcpy(cmd, LIBRARIAN " x ");
-    name = strrchr(lib, '/');
-
-    if (name) {
-        name++;
-    } else {
-        name = lib;
-    }
-
-    strcat(cmd, "../");
-    strcat(cmd, name);
-    system(cmd);
-    chdir(savewd);
-    dir = opendir(tmpdir);
-
-    while ((entry = readdir(dir)) != NULL) {
-        if (entry->d_name[0] != '.') {
-            strcpy(cmd, tmpdir);
-            strcat(cmd, "/");
-            strcat(cmd, entry->d_name);
-            cmd_data->arglist[cmd_data->num_args++] = strdup(cmd);
-        }
-    }
-
-    closedir(dir);
-    return true;
-}
-
-
-
-void cleanup_tmp_dir(char *dirname)
-{
-    DIR *dir;
-    struct dirent *entry;
-    char fullname[1024];
-
-    dir = opendir(dirname);
-
-    if (dir == NULL)
-        return;
-
-    while ((entry = readdir(dir)) != NULL) {
-        if (entry->d_name[0] != '.') {
-            strcpy(fullname, dirname);
-            strcat(fullname, "/");
-            strcat(fullname, entry->d_name);
-            remove(fullname);
-        }
-    }
-
-    rmdir(dirname);
-}
-
-
-
-void cleanup_tmp_dirs(cmd_data_t *cmd_data)
-{
-    int d;
-
-    for (d=0; d < cmd_data->num_tmp_dirs; d++) {
-        cleanup_tmp_dir(cmd_data->tmp_dirs[d]);
-    }
-}
-
-
-
-void generate_def_file(cmd_data_t *cmd_data)
-{
-    char def_file[1024];
-    char implib_file[1024];
-    char *ext;
-    FILE *hDef;
-    char *export_args[1024];
-    int num_export_args = 0;
-    char *cmd;
-    int cmd_size = 0;
-    int a;
-
-    if (cmd_data->output_name) {
-        strcpy(def_file, cmd_data->output_name);
-        strcat(def_file, ".def");
-        hDef = fopen(def_file, "w");
-
-        if (hDef != NULL) {
-            fprintf(hDef, "LIBRARY '%s' INITINSTANCE\n", nameof(cmd_data->output_name));
-            fprintf(hDef, "DATA NONSHARED\n");
-            fprintf(hDef, "EXPORTS\n");
-            fclose(hDef);
-
-            for (a=0; a < cmd_data->num_obj_files; a++) {
-                cmd_size += strlen(cmd_data->obj_files[a]) + 1;
-            }
-
-            cmd_size += strlen(GEN_EXPORTS) + strlen(def_file) + 3;
-            cmd = (char *)malloc(cmd_size);
-            strcpy(cmd, GEN_EXPORTS);
-
-            for (a=0; a < cmd_data->num_obj_files; a++) {
-                strcat(cmd, " ");
-                strcat(cmd, cmd_data->obj_files[a] );
-            }
-
-            strcat(cmd, ">>");
-            strcat(cmd, def_file);
-            puts(cmd);
-            export_args[num_export_args++] = SHELL_CMD;
-            export_args[num_export_args++] = "-c";
-            export_args[num_export_args++] = cmd;
-            export_args[num_export_args++] = NULL;
-            spawnvp(P_WAIT, export_args[0], export_args);
-            cmd_data->arglist[cmd_data->num_args++] = strdup(def_file);
-
-            /* Now make an import library for the dll */
-            num_export_args = 0;
-            export_args[num_export_args++] = DEF2IMPLIB_CMD;
-            export_args[num_export_args++] = "-o";
-
-            strcpy(implib_file, ".libs/");
-            strcat(implib_file, cmd_data->stub_name);
-            ext = strrchr(implib_file, '.');
-
-            if (ext)
-                *ext = 0;
-
-            strcat(implib_file, ".");
-            strcat(implib_file, STATIC_LIB_EXT);
-
-            export_args[num_export_args++] = implib_file;
-            export_args[num_export_args++] = def_file;
-            export_args[num_export_args++] = NULL;
-            spawnvp(P_WAIT, export_args[0], export_args);
-        }
-    }
-}
-
-
-
-/* returns just a file's name without path or extension */
-char *nameof(char *fullpath)
-{
-    char buffer[1024];
-    char *ext;
-    char *name = strrchr(fullpath, '/');
-
-    if (name == NULL) {
-        name = strrchr(fullpath, '\\');
-    }
-
-    if (name == NULL) {
-        name = fullpath;
-    } else {
-        name++;
-    }
-
-    strcpy(buffer, name);
-    ext = strrchr(buffer, '.');
-
-    if (ext) {
-        *ext = 0;
-        return strdup(buffer);
-    }
-
-    return name;
-}
-
-
-
-char *truncate_dll_name(char *path)
-{
-    /* Cut DLL name down to 8 characters after removing any mod_ prefix */
-    char *tmppath = strdup(path);
-    char *newname = strrchr(tmppath, '/') + 1;
-    char *ext = strrchr(tmppath, '.');
-    int len;
-
-    if (ext == NULL)
-        return tmppath;
-
-    len = ext - newname;
-
-    if (strncmp(newname, "mod_", 4) == 0) {
-        strcpy(newname, newname + 4);
-        len -= 4;
-    }
-
-    if (len > 8) {
-        strcpy(newname + 8, strchr(newname, '.'));
-    }
-
-    return tmppath;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_app.dsp b/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_app.dsp
deleted file mode 100644
index 9956a0c7..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_app.dsp
+++ /dev/null
@@ -1,89 +0,0 @@
-# Microsoft Developer Studio Project File - Name="apr_app" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=apr_app - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "apr_app.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "apr_app.mak" CFG="apr_app - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "apr_app - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "apr_app - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "apr_app - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "LibR"
-# PROP BASE Intermediate_Dir "LibR"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "LibR"
-# PROP Intermediate_Dir "LibR"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /D "APR_DECLARE_STATIC" /Fd"LibR\apr_app_src" /FD /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "apr_app - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "LibD"
-# PROP BASE Intermediate_Dir "LibD"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "LibD"
-# PROP Intermediate_Dir "LibD"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /D "APR_DECLARE_STATIC" /Fd"LibD\apr_app_src" /FD /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "apr_app - Win32 Release"
-# Name "apr_app - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\misc\win32\apr_app.c
-# End Source File
-# End Target
-# End Project
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_common.m4 b/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_common.m4
deleted file mode 100644
index ace88c44..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_common.m4
+++ /dev/null
@@ -1,993 +0,0 @@
-dnl -----------------------------------------------------------------
-dnl apr_common.m4: APR's general-purpose autoconf macros
-dnl
-
-dnl APR_CONFIG_NICE(filename)
-dnl
-dnl Saves a snapshot of the configure command-line for later reuse
-dnl
-AC_DEFUN(APR_CONFIG_NICE,[
-  rm -f $1
-  cat >$1<<EOF
-#! /bin/sh
-#
-# Created by configure
-
-EOF
-  if test -n "$CC"; then
-    echo "CC=\"$CC\"; export CC" >> $1
-  fi
-  if test -n "$CFLAGS"; then
-    echo "CFLAGS=\"$CFLAGS\"; export CFLAGS" >> $1
-  fi
-  if test -n "$CPPFLAGS"; then
-    echo "CPPFLAGS=\"$CPPFLAGS\"; export CPPFLAGS" >> $1
-  fi
-  if test -n "$LDFLAGS"; then
-    echo "LDFLAGS=\"$LDFLAGS\"; export LDFLAGS" >> $1
-  fi
-  if test -n "$LIBS"; then
-    echo "LIBS=\"$LIBS\"; export LIBS" >> $1
-  fi
-  if test -n "$INCLUDES"; then
-    echo "INCLUDES=\"$INCLUDES\"; export INCLUDES" >> $1
-  fi
-  if test -n "$NOTEST_CFLAGS"; then
-    echo "NOTEST_CFLAGS=\"$NOTEST_CFLAGS\"; export NOTEST_CFLAGS" >> $1
-  fi
-  if test -n "$NOTEST_CPPFLAGS"; then
-    echo "NOTEST_CPPFLAGS=\"$NOTEST_CPPFLAGS\"; export NOTEST_CPPFLAGS" >> $1
-  fi
-  if test -n "$NOTEST_LDFLAGS"; then
-    echo "NOTEST_LDFLAGS=\"$NOTEST_LDFLAGS\"; export NOTEST_LDFLAGS" >> $1
-  fi
-  if test -n "$NOTEST_LIBS"; then
-    echo "NOTEST_LIBS=\"$NOTEST_LIBS\"; export NOTEST_LIBS" >> $1
-  fi
-
-  # Retrieve command-line arguments.
-  eval "set x $[0] $ac_configure_args"
-  shift
-
-  for arg
-  do
-    APR_EXPAND_VAR(arg, $arg)
-    echo "\"[$]arg\" \\" >> $1
-  done
-  echo '"[$]@"' >> $1
-  chmod +x $1
-])dnl
-
-dnl APR_MKDIR_P_CHECK(fallback-mkdir-p)
-dnl checks whether mkdir -p works
-AC_DEFUN(APR_MKDIR_P_CHECK,[
-  AC_CACHE_CHECK(for working mkdir -p, ac_cv_mkdir_p,[
-    test -d conftestdir && rm -rf conftestdir
-    mkdir -p conftestdir/somedir >/dev/null 2>&1
-    if test -d conftestdir/somedir; then
-      ac_cv_mkdir_p=yes
-    else
-      ac_cv_mkdir_p=no
-    fi
-    rm -rf conftestdir
-  ])
-  if test "$ac_cv_mkdir_p" = "yes"; then
-      mkdir_p="mkdir -p"
-  else
-      mkdir_p="$1"
-  fi
-])
-
-dnl
-dnl APR_SUBDIR_CONFIG(dir [, sub-package-cmdline-args, args-to-drop])
-dnl
-dnl dir: directory to find configure in
-dnl sub-package-cmdline-args: arguments to add to the invocation (optional)
-dnl args-to-drop: arguments to drop from the invocation (optional)
-dnl
-dnl Note: This macro relies on ac_configure_args being set properly.
-dnl
-dnl The args-to-drop argument is shoved into a case statement, so
-dnl multiple arguments can be separated with a |.
-dnl
-dnl Note: Older versions of autoconf do not single-quote args, while 2.54+
-dnl places quotes around every argument.  So, if you want to drop the
-dnl argument called --enable-layout, you must pass the third argument as:
-dnl [--enable-layout=*|\'--enable-layout=*]
-dnl
-dnl Trying to optimize this is left as an exercise to the reader who wants
-dnl to put up with more autoconf craziness.  I give up.
-dnl
-AC_DEFUN(APR_SUBDIR_CONFIG, [
-  # save our work to this point; this allows the sub-package to use it
-  AC_CACHE_SAVE
-
-  echo "configuring package in $1 now"
-  ac_popdir=`pwd`
-  apr_config_subdirs="$1"
-  test -d $1 || $mkdir_p $1
-  ac_abs_srcdir=`(cd $srcdir/$1 && pwd)`
-  cd $1
-
-changequote(, )dnl
-      # A "../" for each directory in /$config_subdirs.
-      ac_dots=`echo $apr_config_subdirs|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
-changequote([, ])dnl
-
-  # Make the cache file pathname absolute for the subdirs
-  # required to correctly handle subdirs that might actually
-  # be symlinks
-  case "$cache_file" in
-  /*) # already absolute
-    ac_sub_cache_file=$cache_file ;;
-  *)  # Was relative path.
-    ac_sub_cache_file="$ac_popdir/$cache_file" ;;
-  esac
-
-  ifelse($3, [], [apr_configure_args=$ac_configure_args],[
-  apr_configure_args=
-  apr_sep=
-  for apr_configure_arg in $ac_configure_args
-  do
-    case "$apr_configure_arg" in
-      $3)
-        continue ;;
-    esac
-    apr_configure_args="$apr_configure_args$apr_sep'$apr_configure_arg'"
-    apr_sep=" "
-  done
-  ])
-
-  dnl autoconf doesn't add --silent to ac_configure_args; explicitly pass it
-  test "x$silent" = "xyes" && apr_configure_args="$apr_configure_args --silent"
-
-  dnl AC_CONFIG_SUBDIRS silences option warnings, emulate this for 2.62
-  apr_configure_args="--disable-option-checking $apr_configure_args" 
-
-  dnl The eval makes quoting arguments work - specifically $2 where the
-  dnl quoting mechanisms used is "" rather than [].
-  dnl
-  dnl We need to execute another shell because some autoconf/shell combinations
-  dnl will choke after doing repeated APR_SUBDIR_CONFIG()s.  (Namely Solaris
-  dnl and autoconf-2.54+)
-  if eval $SHELL $ac_abs_srcdir/configure $apr_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir $2
-  then :
-    echo "$1 configured properly"
-  else
-    echo "configure failed for $1"
-    exit 1
-  fi
-
-  cd $ac_popdir
-
-  # grab any updates from the sub-package
-  AC_CACHE_LOAD
-])dnl
-
-dnl
-dnl APR_SAVE_THE_ENVIRONMENT(variable_name)
-dnl
-dnl Stores the variable (usually a Makefile macro) for later restoration
-dnl
-AC_DEFUN(APR_SAVE_THE_ENVIRONMENT,[
-  apr_ste_save_$1="$$1"
-])dnl
-
-dnl
-dnl APR_RESTORE_THE_ENVIRONMENT(variable_name, prefix_)
-dnl
-dnl Uses the previously saved variable content to figure out what configure
-dnl has added to the variable, moving the new bits to prefix_variable_name
-dnl and restoring the original variable contents.  This makes it possible
-dnl for a user to override configure when it does something stupid.
-dnl
-AC_DEFUN(APR_RESTORE_THE_ENVIRONMENT,[
-if test "x$apr_ste_save_$1" = "x"; then
-  $2$1="$$1"
-  $1=
-else
-  if test "x$apr_ste_save_$1" = "x$$1"; then
-    $2$1=
-  else
-    $2$1=`echo $$1 | sed -e "s%${apr_ste_save_$1}%%"`
-    $1="$apr_ste_save_$1"
-  fi
-fi
-echo "  restoring $1 to \"$$1\""
-echo "  setting $2$1 to \"$$2$1\""
-AC_SUBST($2$1)
-])dnl
-
-dnl
-dnl APR_SETIFNULL(variable, value)
-dnl
-dnl  Set variable iff it's currently null
-dnl
-AC_DEFUN(APR_SETIFNULL,[
-  if test -z "$$1"; then
-    echo "  setting $1 to \"$2\""
-    $1="$2"
-  fi
-])dnl
-
-dnl
-dnl APR_SETVAR(variable, value)
-dnl
-dnl  Set variable no matter what
-dnl
-AC_DEFUN(APR_SETVAR,[
-  echo "  forcing $1 to \"$2\""
-  $1="$2"
-])dnl
-
-dnl
-dnl APR_ADDTO(variable, value)
-dnl
-dnl  Add value to variable
-dnl
-AC_DEFUN(APR_ADDTO,[
-  if test "x$$1" = "x"; then
-    echo "  setting $1 to \"$2\""
-    $1="$2"
-  else
-    apr_addto_bugger="$2"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $$1; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to $1"
-        $1="$$1 $i"
-      fi
-    done
-  fi
-])dnl
-
-dnl
-dnl APR_REMOVEFROM(variable, value)
-dnl
-dnl Remove a value from a variable
-dnl
-AC_DEFUN(APR_REMOVEFROM,[
-  if test "x$$1" = "x$2"; then
-    echo "  nulling $1"
-    $1=""
-  else
-    apr_new_bugger=""
-    apr_removed=0
-    for i in $$1; do
-      if test "x$i" != "x$2"; then
-        apr_new_bugger="$apr_new_bugger $i"
-      else
-        apr_removed=1
-      fi
-    done
-    if test $apr_removed = "1"; then
-      echo "  removed \"$2\" from $1"
-      $1=$apr_new_bugger
-    fi
-  fi
-]) dnl
-
-dnl
-dnl APR_CHECK_DEFINE_FILES( symbol, header_file [header_file ...] )
-dnl
-AC_DEFUN(APR_CHECK_DEFINE_FILES,[
-  AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[
-    ac_cv_define_$1=no
-    for curhdr in $2
-    do
-      AC_EGREP_CPP(YES_IS_DEFINED, [
-#include <$curhdr>
-#ifdef $1
-YES_IS_DEFINED
-#endif
-      ], ac_cv_define_$1=yes)
-    done
-  ])
-  if test "$ac_cv_define_$1" = "yes"; then
-    AC_DEFINE(HAVE_$1, 1, [Define if $1 is defined])
-  fi
-])
-
-
-dnl
-dnl APR_CHECK_DEFINE(symbol, header_file)
-dnl
-AC_DEFUN(APR_CHECK_DEFINE,[
-  AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[
-    AC_EGREP_CPP(YES_IS_DEFINED, [
-#include <$2>
-#ifdef $1
-YES_IS_DEFINED
-#endif
-    ], ac_cv_define_$1=yes, ac_cv_define_$1=no)
-  ])
-  if test "$ac_cv_define_$1" = "yes"; then
-    AC_DEFINE(HAVE_$1, 1, [Define if $1 is defined in $2])
-  fi
-])
-
-dnl
-dnl APR_CHECK_APR_DEFINE( symbol )
-dnl
-AC_DEFUN(APR_CHECK_APR_DEFINE,[
-apr_old_cppflags=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $INCLUDES"
-AC_EGREP_CPP(YES_IS_DEFINED, [
-#include <apr.h>
-#if $1
-YES_IS_DEFINED
-#endif
-], ac_cv_define_$1=yes, ac_cv_define_$1=no)
-CPPFLAGS=$apr_old_cppflags
-])
-
-dnl APR_CHECK_FILE(filename); set ac_cv_file_filename to
-dnl "yes" if 'filename' is readable, else "no".
-dnl @deprecated! - use AC_CHECK_FILE instead
-AC_DEFUN([APR_CHECK_FILE], [
-dnl Pick a safe variable name
-define([apr_cvname], ac_cv_file_[]translit([$1], [./+-], [__p_]))
-AC_CACHE_CHECK([for $1], [apr_cvname],
-[if test -r $1; then
-   apr_cvname=yes
- else
-   apr_cvname=no
- fi])
-])
-
-define(APR_IFALLYES,[dnl
-ac_rc=yes
-for ac_spec in $1; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        struct ) ac_var="ac_cv_struct_$ac_item" ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-    $2
-else
-    :
-    $3
-fi
-])
-
-
-define(APR_BEGIN_DECISION,[dnl
-ac_decision_item='$1'
-ac_decision_msg='FAILED'
-ac_decision=''
-])
-
-
-define(APR_DECIDE,[dnl
-ac_decision='$1'
-ac_decision_msg='$2'
-ac_decision_$1=yes
-ac_decision_$1_msg='$2'
-])
-
-
-define(APR_DECISION_OVERRIDE,[dnl
-    ac_decision=''
-    for ac_item in $1; do
-         eval "ac_decision_this=\$ac_decision_${ac_item}"
-         if test ".$ac_decision_this" = .yes; then
-             ac_decision=$ac_item
-             eval "ac_decision_msg=\$ac_decision_${ac_item}_msg"
-         fi
-    done
-])
-
-
-define(APR_DECISION_FORCE,[dnl
-ac_decision="$1"
-eval "ac_decision_msg=\"\$ac_decision_${ac_decision}_msg\""
-])
-
-
-define(APR_END_DECISION,[dnl
-if test ".$ac_decision" = .; then
-    echo "[$]0:Error: decision on $ac_decision_item failed" 1>&2
-    exit 1
-else
-    if test ".$ac_decision_msg" = .; then
-        ac_decision_msg="$ac_decision"
-    fi
-    AC_DEFINE_UNQUOTED(${ac_decision_item})
-    AC_MSG_RESULT([decision on $ac_decision_item... $ac_decision_msg])
-fi
-])
-
-
-dnl
-dnl APR_CHECK_SIZEOF_EXTENDED(INCLUDES, TYPE [, CROSS_SIZE])
-dnl
-dnl A variant of AC_CHECK_SIZEOF which allows the checking of
-dnl sizes of non-builtin types
-dnl
-AC_DEFUN(APR_CHECK_SIZEOF_EXTENDED,
-[changequote(<<,>>)dnl
-dnl The name to #define
-define(<<AC_TYPE_NAME>>, translit(sizeof_$2, [a-z *], [A-Z_P]))dnl
-dnl The cache variable
-define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$2, [ *],[<p>]))dnl
-changequote([, ])dnl
-AC_MSG_CHECKING(size of $2)
-AC_CACHE_VAL(AC_CV_NAME,
-[AC_TRY_RUN([#include <stdio.h>
-$1
-main()
-{
-  FILE *f=fopen("conftestval","w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof($2));
-  exit(0);
-}], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$3],,,
-AC_CV_NAME=$3))])dnl
-AC_MSG_RESULT($AC_CV_NAME)
-AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The size of ]$2)
-undefine([AC_TYPE_NAME])dnl
-undefine([AC_CV_NAME])dnl
-])
-
-
-dnl
-dnl APR_TRY_COMPILE_NO_WARNING(INCLUDES, FUNCTION-BODY,
-dnl             [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl
-dnl Tries a compile test with warnings activated so that the result
-dnl is false if the code doesn't compile cleanly.
-dnl
-AC_DEFUN(APR_TRY_COMPILE_NO_WARNING,
-[if test "x$CFLAGS_WARN" = "x"; then
-  apr_tcnw_flags=""
-else
-  apr_tcnw_flags=$CFLAGS_WARN
-fi
-if test "$ac_cv_prog_gcc" = "yes"; then 
-  apr_tcnw_flags="$apr_tcnw_flags -Werror"
-fi
-changequote(', ')
-cat > conftest.$ac_ext <<EOTEST
-#include "confdefs.h"
-'$1'
-int main(int argc, const char * const *argv) {
-'$2'
-; return 0; }
-EOTEST
-changequote([, ])
-if ${CC-cc} -c $CFLAGS $CPPFLAGS $apr_tcnw_flags conftest.$ac_ext 2>&AC_FD_CC ; then
-  ifelse([$3], , :, [rm -rf conftest*
-  $3])
-else
-  echo "configure: failed or warning program:" >&AC_FD_CC
-  cat conftest.$ac_ext >&AC_FD_CC
-  ifelse([$4], , , [rm -rf conftest*
-  $4])
-fi
-rm -f conftest*
-])dnl
-
-dnl
-dnl APR_CHECK_STRERROR_R_RC
-dnl
-dnl  Decide which style of retcode is used by this system's 
-dnl  strerror_r().  It either returns int (0 for success, -1
-dnl  for failure), or it returns a pointer to the error 
-dnl  string.
-dnl
-dnl
-AC_DEFUN(APR_CHECK_STRERROR_R_RC,[
-AC_MSG_CHECKING(for type of return code from strerror_r)
-AC_TRY_RUN([
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-main()
-{
-  char buf[1024];
-  if (strerror_r(ERANGE, buf, sizeof buf) < 1) {
-    exit(0);
-  }
-  else {
-    exit(1);
-  }
-}], [
-    ac_cv_strerror_r_rc_int=yes ], [
-    ac_cv_strerror_r_rc_int=no ], [
-    ac_cv_strerror_r_rc_int=no ] )
-if test "x$ac_cv_strerror_r_rc_int" = xyes; then
-  AC_DEFINE(STRERROR_R_RC_INT, 1, [Define if strerror returns int])
-  msg="int"
-else
-  msg="pointer"
-fi
-AC_MSG_RESULT([$msg])
-] )
-dnl
-dnl APR_CHECK_CRYPT_R_STYLE
-dnl
-dnl  Decide which of a couple of flavors of crypt_r() is necessary for
-dnl  this platform.
-dnl
-AC_DEFUN(APR_CHECK_CRYPT_R_STYLE,[
-AC_CACHE_CHECK(style of crypt_r, ac_cv_crypt_r_style,[
-dnl
-ac_cv_crypt_r_style=none
-dnl
-AC_TRY_COMPILE([
-#include <crypt.h>
-],[
-CRYPTD buffer;
-crypt_r("passwd", "hash", &buffer);
-], ac_cv_crypt_r_style=cryptd)
-dnl
-if test "$ac_cv_crypt_r_style" = "none"; then
-AC_TRY_COMPILE([
-#include <crypt.h>
-],[
-struct crypt_data buffer;
-crypt_r("passwd", "hash", &buffer);
-], ac_cv_crypt_r_style=struct_crypt_data)
-fi
-dnl
-])
-if test "$ac_cv_crypt_r_style" = "cryptd"; then
-    AC_DEFINE(CRYPT_R_CRYPTD, 1, [Define if crypt_r has uses CRYPTD])
-fi
-# if we don't combine these conditions, CRYPT_R_STRUCT_CRYPT_DATA
-# will end up defined twice
-if test "$ac_cv_crypt_r_style" = "struct_crypt_data"; then
-    AC_DEFINE(CRYPT_R_STRUCT_CRYPT_DATA, 1, [Define if crypt_r uses struct crypt_data])
-fi
-])
-
-dnl
-dnl APR_CHECK_DIRENT_INODE
-dnl
-dnl  Decide if d_fileno or d_ino are available in the dirent
-dnl  structure on this platform.  Single UNIX Spec says d_ino,
-dnl  BSD uses d_fileno.  Undef to find the real beast.
-dnl
-AC_DEFUN(APR_CHECK_DIRENT_INODE, [
-AC_CACHE_CHECK([for inode member of struct dirent], apr_cv_dirent_inode, [
-apr_cv_dirent_inode=no
-AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <dirent.h>
-],[
-#ifdef d_ino
-#undef d_ino
-#endif
-struct dirent de; de.d_fileno;
-], apr_cv_dirent_inode=d_fileno)
-if test "$apr_cv_dirent_inode" = "no"; then
-AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <dirent.h>
-],[
-#ifdef d_fileno
-#undef d_fileno
-#endif
-struct dirent de; de.d_ino;
-], apr_cv_dirent_inode=d_ino)
-fi
-])
-if test "$apr_cv_dirent_inode" != "no"; then
-  AC_DEFINE_UNQUOTED(DIRENT_INODE, $apr_cv_dirent_inode)
-fi
-])
-
-dnl
-dnl APR_CHECK_DIRENT_TYPE
-dnl
-dnl  Decide if d_type is available in the dirent structure 
-dnl  on this platform.  Not part of the Single UNIX Spec.
-dnl  Note that this is worthless without DT_xxx macros, so
-dnl  look for one while we are at it.
-dnl
-AC_DEFUN(APR_CHECK_DIRENT_TYPE,[
-AC_CACHE_CHECK([for file type member of struct dirent], apr_cv_dirent_type,[
-apr_cv_dirent_type=no
-AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <dirent.h>
-],[
-struct dirent de; de.d_type = DT_REG;
-], apr_cv_dirent_type=d_type)
-])
-if test "$apr_cv_dirent_type" != "no"; then
-  AC_DEFINE_UNQUOTED(DIRENT_TYPE, $apr_cv_dirent_type) 
-fi
-])
-
-dnl the following is a newline, a space, a tab, and a backslash (the
-dnl backslash is used by the shell to skip newlines, but m4 sees it;
-dnl treat it like whitespace).
-dnl WARNING: don't reindent these lines, or the space/tab will be lost!
-define([apr_whitespace],[
- 	\])
-
-dnl
-dnl APR_COMMA_ARGS(ARG1 ...)
-dnl  convert the whitespace-separated arguments into comman-separated
-dnl  arguments.
-dnl
-dnl APR_FOREACH(CODE-BLOCK, ARG1, ARG2, ...)
-dnl  subsitute CODE-BLOCK for each ARG[i]. "eachval" will be set to ARG[i]
-dnl  within each iteration.
-dnl
-changequote({,})
-define({APR_COMMA_ARGS},{patsubst([$}{1],[[}apr_whitespace{]+],[,])})
-define({APR_FOREACH},
-  {ifelse($}{2,,,
-          [define([eachval],
-                  $}{2)$}{1[]APR_FOREACH([$}{1],
-                                         builtin([shift],
-                                                 builtin([shift], $}{@)))])})
-changequote([,])
-
-dnl APR_FLAG_HEADERS(HEADER-FILE ... [, FLAG-TO-SET ] [, "yes" ])
-dnl  we set FLAG-TO-SET to 1 if we find HEADER-FILE, otherwise we set to 0
-dnl  if FLAG-TO-SET is null, we automagically determine it's name
-dnl  by changing all "/" to "_" in the HEADER-FILE and dropping
-dnl  all "." and "-" chars. If the 3rd parameter is "yes" then instead of
-dnl  setting to 1 or 0, we set FLAG-TO-SET to yes or no.
-dnl  
-AC_DEFUN(APR_FLAG_HEADERS,[
-AC_CHECK_HEADERS($1)
-for aprt_i in $1
-do
-    ac_safe=`echo "$aprt_i" | sed 'y%./+-%__p_%'`
-    aprt_2=`echo "$aprt_i" | sed -e 's%/%_%g' -e 's/\.//g' -e 's/-//g'`
-    if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-       eval "ifelse($2,,$aprt_2,$2)=ifelse($3,yes,yes,1)"
-    else
-       eval "ifelse($2,,$aprt_2,$2)=ifelse($3,yes,no,0)"
-    fi
-done
-])
-
-dnl APR_FLAG_FUNCS(FUNC ... [, FLAG-TO-SET] [, "yes" ])
-dnl  if FLAG-TO-SET is null, we automagically determine it's name
-dnl  prepending "have_" to the function name in FUNC, otherwise
-dnl  we use what's provided as FLAG-TO-SET. If the 3rd parameter
-dnl  is "yes" then instead of setting to 1 or 0, we set FLAG-TO-SET
-dnl  to yes or no.
-dnl
-AC_DEFUN(APR_FLAG_FUNCS,[
-AC_CHECK_FUNCS($1)
-for aprt_j in $1
-do
-    aprt_3="have_$aprt_j"
-    if eval "test \"`echo '$ac_cv_func_'$aprt_j`\" = yes"; then
-       eval "ifelse($2,,$aprt_3,$2)=ifelse($3,yes,yes,1)"
-    else
-       eval "ifelse($2,,$aprt_3,$2)=ifelse($3,yes,no,0)"
-    fi
-done
-])
-
-dnl Iteratively interpolate the contents of the second argument
-dnl until interpolation offers no new result. Then assign the
-dnl final result to $1.
-dnl
-dnl Example:
-dnl
-dnl foo=1
-dnl bar='${foo}/2'
-dnl baz='${bar}/3'
-dnl APR_EXPAND_VAR(fraz, $baz)
-dnl   $fraz is now "1/2/3"
-dnl 
-AC_DEFUN(APR_EXPAND_VAR,[
-ap_last=
-ap_cur="$2"
-while test "x${ap_cur}" != "x${ap_last}";
-do
-  ap_last="${ap_cur}"
-  ap_cur=`eval "echo ${ap_cur}"`
-done
-$1="${ap_cur}"
-])
-
-dnl
-dnl Removes the value of $3 from the string in $2, strips of any leading
-dnl slashes, and returns the value in $1.
-dnl
-dnl Example:
-dnl orig_path="${prefix}/bar"
-dnl APR_PATH_RELATIVE(final_path, $orig_path, $prefix)
-dnl    $final_path now contains "bar"
-AC_DEFUN(APR_PATH_RELATIVE,[
-ap_stripped=`echo $2 | sed -e "s#^$3##"`
-# check if the stripping was successful
-if test "x$2" != "x${ap_stripped}"; then
-    # it was, so strip of any leading slashes
-    $1="`echo ${ap_stripped} | sed -e 's#^/*##'`"
-else
-    # it wasn't so return the original
-    $1="$2"
-fi
-])
-
-dnl APR_HELP_STRING(LHS, RHS)
-dnl Autoconf 2.50 can not handle substr correctly.  It does have 
-dnl AC_HELP_STRING, so let's try to call it if we can.
-dnl Note: this define must be on one line so that it can be properly returned
-dnl as the help string.  When using this macro with a multi-line RHS, ensure
-dnl that you surround the macro invocation with []s
-AC_DEFUN(APR_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[  ][$1] substr([                       ],len($1))[$2])])
-
-dnl
-dnl APR_LAYOUT(configlayout, layoutname [, extravars])
-dnl
-AC_DEFUN(APR_LAYOUT,[
-  if test ! -f $srcdir/config.layout; then
-    echo "** Error: Layout file $srcdir/config.layout not found"
-    echo "** Error: Cannot use undefined layout '$LAYOUT'"
-    exit 1
-  fi
-  pldconf=./config.pld
-  changequote({,})
-  sed -e "1s/[ 	]*<[lL]ayout[ 	]*$2[ 	]*>[ 	]*//;1t" \
-      -e "1,/[ 	]*<[lL]ayout[ 	]*$2[ 	]*>[ 	]*/d" \
-      -e '/[ 	]*<\/Layout>[ 	]*/,$d' \
-      -e "s/^[ 	]*//g" \
-      -e "s/:[ 	]*/=\'/g" \
-      -e "s/[ 	]*$/'/g" \
-      $1 > $pldconf
-  layout_name=$2
-  if test ! -s $pldconf; then
-    echo "** Error: unable to find layout $layout_name"
-    exit 1
-  fi
-  . $pldconf
-  rm $pldconf
-  for var in prefix exec_prefix bindir sbindir libexecdir mandir \
-             sysconfdir datadir includedir localstatedir runtimedir \
-             logfiledir libdir installbuilddir libsuffix $3; do
-    eval "val=\"\$$var\""
-    case $val in
-      *+)
-        val=`echo $val | sed -e 's;\+$;;'`
-        eval "$var=\"\$val\""
-        autosuffix=yes
-        ;;
-      *)
-        autosuffix=no
-        ;;
-    esac
-    val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
-    val=`echo $val | sed -e 's:[\$]\([a-z_]*\):${\1}:g'`
-    if test "$autosuffix" = "yes"; then
-      if echo $val | grep apache >/dev/null; then
-        addtarget=no
-      else
-        addtarget=yes
-      fi
-      if test "$addtarget" = "yes"; then
-        val="$val/apache2"
-      fi
-    fi
-    eval "$var='$val'"
-  done
-  changequote([,])
-])dnl
-
-dnl
-dnl APR_ENABLE_LAYOUT(default layout name [, extra vars])
-dnl
-AC_DEFUN(APR_ENABLE_LAYOUT,[
-AC_ARG_ENABLE(layout,
-[  --enable-layout=LAYOUT],[
-  LAYOUT=$enableval
-])
-
-if test -z "$LAYOUT"; then
-  LAYOUT="$1"
-fi
-APR_LAYOUT($srcdir/config.layout, $LAYOUT, $2)
-
-AC_MSG_CHECKING(for chosen layout)
-AC_MSG_RESULT($layout_name)
-])
-
-
-dnl
-dnl APR_PARSE_ARGUMENTS
-dnl a reimplementation of autoconf's argument parser,
-dnl used here to allow us to co-exist layouts and argument based
-dnl set ups.
-AC_DEFUN(APR_PARSE_ARGUMENTS,[
-ac_prev=
-# Retrieve the command-line arguments.  The eval is needed because
-# the arguments are quoted to preserve accuracy.
-eval "set x $ac_configure_args"
-shift
-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
-
-  ac_optarg=`expr "x$ac_option" : 'x[[^=]]*=\(.*\)'`
-
-  case $ac_option in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$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" ;;
-
-  -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" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -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" ;;
-
-  -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" ;;
-
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [[\\/$]]* | ?:[[\\/]]* | NONE | '' ) ;;
-    *)  AC_MSG_ERROR([expected an absolute path for --$ac_var: $ac_val]);;
-  esac
-done
-
-])dnl
-
-dnl
-dnl APR_CHECK_DEPEND
-dnl
-dnl Determine what program we can use to generate .deps-style dependencies
-dnl
-AC_DEFUN(APR_CHECK_DEPEND,[
-dnl Try to determine what depend program we can use
-dnl All GCC-variants should have -MM.
-dnl If not, then we can check on those, too.
-if test "$GCC" = "yes"; then
-  MKDEP='$(CC) -MM'
-else
-  rm -f conftest.c
-dnl <sys/types.h> should be available everywhere!
-  cat > conftest.c <<EOF
-#include <sys/types.h>
-  int main() { return 0; }
-EOF
-  MKDEP="true"
-  for i in "$CC -MM" "$CC -M" "$CPP -MM" "$CPP -M" "cpp -M"; do
-    AC_MSG_CHECKING([if $i can create proper make dependencies])
-    if $i conftest.c 2>/dev/null | grep 'conftest.o: conftest.c' >/dev/null; then
-      MKDEP=$i
-      AC_MSG_RESULT(yes)
-      break;
-    fi
-    AC_MSG_RESULT(no)
-  done
-  rm -f conftest.c
-fi
-
-AC_SUBST(MKDEP)
-])
-
-dnl
-dnl APR_CHECK_TYPES_COMPATIBLE(TYPE-1, TYPE-2, [ACTION-IF-TRUE])
-dnl
-dnl Try to determine whether two types are the same. Only works
-dnl for gcc and icc.
-dnl
-AC_DEFUN([APR_CHECK_TYPES_COMPATIBLE], [
-define([apr_cvname], apr_cv_typematch_[]translit([$1], [ ], [_])_[]translit([$2], [ ], [_]))
-AC_CACHE_CHECK([whether $1 and $2 are the same], apr_cvname, [
-AC_TRY_COMPILE(AC_INCLUDES_DEFAULT, [
-    int foo[0 - !__builtin_types_compatible_p($1, $2)];
-], [apr_cvname=yes $3], [apr_cvname=no])])
-])
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_hints.m4 b/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_hints.m4
deleted file mode 100644
index a36be247..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_hints.m4
+++ /dev/null
@@ -1,439 +0,0 @@
-dnl -----------------------------------------------------------------
-dnl apr_hints.m4: APR's autoconf macros for platform-specific hints
-dnl
-dnl  We preload various configure settings depending
-dnl  on previously obtained platform knowledge.
-dnl  We allow all settings to be overridden from
-dnl  the command-line.
-dnl
-dnl  We maintain the "format" that we've used
-dnl  under 1.3.x, so we don't exactly follow
-dnl  what is "recommended" by autoconf.
-
-dnl
-dnl APR_PRELOAD
-dnl
-dnl  Preload various ENV/makefile params such as CC, CFLAGS, etc
-dnl  based on outside knowledge
-dnl
-dnl  Generally, we force the setting of CC, and add flags
-dnl  to CFLAGS, CPPFLAGS, LIBS and LDFLAGS. 
-dnl
-AC_DEFUN(APR_PRELOAD, [
-if test "x$apr_preload_done" != "xyes" ; then
-
-  apr_preload_done="yes"
-
-  echo "Applying APR hints file rules for $host"
-
-  case "$host" in
-    *mint)
-	APR_ADDTO(CPPFLAGS, [-DMINT])
-	APR_ADDTO(LIBS, [-lportlib])
-	;;
-    *MPE/iX*)
-	APR_ADDTO(CPPFLAGS, [-DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE])
-	APR_ADDTO(LIBS, [-lsvipc -lcurses])
-	APR_ADDTO(LDFLAGS, [-Xlinker \"-WL,cap=ia,ba,ph;nmstack=1024000\"])
-	;;
-    *-apple-aux3*)
-	APR_ADDTO(CPPFLAGS, [-DAUX3 -D_POSIX_SOURCE])
-	APR_ADDTO(LIBS, [-lposix -lbsd])
-	APR_ADDTO(LDFLAGS, [-s])
-	APR_SETVAR(SHELL, [/bin/ksh])
-	;;
-    *-ibm-aix*)
-	APR_ADDTO(CPPFLAGS, [-U__STR__ -D_THREAD_SAFE])
-        dnl _USR_IRS gets us the hstrerror() proto in netdb.h
-        case $host in
-            *-ibm-aix4.3)
-	        APR_ADDTO(CPPFLAGS, [-D_USE_IRS])
-	        ;;
-            *-ibm-aix5*)
-	        APR_ADDTO(CPPFLAGS, [-D_USE_IRS])
-	        ;;
-            *-ibm-aix4.3.*)
-                APR_ADDTO(CPPFLAGS, [-D_USE_IRS])
-                ;;
-        esac
-        dnl If using xlc, remember it, and give it the right options.
-        if $CC 2>&1 | grep 'xlc' > /dev/null; then
-          APR_SETIFNULL(AIX_XLC, [yes])
-          APR_ADDTO(CFLAGS, [-qHALT=E])
-        fi
-	APR_SETIFNULL(apr_sysvsem_is_global, [yes])
-	APR_SETIFNULL(apr_lock_method, [USE_SYSVSEM_SERIALIZE])
-        case $host in
-            *-ibm-aix3* | *-ibm-aix4.1.*)
-                ;;
-            *)
-                APR_ADDTO(LDFLAGS, [-Wl,-brtl])
-                ;;
-	esac
-        ;;
-    *-apollo-*)
-	APR_ADDTO(CPPFLAGS, [-DAPOLLO])
-	;;
-    *-dg-dgux*)
-	APR_ADDTO(CPPFLAGS, [-DDGUX])
-	;;
-    *os2_emx*)
-	APR_SETVAR(SHELL, [sh])
-	APR_SETIFNULL(apr_gethostbyname_is_thread_safe, [yes])
-	APR_SETIFNULL(apr_gethostbyaddr_is_thread_safe, [yes])
-	;;
-    *-hi-hiux)
-	APR_ADDTO(CPPFLAGS, [-DHIUX])
-	;;
-    *-hp-hpux11.*)
-	APR_ADDTO(CPPFLAGS, [-DHPUX11 -D_REENTRANT -D_XOPEN_SOURCE_EXTENDED])
-	;;
-    *-hp-hpux10.*)
- 	case $host in
- 	  *-hp-hpux10.01)
-dnl	       # We know this is a problem in 10.01.
-dnl	       # Not a problem in 10.20.  Otherwise, who knows?
-	       APR_ADDTO(CPPFLAGS, [-DSELECT_NEEDS_CAST])
-	       ;;	     
- 	esac
-	APR_ADDTO(CPPFLAGS, [-D_REENTRANT])
-	;;
-    *-hp-hpux*)
-	APR_ADDTO(CPPFLAGS, [-DHPUX -D_REENTRANT])
-	;;
-    *-linux*)
-        case `uname -r` in
-	    2.* )  APR_ADDTO(CPPFLAGS, [-DLINUX=2])
-	           ;;
-	    1.* )  APR_ADDTO(CPPFLAGS, [-DLINUX=1])
-	           ;;
-	    * )
-	           ;;
-        esac
-	APR_ADDTO(CPPFLAGS, [-D_REENTRANT -D_GNU_SOURCE])
-	;;
-    *-GNU*)
-	APR_ADDTO(CPPFLAGS, [-DHURD -D_GNU_SOURCE])
-	;;
-    *-lynx-lynxos)
-	APR_ADDTO(CPPFLAGS, [-D__NO_INCLUDE_WARN__ -DLYNXOS])
-	APR_ADDTO(LIBS, [-lbsd])
-	;;
-    *486-*-bsdi*)
-	APR_ADDTO(CFLAGS, [-m486])
-	;;
-    *-*-bsdi*)
-        case $host in
-            *bsdi4.1)
-                APR_ADDTO(CFLAGS, [-D_REENTRANT])
-                ;;
-        esac
-        ;;
-    *-openbsd*)
-	APR_ADDTO(CPPFLAGS, [-D_POSIX_THREADS])
-        # getsockname() reports the wrong address on a socket
-        # bound to an ephmeral port so the test fails.
-        APR_SETIFNULL(ac_cv_o_nonblock_inherited, [yes])
-	;;
-    *-netbsd*)
-	APR_ADDTO(CPPFLAGS, [-DNETBSD])
-        # fcntl() lies about O_NONBLOCK on an accept()ed socket (PR kern/26950)
-        APR_SETIFNULL(ac_cv_o_nonblock_inherited, [yes])
-	;;
-    *-freebsd*)
-	case $host in
-	    *freebsd[2345]*)
-		APR_ADDTO(CFLAGS, [-funsigned-char])
-		;;
-	esac
-	APR_SETIFNULL(enable_threads, [no])
-        APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE])
-	APR_ADDTO(CPPFLAGS, [-D_REENTRANT -D_THREAD_SAFE])
-	;;
-    *-next-nextstep*)
-	APR_SETIFNULL(CFLAGS, [-O])
-	APR_ADDTO(CPPFLAGS, [-DNEXT])
-	;;
-    *-next-openstep*)
-	APR_SETIFNULL(CFLAGS, [-O])
-	APR_ADDTO(CPPFLAGS, [-DNEXT])
-	;;
-    *-apple-rhapsody*)
-	APR_ADDTO(CPPFLAGS, [-DRHAPSODY])
-	;;
-    *-apple-darwin*)
-	APR_ADDTO(CPPFLAGS, [-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp])
-	APR_SETIFNULL(apr_posixsem_is_global, [yes])
-        APR_SETIFNULL(ac_cv_func_poll, [no]) # See issue 34332
-	;;
-    *-dec-osf*)
-	APR_ADDTO(CPPFLAGS, [-DOSF1])
-        # process-shared mutexes don't seem to work in Tru64 5.0
-        APR_SETIFNULL(apr_cv_process_shared_works, [no])
-	;;
-    *-nto-qnx*)
-	;;
-    *-qnx)
-	APR_ADDTO(CPPFLAGS, [-DQNX])
-	APR_ADDTO(LIBS, [-N128k -lunix])
-	;;
-    *-qnx32)
-	APR_ADDTO(CPPFLAGS, [-DQNX])
-	APR_ADDTO(CFLAGS, [-mf -3])
-	APR_ADDTO(LIBS, [-N128k -lunix])
-	;;
-    *-isc4*)
-	APR_ADDTO(CPPFLAGS, [-posix -DISC])
-	APR_ADDTO(LDFLAGS, [-posix])
-	APR_ADDTO(LIBS, [-linet])
-	;;
-    *-sco3.2v[[234]]*)
-	APR_ADDTO(CPPFLAGS, [-DSCO -D_REENTRANT])
-	if test "$GCC" = "no"; then
-	    APR_ADDTO(CFLAGS, [-Oacgiltz])
-	fi
-	APR_ADDTO(LIBS, [-lPW -lmalloc])
-	;;
-    *-sco3.2v5*)
-	APR_ADDTO(CPPFLAGS, [-DSCO5 -D_REENTRANT])
-	;;
-    *-sco_sv*|*-SCO_SV*)
-	APR_ADDTO(CPPFLAGS, [-DSCO -D_REENTRANT])
-	APR_ADDTO(LIBS, [-lPW -lmalloc])
-	;;
-    *-solaris2*)
-    	PLATOSVERS=`echo $host | sed 's/^.*solaris2.//'`
-	APR_ADDTO(CPPFLAGS, [-DSOLARIS2=$PLATOSVERS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT])
-        APR_SETIFNULL(apr_lock_method, [USE_FCNTL_SERIALIZE])
-	;;
-    *-sunos4*)
-	APR_ADDTO(CPPFLAGS, [-DSUNOS4])
-	;;
-    *-unixware1)
-	APR_ADDTO(CPPFLAGS, [-DUW=100])
-	;;
-    *-unixware2)
-	APR_ADDTO(CPPFLAGS, [-DUW=200])
-	APR_ADDTO(LIBS, [-lgen])
-	;;
-    *-unixware211)
-	APR_ADDTO(CPPFLAGS, [-DUW=211])
-	APR_ADDTO(LIBS, [-lgen])
-	;;
-    *-unixware212)
-	APR_ADDTO(CPPFLAGS, [-DUW=212])
-	APR_ADDTO(LIBS, [-lgen])
-	;;
-    *-unixware7)
-	APR_ADDTO(CPPFLAGS, [-DUW=700])
-	APR_ADDTO(LIBS, [-lgen])
-	;;
-    maxion-*-sysv4*)
-	APR_ADDTO(CPPFLAGS, [-DSVR4])
-	APR_ADDTO(LIBS, [-lc -lgen])
-	;;
-    *-*-powermax*)
-	APR_ADDTO(CPPFLAGS, [-DSVR4])
-	APR_ADDTO(LIBS, [-lgen])
-	;;
-    TPF)
-       APR_ADDTO(CPPFLAGS, [-DTPF -D_POSIX_SOURCE])
-       ;;
-    bs2000*-siemens-sysv*)
-	APR_SETIFNULL(CFLAGS, [-O])
-	APR_ADDTO(CPPFLAGS, [-DSVR4 -D_XPG_IV -D_KMEMUSER])
-	APR_ADDTO(LIBS, [-lsocket])
-	APR_SETIFNULL(enable_threads, [no])
-	;;
-    *-siemens-sysv4*)
-	APR_ADDTO(CPPFLAGS, [-DSVR4 -D_XPG_IV -DHAS_DLFCN -DUSE_MMAP_FILES -DUSE_SYSVSEM_SERIALIZED_ACCEPT])
-	APR_ADDTO(LIBS, [-lc])
-	;;
-    pyramid-pyramid-svr4)
-	APR_ADDTO(CPPFLAGS, [-DSVR4 -DNO_LONG_DOUBLE])
-	APR_ADDTO(LIBS, [-lc])
-	;;
-    DS/90\ 7000-*-sysv4*)
-	APR_ADDTO(CPPFLAGS, [-DUXPDS])
-	;;
-    *-tandem-sysv4*)
-	APR_ADDTO(CPPFLAGS, [-DSVR4])
-	;;
-    *-ncr-sysv4)
-	APR_ADDTO(CPPFLAGS, [-DSVR4 -DMPRAS])
-	APR_ADDTO(LIBS, [-lc -L/usr/ucblib -lucb])
-	;;
-    *-sysv4*)
-	APR_ADDTO(CPPFLAGS, [-DSVR4])
-	APR_ADDTO(LIBS, [-lc])
-	;;
-    88k-encore-sysv4)
-	APR_ADDTO(CPPFLAGS, [-DSVR4 -DENCORE])
-	APR_ADDTO(LIBS, [-lPW])
-	;;
-    *-uts*)
-	PLATOSVERS=`echo $host | sed 's/^.*,//'`
-	case $PLATOSVERS in
-	    2*) APR_ADDTO(CPPFLAGS, [-DUTS21])
-	        APR_ADDTO(CFLAGS, [-Xa -eft])
-	        APR_ADDTO(LIBS, [-lbsd -la])
-	        ;;
-	    *)  APR_ADDTO(CPPFLAGS, [-DSVR4])
-	        APR_ADDTO(CFLAGS, [-Xa])
-	        ;;
-	esac
-	;;
-    *-ultrix)
-	APR_ADDTO(CPPFLAGS, [-DULTRIX])
-	APR_SETVAR(SHELL, [/bin/sh5])
-	;;
-    *powerpc-tenon-machten*)
-	APR_ADDTO(LDFLAGS, [-Xlstack=0x14000 -Xldelcsect])
-	;;
-    *-machten*)
-	APR_ADDTO(LDFLAGS, [-stack 0x14000])
-	;;
-    *convex-v11*)
-	APR_ADDTO(CPPFLAGS, [-DCONVEXOS11])
-	APR_SETIFNULL(CFLAGS, [-O1])
-	APR_ADDTO(CFLAGS, [-ext])
-	;;
-    i860-intel-osf1)
-	APR_ADDTO(CPPFLAGS, [-DPARAGON])
-	;;
-    *-sequent-ptx2.*.*)
-	APR_ADDTO(CPPFLAGS, [-DSEQUENT=20])
-	APR_ADDTO(CFLAGS, [-Wc,-pw])
-	APR_ADDTO(LIBS, [-linet -lc -lseq])
-	;;
-    *-sequent-ptx4.0.*)
-	APR_ADDTO(CPPFLAGS, [-DSEQUENT=40])
-	APR_ADDTO(CFLAGS, [-Wc,-pw])
-	APR_ADDTO(LIBS, [-linet -lc])
-	;;
-    *-sequent-ptx4.[[123]].*)
-	APR_ADDTO(CPPFLAGS, [-DSEQUENT=41])
-	APR_ADDTO(CFLAGS, [-Wc,-pw])
-	APR_ADDTO(LIBS, [-lc])
-	;;
-    *-sequent-ptx4.4.*)
-	APR_ADDTO(CPPFLAGS, [-DSEQUENT=44])
-	APR_ADDTO(CFLAGS, [-Wc,-pw])
-	APR_ADDTO(LIBS, [-lc])
-	;;
-    *-sequent-ptx4.5.*)
-	APR_ADDTO(CPPFLAGS, [-DSEQUENT=45])
-	APR_ADDTO(CFLAGS, [-Wc,-pw])
-	APR_ADDTO(LIBS, [-lc])
-	;;
-    *-sequent-ptx5.0.*)
-	APR_ADDTO(CPPFLAGS, [-DSEQUENT=50])
-	APR_ADDTO(CFLAGS, [-Wc,-pw])
-	APR_ADDTO(LIBS, [-lc])
-	;;
-    *NEWS-OS*)
-	APR_ADDTO(CPPFLAGS, [-DNEWSOS])
-	;;
-    *-riscix)
-	APR_ADDTO(CPPFLAGS, [-DRISCIX])
-	APR_SETIFNULL(CFLAGS, [-O])
-	;;
-    *-irix*)
-	APR_ADDTO(CPPFLAGS, [-D_POSIX_THREAD_SAFE_FUNCTIONS])
-	;;
-    *beos*)
-        APR_ADDTO(CPPFLAGS, [-DBEOS])
-        PLATOSVERS=`uname -r`
-        APR_SETIFNULL(apr_process_lock_is_global, [yes])
-        case $PLATOSVERS in
-            5.0.4)
-                APR_ADDTO(LDFLAGS, [-L/boot/beos/system/lib])
-                APR_ADDTO(LIBS, [-lbind -lsocket])
-                APR_ADDTO(CPPFLAGS,[-DBONE7])
-                ;;
-            5.1)
-                APR_ADDTO(LDFLAGS, [-L/boot/beos/system/lib])
-                APR_ADDTO(LIBS, [-lbind -lsocket])
-                ;;
-	esac
-	APR_ADDTO(CPPFLAGS, [-DSIGPROCMASK_SETS_THREAD_MASK -DAP_AUTH_DBM_USE_APR])
-        ;;
-    4850-*.*)
-	APR_ADDTO(CPPFLAGS, [-DSVR4 -DMPRAS])
-	APR_ADDTO(LIBS, [-lc -L/usr/ucblib -lucb])
-	;;
-    drs6000*)
-	APR_ADDTO(CPPFLAGS, [-DSVR4])
-	APR_ADDTO(LIBS, [-lc -L/usr/ucblib -lucb])
-	;;
-    m88k-*-CX/SX|CYBER)
-	APR_ADDTO(CPPFLAGS, [-D_CX_SX])
-	APR_ADDTO(CFLAGS, [-Xa])
-	;;
-    *-tandem-oss)
-	APR_ADDTO(CPPFLAGS, [-D_TANDEM_SOURCE -D_XOPEN_SOURCE_EXTENDED=1])
-	;;
-    *-ibm-os390)
-       APR_SETIFNULL(apr_lock_method, [USE_SYSVSEM_SERIALIZE])
-       APR_SETIFNULL(apr_sysvsem_is_global, [yes])
-       APR_SETIFNULL(apr_gethostbyname_is_thread_safe, [yes])
-       APR_SETIFNULL(apr_gethostbyaddr_is_thread_safe, [yes])
-       APR_ADDTO(CPPFLAGS, [-U_NO_PROTO -DPTHREAD_ATTR_SETDETACHSTATE_ARG2_ADDR -DPTHREAD_SETS_ERRNO -DPTHREAD_DETACH_ARG1_ADDR -DSIGPROCMASK_SETS_THREAD_MASK -DTCP_NODELAY=1])
-       ;;
-    *-ibm-as400)
-       APR_SETIFNULL(apr_lock_method, [USE_SYSVSEM_SERIALIZE])
-       APR_SETIFNULL(apr_process_lock_is_global, [yes])
-       APR_SETIFNULL(apr_gethostbyname_is_thread_safe, [yes])
-       APR_SETIFNULL(apr_gethostbyaddr_is_thread_safe, [yes])
-       ;;
-    *cygwin*)
-	APR_ADDTO(CPPFLAGS, [-DCYGWIN])
-	APR_ADDTO(LIBS, [-lcrypt])
-	;;
-  esac
-
-fi
-])
-
-dnl
-dnl APR_CC_HINTS
-dnl
-dnl  Allows us to provide a default choice of compiler which
-dnl  the user can override.
-AC_DEFUN(APR_CC_HINTS, [
-case "$host" in
-  *-apple-aux3*)
-      APR_SETIFNULL(CC, [gcc])
-      ;;
-  bs2000*-siemens-sysv*)
-      APR_SETIFNULL(CC, [c89 -XLLML -XLLMK -XL -Kno_integer_overflow])
-      ;;
-  *convex-v11*)
-      APR_SETIFNULL(CC, [cc])
-      ;;
-  *-ibm-os390)
-      APR_SETIFNULL(CC, [cc])
-      ;;
-  *-ibm-as400)
-      APR_SETIFNULL(CC, [icc])
-      ;;
-  *-isc4*)
-      APR_SETIFNULL(CC, [gcc])
-      ;;
-  m88k-*-CX/SX|CYBER)
-      APR_SETIFNULL(CC, [cc])
-      ;;
-  *-next-openstep*)
-      APR_SETIFNULL(CC, [cc])
-      ;;
-  *-qnx32)
-      APR_SETIFNULL(CC, [cc -F])
-      ;;
-  *-tandem-oss)
-      APR_SETIFNULL(CC, [c89])
-      ;;
-  TPF)
-      APR_SETIFNULL(CC, [c89])
-      ;;
-esac
-])
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_network.m4 b/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_network.m4
deleted file mode 100644
index 16eb92b8..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_network.m4
+++ /dev/null
@@ -1,724 +0,0 @@
-dnl -----------------------------------------------------------------
-dnl apr_network.m4: APR's autoconf macros for testing network support
-dnl
-
-dnl
-dnl check for working getaddrinfo()
-dnl
-dnl Note that if the system doesn't have gai_strerror(), we
-dnl can't use getaddrinfo() because we can't get strings
-dnl describing the error codes.
-dnl
-AC_DEFUN(APR_CHECK_WORKING_GETADDRINFO,[
-  AC_CACHE_CHECK(for working getaddrinfo, ac_cv_working_getaddrinfo,[
-  AC_TRY_RUN( [
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-void main(void) {
-    struct addrinfo hints, *ai;
-    int error;
-
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_socktype = SOCK_STREAM;
-    error = getaddrinfo("127.0.0.1", NULL, &hints, &ai);
-    if (error) {
-        exit(1);
-    }
-    if (ai->ai_addr->sa_family != AF_INET) {
-        exit(1);
-    }
-    exit(0);
-}
-],[
-  ac_cv_working_getaddrinfo="yes"
-],[
-  ac_cv_working_getaddrinfo="no"
-],[
-  ac_cv_working_getaddrinfo="yes"
-])])
-if test "$ac_cv_working_getaddrinfo" = "yes"; then
-  if test "$ac_cv_func_gai_strerror" != "yes"; then
-    ac_cv_working_getaddrinfo="no"
-  else
-    AC_DEFINE(HAVE_GETADDRINFO, 1, [Define if getaddrinfo exists and works well enough for APR])
-  fi
-fi
-])
-
-dnl
-dnl check for working getnameinfo()
-dnl
-AC_DEFUN(APR_CHECK_WORKING_GETNAMEINFO,[
-  AC_CACHE_CHECK(for working getnameinfo, ac_cv_working_getnameinfo,[
-  AC_TRY_RUN( [
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
-void main(void) {
-    struct sockaddr_in sa;
-    char hbuf[256];
-    int error;
-
-    sa.sin_family = AF_INET;
-    sa.sin_port = 0;
-    sa.sin_addr.s_addr = inet_addr("127.0.0.1");
-#ifdef SIN6_LEN
-    sa.sin_len = sizeof(sa);
-#endif
-
-    error = getnameinfo((const struct sockaddr *)&sa, sizeof(sa),
-                        hbuf, 256, NULL, 0,
-                        NI_NUMERICHOST);
-    if (error) {
-        exit(1);
-    } else {
-        exit(0);
-    }
-}
-],[
-  ac_cv_working_getnameinfo="yes"
-],[
-  ac_cv_working_getnameinfo="no"
-],[
-  ac_cv_working_getnameinfo="yes"
-])])
-if test "$ac_cv_working_getnameinfo" = "yes"; then
-  AC_DEFINE(HAVE_GETNAMEINFO, 1, [Define if getnameinfo exists])
-fi
-])
-
-dnl
-dnl check for negative error codes for getaddrinfo()
-dnl
-AC_DEFUN(APR_CHECK_NEGATIVE_EAI,[
-  AC_CACHE_CHECK(for negative error codes for getaddrinfo, ac_cv_negative_eai,[
-  AC_TRY_RUN( [
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-
-void main(void) {
-    if (EAI_ADDRFAMILY < 0) {
-        exit(0);
-    }
-    exit(1);
-}
-],[
-  ac_cv_negative_eai="yes"
-],[
-  ac_cv_negative_eai="no"
-],[
-  ac_cv_negative_eai="no"
-])])
-if test "$ac_cv_negative_eai" = "yes"; then
-  AC_DEFINE(NEGATIVE_EAI, 1, [Define if EAI_ error codes from getaddrinfo are negative])
-fi
-])
-
-dnl
-dnl check for presence of  retrans/retry variables in the res_state structure
-dnl
-AC_DEFUN(APR_CHECK_RESOLV_RETRANS,[
-  AC_CACHE_CHECK(for presence of retrans/retry fields in res_state/resolv.h , ac_cv_retransretry,[
-  AC_TRY_RUN( [
-#include <sys/types.h>
-#if defined(__sun__)
-#include <inet/ip.h>
-#endif
-#include <resolv.h>
-/* _res is a global defined in resolv.h */
-int main(void) {
-    _res.retrans = 2;
-    _res.retry = 1;
-    exit(0);
-    return 0;
-}
-],[
-  ac_cv_retransretry="yes"
-],[
-  ac_cv_retransretry="no"
-],[
-  ac_cv_retransretry="no"
-])])
-if test "$ac_cv_retransretry" = "yes"; then
-  AC_DEFINE(RESOLV_RETRANSRETRY, 1, [Define if resolv.h's res_state has the fields retrans/rety])
-fi
-])
-
-dnl
-dnl Checks the definition of gethostbyname_r and gethostbyaddr_r
-dnl which are different for glibc, solaris and assorted other operating
-dnl systems
-dnl
-dnl Note that this test is executed too early to see if we have all of
-dnl the headers.
-AC_DEFUN(APR_CHECK_GETHOSTBYNAME_R_STYLE,[
-
-dnl Try and compile a glibc2 gethostbyname_r piece of code, and set the
-dnl style of the routines to glibc2 on success
-AC_CACHE_CHECK([style of gethostbyname_r routine], ac_cv_gethostbyname_r_style,
-APR_TRY_COMPILE_NO_WARNING([
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-],[
-int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0, 
-                          (char *) 0, 0, (struct hostent **) 0, &tmp);
-], ac_cv_gethostbyname_r_style=glibc2, ac_cv_gethostbyname_r_style=none))
-
-if test "$ac_cv_gethostbyname_r_style" = "glibc2"; then
-    AC_DEFINE(GETHOSTBYNAME_R_GLIBC2, 1, [Define if gethostbyname_r has the glibc style])
-fi
-
-AC_CACHE_CHECK([3rd argument to the gethostbyname_r routines], ac_cv_gethostbyname_r_arg,
-APR_TRY_COMPILE_NO_WARNING([
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-],[
-int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0, 
-                          (struct hostent_data *) 0);],
-ac_cv_gethostbyname_r_arg=hostent_data, ac_cv_gethostbyname_r_arg=char))
-
-if test "$ac_cv_gethostbyname_r_arg" = "hostent_data"; then
-    AC_DEFINE(GETHOSTBYNAME_R_HOSTENT_DATA, 1, [Define if gethostbyname_r has the hostent_data for the third argument])
-fi
-])
-
-dnl
-dnl see if TCP_NODELAY setting is inherited from listening sockets
-dnl
-AC_DEFUN(APR_CHECK_TCP_NODELAY_INHERITED,[
-  AC_CACHE_CHECK(if TCP_NODELAY setting is inherited from listening sockets, ac_cv_tcp_nodelay_inherited,[
-  AC_TRY_RUN( [
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
-#ifndef HAVE_SOCKLEN_T
-typedef int socklen_t;
-#endif
-int main(void) {
-    int listen_s, connected_s, client_s;
-    int listen_port, rc;
-    struct sockaddr_in sa;
-    socklen_t sa_len;
-    socklen_t option_len;
-    int option;
-
-    listen_s = socket(AF_INET, SOCK_STREAM, 0);
-    if (listen_s < 0) {
-        perror("socket");
-        exit(1);
-    }
-    option = 1;
-    rc = setsockopt(listen_s, IPPROTO_TCP, TCP_NODELAY, &option, sizeof option);
-    if (rc < 0) {
-        perror("setsockopt TCP_NODELAY");
-        exit(1);
-    }
-    memset(&sa, 0, sizeof sa);
-    sa.sin_family = AF_INET;
-#ifdef BEOS
-    sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-#endif
-    /* leave port 0 to get ephemeral */
-    rc = bind(listen_s, (struct sockaddr *)&sa, sizeof sa);
-    if (rc < 0) {
-        perror("bind for ephemeral port");
-        exit(1);
-    }
-    /* find ephemeral port */
-    sa_len = sizeof(sa);
-    rc = getsockname(listen_s, (struct sockaddr *)&sa, &sa_len);
-    if (rc < 0) {
-        perror("getsockname");
-        exit(1);
-    }
-    listen_port = sa.sin_port;
-    rc = listen(listen_s, 5);
-    if (rc < 0) {
-        perror("listen");
-        exit(1);
-    }
-    client_s = socket(AF_INET, SOCK_STREAM, 0);
-    if (client_s < 0) {
-        perror("socket");
-        exit(1);
-    }
-    memset(&sa, 0, sizeof sa);
-    sa.sin_family = AF_INET;
-    sa.sin_port   = listen_port;
-#ifdef BEOS
-    sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-#endif
-    /* leave sin_addr all zeros to use loopback */
-    rc = connect(client_s, (struct sockaddr *)&sa, sizeof sa);
-    if (rc < 0) {
-        perror("connect");
-        exit(1);
-    }
-    sa_len = sizeof sa;
-    connected_s = accept(listen_s, (struct sockaddr *)&sa, &sa_len);
-    if (connected_s < 0) {
-        perror("accept");
-        exit(1);
-    }
-    option_len = sizeof option;
-    rc = getsockopt(connected_s, IPPROTO_TCP, TCP_NODELAY, &option, &option_len);
-    if (rc < 0) {
-        perror("getsockopt");
-        exit(1);
-    }
-    if (!option) {
-        fprintf(stderr, "TCP_NODELAY is not set in the child.\n");
-        exit(1);
-    }
-    return 0;
-}
-],[
-    ac_cv_tcp_nodelay_inherited="yes"
-],[
-    ac_cv_tcp_nodelay_inherited="no"
-],[
-    ac_cv_tcp_nodelay_inherited="yes"
-])])
-if test "$ac_cv_tcp_nodelay_inherited" = "yes"; then
-    tcp_nodelay_inherited=1
-else
-    tcp_nodelay_inherited=0
-fi
-])
-
-dnl
-dnl see if O_NONBLOCK setting is inherited from listening sockets
-dnl
-AC_DEFUN(APR_CHECK_O_NONBLOCK_INHERITED,[
-  AC_CACHE_CHECK(if O_NONBLOCK setting is inherited from listening sockets, ac_cv_o_nonblock_inherited,[
-  AC_TRY_RUN( [
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
-#ifndef HAVE_SOCKLEN_T
-typedef int socklen_t;
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-int main(void) {
-    int listen_s, connected_s, client_s;
-    int listen_port, rc;
-    struct sockaddr_in sa;
-    socklen_t sa_len;
-
-    listen_s = socket(AF_INET, SOCK_STREAM, 0);
-    if (listen_s < 0) {
-        perror("socket");
-        exit(1);
-    }
-    memset(&sa, 0, sizeof sa);
-    sa.sin_family = AF_INET;
-#ifdef BEOS
-    sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-#endif
-    /* leave port 0 to get ephemeral */
-    rc = bind(listen_s, (struct sockaddr *)&sa, sizeof sa);
-    if (rc < 0) {
-        perror("bind for ephemeral port");
-        exit(1);
-    }
-    /* find ephemeral port */
-    sa_len = sizeof(sa);
-    rc = getsockname(listen_s, (struct sockaddr *)&sa, &sa_len);
-    if (rc < 0) {
-        perror("getsockname");
-        exit(1);
-    }
-    listen_port = sa.sin_port;
-    rc = listen(listen_s, 5);
-    if (rc < 0) {
-        perror("listen");
-        exit(1);
-    }
-    rc = fcntl(listen_s, F_SETFL, O_NONBLOCK);
-    if (rc < 0) {
-        perror("fcntl(F_SETFL)");
-        exit(1);
-    }
-    client_s = socket(AF_INET, SOCK_STREAM, 0);
-    if (client_s < 0) {
-        perror("socket");
-        exit(1);
-    }
-    memset(&sa, 0, sizeof sa);
-    sa.sin_family = AF_INET;
-    sa.sin_port   = listen_port;
-#ifdef BEOS
-    sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-#endif
-    /* leave sin_addr all zeros to use loopback */
-    rc = connect(client_s, (struct sockaddr *)&sa, sizeof sa);
-    if (rc < 0) {
-        perror("connect");
-        exit(1);
-    }
-    sa_len = sizeof sa;
-    connected_s = accept(listen_s, (struct sockaddr *)&sa, &sa_len);
-    if (connected_s < 0) {
-        perror("accept");
-        exit(1);
-    }
-    rc = fcntl(connected_s, F_GETFL, 0);
-    if (rc < 0) {
-        perror("fcntl(F_GETFL)");
-        exit(1);
-    }
-    if (!(rc & O_NONBLOCK)) {
-        fprintf(stderr, "O_NONBLOCK is not set in the child.\n");
-        exit(1);
-    }
-    return 0;
-}
-],[
-    ac_cv_o_nonblock_inherited="yes"
-],[
-    ac_cv_o_nonblock_inherited="no"
-],[
-    ac_cv_o_nonblock_inherited="yes"
-])])
-if test "$ac_cv_o_nonblock_inherited" = "yes"; then
-    o_nonblock_inherited=1
-else
-    o_nonblock_inherited=0
-fi
-])
-
-dnl 
-dnl check for socklen_t, fall back to unsigned int
-dnl
-AC_DEFUN(APR_CHECK_SOCKLEN_T,[
-AC_CACHE_CHECK(for socklen_t, ac_cv_socklen_t,[
-AC_TRY_COMPILE([
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-],[
-socklen_t foo = (socklen_t) 0;
-],[
-    ac_cv_socklen_t=yes
-],[
-    ac_cv_socklen_t=no
-])
-])
-
-if test "$ac_cv_socklen_t" = "yes"; then
-  AC_DEFINE(HAVE_SOCKLEN_T, 1, [Whether you have socklen_t])
-fi
-])
-
-
-AC_DEFUN(APR_CHECK_INET_ADDR,[
-AC_CACHE_CHECK(for inet_addr, ac_cv_func_inet_addr,[
-AC_TRY_COMPILE([
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-],[
-inet_addr("127.0.0.1");
-],[
-    ac_cv_func_inet_addr=yes
-],[
-    ac_cv_func_inet_addr=no
-])
-])
-
-if test "$ac_cv_func_inet_addr" = "yes"; then
-  have_inet_addr=1
-else
-  have_inet_addr=0
-fi
-])
-
-
-AC_DEFUN(APR_CHECK_INET_NETWORK,[
-AC_CACHE_CHECK(for inet_network, ac_cv_func_inet_network,[
-AC_TRY_COMPILE([
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-],[
-inet_network("127.0.0.1");
-],[
-    ac_cv_func_inet_network=yes
-],[
-    ac_cv_func_inet_network=no
-])
-])
-
-if test "$ac_cv_func_inet_network" = "yes"; then
-  have_inet_network=1
-else
-  have_inet_network=0
-fi
-])
-
-
-AC_DEFUN(APR_CHECK_SOCKADDR_IN6,[
-AC_CACHE_CHECK(for sockaddr_in6, ac_cv_define_sockaddr_in6,[
-AC_TRY_COMPILE([
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-],[
-struct sockaddr_in6 sa;
-],[
-    ac_cv_define_sockaddr_in6=yes
-],[
-    ac_cv_define_sockaddr_in6=no
-])
-])
-
-if test "$ac_cv_define_sockaddr_in6" = "yes"; then
-  have_sockaddr_in6=1
-else
-  have_sockaddr_in6=0
-fi
-])
-
-dnl
-dnl APR_INADDR_NONE
-dnl
-dnl checks for missing INADDR_NONE macro
-dnl
-AC_DEFUN(APR_INADDR_NONE,[
-  AC_CACHE_CHECK(whether system defines INADDR_NONE, ac_cv_inaddr_none,[
-  AC_TRY_COMPILE([
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-],[
-unsigned long foo = INADDR_NONE;
-],[
-    ac_cv_inaddr_none=yes
-],[
-    ac_cv_inaddr_none=no
-])])
-  if test "$ac_cv_inaddr_none" = "no"; then
-    apr_inaddr_none="((unsigned int) 0xffffffff)"
-  else
-    apr_inaddr_none="INADDR_NONE"
-  fi
-])
-
-
-dnl
-dnl APR_H_ERRNO_COMPILE_CHECK
-dnl
-AC_DEFUN(APR_H_ERRNO_COMPILE_CHECK,[
-  if test x$1 != x; then
-    CPPFLAGS="-D$1 $CPPFLAGS"
-  fi
-  AC_TRY_COMPILE([
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-],[
-int h_e = h_errno;
-],[
-  if test x$1 != x; then
-    ac_cv_h_errno_cppflags="$1"
-  else
-    ac_cv_h_errno_cppflags=yes
-  fi
-],[
-  ac_cv_h_errno_cppflags=no
-])])
-
-
-dnl
-dnl APR_CHECK_SCTP
-dnl
-dnl check for presence of SCTP protocol support
-dnl
-AC_DEFUN([APR_CHECK_SCTP],
-[
-  AC_CACHE_CHECK([whether SCTP is supported], [apr_cv_sctp], [
-  AC_TRY_RUN([
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_NETINET_SCTP_H
-#include <netinet/sctp.h>
-#endif
-#ifdef HAVE_NETINET_SCTP_UIO_H
-#include <netinet/sctp_uio.h>
-#endif
-#include <stdlib.h>
-int main(void) {
-    int s, opt = 1;
-    if ((s = socket(AF_INET, SOCK_STREAM, IPPROTO_SCTP)) < 0)
-       exit(1);
-    if (setsockopt(s, IPPROTO_SCTP, SCTP_NODELAY, &opt, sizeof(int)) < 0)
-       exit(2);
-    exit(0);
-}], [apr_cv_sctp=yes], [apr_cv_sctp=no], [apr_cv_sctp=no])])
-
-if test "$apr_cv_sctp" = "yes"; then
-    have_sctp=1
-else
-    have_sctp=0
-fi
-])
-
-dnl
-dnl APR_CHECK_H_ERRNO_FLAG
-dnl
-dnl checks which flags are necessary for <netdb.h> to define h_errno
-dnl
-AC_DEFUN(APR_CHECK_H_ERRNO_FLAG,[
-  AC_MSG_CHECKING([for h_errno in netdb.h])
-  AC_CACHE_VAL(ac_cv_h_errno_cppflags,[
-    APR_H_ERRNO_COMPILE_CHECK
-    if test "$ac_cv_h_errno_cppflags" = "no"; then
-      ac_save="$CPPFLAGS"
-      for flag in _XOPEN_SOURCE_EXTENDED; do
-        APR_H_ERRNO_COMPILE_CHECK($flag)
-        if test "$ac_cv_h_errno_cppflags" != "no"; then
-          break
-        fi
-      done
-      CPPFLAGS="$ac_save"
-    fi
-  ])
-  if test "$ac_cv_h_errno_cppflags" != "no"; then
-    if test "$ac_cv_h_errno_cppflags" != "yes"; then
-      CPPFLAGS="-D$ac_cv_h_errno_cppflags $CPPFLAGS"
-      AC_MSG_RESULT([yes, with -D$ac_cv_h_errno_cppflags])
-    else
-      AC_MSG_RESULT([$ac_cv_h_errno_cppflags])
-    fi
-  else
-    AC_MSG_RESULT([$ac_cv_h_errno_cppflags])
-  fi
-])
-
-
-AC_DEFUN(APR_EBCDIC,[
-  AC_CACHE_CHECK([whether system uses EBCDIC],ac_cv_ebcdic,[
-  AC_TRY_RUN( [
-int main(void) { 
-  return (unsigned char)'A' != (unsigned char)0xC1; 
-} 
-],[
-  ac_cv_ebcdic="yes"
-],[
-  ac_cv_ebcdic="no"
-],[
-  ac_cv_ebcdic="no"
-])])
-  if test "$ac_cv_ebcdic" = "yes"; then
-    apr_charset_ebcdic=1
-  else
-    apr_charset_ebcdic=0
-  fi
-  AC_SUBST(apr_charset_ebcdic)
-])
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk b/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
deleted file mode 100644
index 78f0ef18..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
+++ /dev/null
@@ -1,194 +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.
-#
-#
-
-#
-# rules.mk: standard rules for APR
-#
-
-
-
-#
-# Configuration variables
-#
-apr_builddir=/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr
-apr_builders=/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build
-
-# Some layouts require knowing what version we are at.
-APR_MAJOR_VERSION=0
-APR_DOTTED_VERSION=0.9.19
-
-CC=gcc
-RM=rm
-AWK=gawk
-SHELL=/bin/bash
-LIBTOOL=$(SHELL) $(apr_builddir)/libtool
-
-# compilation and linking flags that are supposed to be set only by the user.
-# configure adds to them for tests, but we restore them at the end.
-#
-CFLAGS=
-CPPFLAGS=
-LDFLAGS=
-LIBS=
-DEFS=-DHAVE_CONFIG_H
-
-# anything added to the standard flags by configure is moved to EXTRA_*
-# at the end of the process.
-#
-EXTRA_CFLAGS=-g -O2 -pthread
-EXTRA_CPPFLAGS=-D_REENTRANT -D_GNU_SOURCE
-EXTRA_LDFLAGS=
-EXTRA_LIBS=-lrt -lm -lcrypt -lnsl  -lpthread -ldl
-EXTRA_INCLUDES=
-
-# NOTEST_* are flags and libraries that can be added by the user without
-# causing them to be used in configure tests (necessary for things like
-# -Werror and other strict warnings that maintainers like to use).
-#
-NOTEST_CFLAGS=
-NOTEST_CPPFLAGS=
-NOTEST_LDFLAGS=
-NOTEST_LIBS=
-
-# Finally, combine all of the flags together in the proper order so that
-# the user-defined flags can always override the configure ones, if needed.
-# Note that includes are listed after the flags because -I options have
-# left-to-right precedence and CPPFLAGS may include user-defined overrides.
-#
-ALL_CFLAGS   = $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(CFLAGS)
-ALL_CPPFLAGS = $(DEFS) $(EXTRA_CPPFLAGS) $(NOTEST_CPPFLAGS) $(CPPFLAGS)
-ALL_LDFLAGS  = $(EXTRA_LDFLAGS) $(NOTEST_LDFLAGS) $(LDFLAGS)
-ALL_LIBS     = $(LIBS) $(NOTEST_LIBS) $(EXTRA_LIBS)
-ALL_INCLUDES = $(INCLUDES) $(EXTRA_INCLUDES)
-
-LTFLAGS      = --silent
-LT_LDFLAGS   = 
-
-#
-# Basic macro setup
-#
-COMPILE      = $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(ALL_INCLUDES)
-LT_COMPILE   = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -c $< && touch $@
-
-LINK         = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) -version-info 9:19:9 $(ALL_LDFLAGS) -o $@
-
-APR_MKDIR        = $(apr_builders)/mkdir.sh
-APR_MKEXPORT     = $(AWK) -f $(apr_builders)/make_exports.awk
-APR_MKVAREXPORT  = $(AWK) -f $(apr_builders)/make_var_export.awk
-MKDEP            = $(CC) -MM
-
-#
-# Standard build rules
-#
-all: all-recursive
-depend: depend-recursive
-clean: clean-recursive
-distclean: distclean-recursive
-extraclean: extraclean-recursive
-
-install: all-recursive
-
-
-all-recursive depend-recursive:
-	@otarget=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; \
-	for i in $$list; do \
-	    if test -d "$$i"; then \
-		target="$$otarget"; \
-		echo "Making $$target in $$i"; \
-		if test "$$i" = "."; then \
-		    made_local=yes; \
-		    target="local-$$target"; \
-		fi; \
-		(cd $$i && $(MAKE) $$target) || exit 1; \
-	    fi; \
-	done; \
-        if test "$$otarget" = "all" && test -z "$(TARGETS)"; then \
-	    made_local=yes; \
-	fi; \
-	if test "$$made_local" != "yes"; then \
-	    $(MAKE) "local-$$otarget" || exit 1; \
-	fi
-
-clean-recursive distclean-recursive extraclean-recursive:
-	@otarget=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS) $(CLEAN_SUBDIRS)'; \
-	for i in $$list; do \
-	    if test -d "$$i"; then \
-		target="$$otarget"; \
-		echo "Making $$target in $$i"; \
-		if test "$$i" = "."; then \
-		    made_local=yes; \
-		    target="local-$$target"; \
-		fi; \
-		(cd $$i && $(MAKE) $$target); \
-	    fi; \
-	done; \
-        if test "$$otarget" = "all" && test -z "$(TARGETS)"; then \
-	    made_local=yes; \
-	fi; \
-	if test "$$made_local" != "yes"; then \
-	    $(MAKE) "local-$$otarget"; \
-	fi
-
-# autoconf 2.5x is creating a 'autom4te.cache' directory
-# In case someone ran autoconf by hand, get rid of that directory
-# aswell.
-local-clean: x-local-clean
-	$(RM) -f *.o *.lo *.a *.la *.so *.obj $(CLEAN_TARGETS) $(PROGRAMS)
-	$(RM) -rf .libs autom4te.cache
-
-local-distclean: local-clean x-local-distclean
-	$(RM) -f Makefile $(DISTCLEAN_TARGETS)
-
-local-extraclean: local-distclean x-local-extraclean
-	@if test -n "$(EXTRACLEAN_TARGETS)"; then \
-	    echo $(RM) -f $(EXTRACLEAN_TARGETS) ; \
-	    $(RM) -f $(EXTRACLEAN_TARGETS) ; \
-	fi
-
-local-all: $(TARGETS)
-
-local-depend: x-local-depend
-	@if test -n "`ls $(srcdir)/*.c 2> /dev/null`"; then \
-		$(RM) -f .deps; \
-		list='$(srcdir)/*.c'; \
-		for i in $$list; do \
-			$(MKDEP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) $$i | sed 's/\.o:/.lo:/' >> .deps; \
-		done; \
-	fi
-
-# to be filled in by the actual Makefile
-x-local-depend x-local-clean x-local-distclean x-local-extraclean:
-
-#
-# Implicit rules for creating outputs from input files
-#
-.SUFFIXES:
-.SUFFIXES: .c .lo .o
-
-.c.o:
-	$(COMPILE) -c $<
-
-.c.lo:
-	$(LT_COMPILE)
-
-.PHONY: all all-recursive local-all install \
-	depend depend-recursive local-depend x-local-depend \
-	clean clean-recursive local-clean x-local-clean \
-	distclean distclean-recursive local-distclean x-local-distclean \
-	extraclean extraclean-recursive local-extraclean x-local-extraclean
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk.in b/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk.in
deleted file mode 100644
index a5433367..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk.in
+++ /dev/null
@@ -1,194 +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.
-#
-#
-
-#
-# rules.mk: standard rules for APR
-#
-
-@SET_MAKE@
-
-#
-# Configuration variables
-#
-apr_builddir=@apr_builddir@
-apr_builders=@apr_builders@
-
-# Some layouts require knowing what version we are at.
-APR_MAJOR_VERSION=@APR_MAJOR_VERSION@
-APR_DOTTED_VERSION=@APR_DOTTED_VERSION@
-
-CC=@CC@
-RM=@RM@
-AWK=@AWK@
-SHELL=@SHELL@
-LIBTOOL=@LIBTOOL@
-
-# compilation and linking flags that are supposed to be set only by the user.
-# configure adds to them for tests, but we restore them at the end.
-#
-CFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@
-LDFLAGS=@LDFLAGS@
-LIBS=@LIBS@
-DEFS=@DEFS@
-
-# anything added to the standard flags by configure is moved to EXTRA_*
-# at the end of the process.
-#
-EXTRA_CFLAGS=@EXTRA_CFLAGS@
-EXTRA_CPPFLAGS=@EXTRA_CPPFLAGS@
-EXTRA_LDFLAGS=@EXTRA_LDFLAGS@
-EXTRA_LIBS=@EXTRA_LIBS@
-EXTRA_INCLUDES=@EXTRA_INCLUDES@
-
-# NOTEST_* are flags and libraries that can be added by the user without
-# causing them to be used in configure tests (necessary for things like
-# -Werror and other strict warnings that maintainers like to use).
-#
-NOTEST_CFLAGS=@NOTEST_CFLAGS@
-NOTEST_CPPFLAGS=@NOTEST_CPPFLAGS@
-NOTEST_LDFLAGS=@NOTEST_LDFLAGS@
-NOTEST_LIBS=@NOTEST_LIBS@
-
-# Finally, combine all of the flags together in the proper order so that
-# the user-defined flags can always override the configure ones, if needed.
-# Note that includes are listed after the flags because -I options have
-# left-to-right precedence and CPPFLAGS may include user-defined overrides.
-#
-ALL_CFLAGS   = $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(CFLAGS)
-ALL_CPPFLAGS = $(DEFS) $(EXTRA_CPPFLAGS) $(NOTEST_CPPFLAGS) $(CPPFLAGS)
-ALL_LDFLAGS  = $(EXTRA_LDFLAGS) $(NOTEST_LDFLAGS) $(LDFLAGS)
-ALL_LIBS     = $(LIBS) $(NOTEST_LIBS) $(EXTRA_LIBS)
-ALL_INCLUDES = $(INCLUDES) $(EXTRA_INCLUDES)
-
-LTFLAGS      = @LTFLAGS@
-LT_LDFLAGS   = @LT_LDFLAGS@
-
-#
-# Basic macro setup
-#
-COMPILE      = $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(ALL_INCLUDES)
-LT_COMPILE   = @lt_compile@
-
-LINK         = @link@
-
-APR_MKDIR        = $(apr_builders)/mkdir.sh
-APR_MKEXPORT     = $(AWK) -f $(apr_builders)/make_exports.awk
-APR_MKVAREXPORT  = $(AWK) -f $(apr_builders)/make_var_export.awk
-MKDEP            = @MKDEP@
-
-#
-# Standard build rules
-#
-all: all-recursive
-depend: depend-recursive
-clean: clean-recursive
-distclean: distclean-recursive
-extraclean: extraclean-recursive
-
-install: all-recursive
-
-
-all-recursive depend-recursive:
-	@otarget=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; \
-	for i in $$list; do \
-	    if test -d "$$i"; then \
-		target="$$otarget"; \
-		echo "Making $$target in $$i"; \
-		if test "$$i" = "."; then \
-		    made_local=yes; \
-		    target="local-$$target"; \
-		fi; \
-		(cd $$i && $(MAKE) $$target) || exit 1; \
-	    fi; \
-	done; \
-        if test "$$otarget" = "all" && test -z "$(TARGETS)"; then \
-	    made_local=yes; \
-	fi; \
-	if test "$$made_local" != "yes"; then \
-	    $(MAKE) "local-$$otarget" || exit 1; \
-	fi
-
-clean-recursive distclean-recursive extraclean-recursive:
-	@otarget=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS) $(CLEAN_SUBDIRS)'; \
-	for i in $$list; do \
-	    if test -d "$$i"; then \
-		target="$$otarget"; \
-		echo "Making $$target in $$i"; \
-		if test "$$i" = "."; then \
-		    made_local=yes; \
-		    target="local-$$target"; \
-		fi; \
-		(cd $$i && $(MAKE) $$target); \
-	    fi; \
-	done; \
-        if test "$$otarget" = "all" && test -z "$(TARGETS)"; then \
-	    made_local=yes; \
-	fi; \
-	if test "$$made_local" != "yes"; then \
-	    $(MAKE) "local-$$otarget"; \
-	fi
-
-# autoconf 2.5x is creating a 'autom4te.cache' directory
-# In case someone ran autoconf by hand, get rid of that directory
-# aswell.
-local-clean: x-local-clean
-	$(RM) -f *.o *.lo *.a *.la *.so *.obj $(CLEAN_TARGETS) $(PROGRAMS)
-	$(RM) -rf .libs autom4te.cache
-
-local-distclean: local-clean x-local-distclean
-	$(RM) -f Makefile $(DISTCLEAN_TARGETS)
-
-local-extraclean: local-distclean x-local-extraclean
-	@if test -n "$(EXTRACLEAN_TARGETS)"; then \
-	    echo $(RM) -f $(EXTRACLEAN_TARGETS) ; \
-	    $(RM) -f $(EXTRACLEAN_TARGETS) ; \
-	fi
-
-local-all: $(TARGETS)
-
-local-depend: x-local-depend
-	@if test -n "`ls $(srcdir)/*.c 2> /dev/null`"; then \
-		$(RM) -f .deps; \
-		list='$(srcdir)/*.c'; \
-		for i in $$list; do \
-			$(MKDEP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) $$i | sed 's/\.o:/.lo:/' >> .deps; \
-		done; \
-	fi
-
-# to be filled in by the actual Makefile
-x-local-depend x-local-clean x-local-distclean x-local-extraclean:
-
-#
-# Implicit rules for creating outputs from input files
-#
-.SUFFIXES:
-.SUFFIXES: .c .lo .o
-
-.c.o:
-	$(COMPILE) -c $<
-
-.c.lo:
-	$(LT_COMPILE)
-
-.PHONY: all all-recursive local-all install \
-	depend depend-recursive local-depend x-local-depend \
-	clean clean-recursive local-clean x-local-clean \
-	distclean distclean-recursive local-distclean x-local-distclean \
-	extraclean extraclean-recursive local-extraclean x-local-extraclean
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.out b/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.out
deleted file mode 100644
index fc2d641f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.out
+++ /dev/null
@@ -1,194 +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.
-#
-#
-
-#
-# rules.mk: standard rules for APR
-#
-
-
-
-#
-# Configuration variables
-#
-apr_builddir=/bottlenecks/rubbos/app/apache2/build
-apr_builders=/bottlenecks/rubbos/app/apache2/build
-
-# Some layouts require knowing what version we are at.
-APR_MAJOR_VERSION=0
-APR_DOTTED_VERSION=0.9.19
-
-CC=gcc
-RM=rm
-AWK=gawk
-SHELL=/bin/bash
-LIBTOOL=$(SHELL) $(apr_builddir)/libtool
-
-# compilation and linking flags that are supposed to be set only by the user.
-# configure adds to them for tests, but we restore them at the end.
-#
-CFLAGS=
-CPPFLAGS=
-LDFLAGS=
-LIBS=
-DEFS=-DHAVE_CONFIG_H
-
-# anything added to the standard flags by configure is moved to EXTRA_*
-# at the end of the process.
-#
-EXTRA_CFLAGS=-g -O2 -pthread
-EXTRA_CPPFLAGS=-D_REENTRANT -D_GNU_SOURCE
-EXTRA_LDFLAGS=
-EXTRA_LIBS=-lrt -lm -lcrypt -lnsl  -lpthread -ldl
-EXTRA_INCLUDES=
-
-# NOTEST_* are flags and libraries that can be added by the user without
-# causing them to be used in configure tests (necessary for things like
-# -Werror and other strict warnings that maintainers like to use).
-#
-NOTEST_CFLAGS=
-NOTEST_CPPFLAGS=
-NOTEST_LDFLAGS=
-NOTEST_LIBS=
-
-# Finally, combine all of the flags together in the proper order so that
-# the user-defined flags can always override the configure ones, if needed.
-# Note that includes are listed after the flags because -I options have
-# left-to-right precedence and CPPFLAGS may include user-defined overrides.
-#
-ALL_CFLAGS   = $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(CFLAGS)
-ALL_CPPFLAGS = $(DEFS) $(EXTRA_CPPFLAGS) $(NOTEST_CPPFLAGS) $(CPPFLAGS)
-ALL_LDFLAGS  = $(EXTRA_LDFLAGS) $(NOTEST_LDFLAGS) $(LDFLAGS)
-ALL_LIBS     = $(LIBS) $(NOTEST_LIBS) $(EXTRA_LIBS)
-ALL_INCLUDES = $(INCLUDES) $(EXTRA_INCLUDES)
-
-LTFLAGS      = --silent
-LT_LDFLAGS   = 
-
-#
-# Basic macro setup
-#
-COMPILE      = $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(ALL_INCLUDES)
-LT_COMPILE   = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -c $< && touch $@
-
-LINK         = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) -version-info 9:19:9 $(ALL_LDFLAGS) -o $@
-
-APR_MKDIR        = $(apr_builders)/mkdir.sh
-APR_MKEXPORT     = $(AWK) -f $(apr_builders)/make_exports.awk
-APR_MKVAREXPORT  = $(AWK) -f $(apr_builders)/make_var_export.awk
-MKDEP            = $(CC) -MM
-
-#
-# Standard build rules
-#
-all: all-recursive
-depend: depend-recursive
-clean: clean-recursive
-distclean: distclean-recursive
-extraclean: extraclean-recursive
-
-install: all-recursive
-
-
-all-recursive depend-recursive:
-	@otarget=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; \
-	for i in $$list; do \
-	    if test -d "$$i"; then \
-		target="$$otarget"; \
-		echo "Making $$target in $$i"; \
-		if test "$$i" = "."; then \
-		    made_local=yes; \
-		    target="local-$$target"; \
-		fi; \
-		(cd $$i && $(MAKE) $$target) || exit 1; \
-	    fi; \
-	done; \
-        if test "$$otarget" = "all" && test -z "$(TARGETS)"; then \
-	    made_local=yes; \
-	fi; \
-	if test "$$made_local" != "yes"; then \
-	    $(MAKE) "local-$$otarget" || exit 1; \
-	fi
-
-clean-recursive distclean-recursive extraclean-recursive:
-	@otarget=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS) $(CLEAN_SUBDIRS)'; \
-	for i in $$list; do \
-	    if test -d "$$i"; then \
-		target="$$otarget"; \
-		echo "Making $$target in $$i"; \
-		if test "$$i" = "."; then \
-		    made_local=yes; \
-		    target="local-$$target"; \
-		fi; \
-		(cd $$i && $(MAKE) $$target); \
-	    fi; \
-	done; \
-        if test "$$otarget" = "all" && test -z "$(TARGETS)"; then \
-	    made_local=yes; \
-	fi; \
-	if test "$$made_local" != "yes"; then \
-	    $(MAKE) "local-$$otarget"; \
-	fi
-
-# autoconf 2.5x is creating a 'autom4te.cache' directory
-# In case someone ran autoconf by hand, get rid of that directory
-# aswell.
-local-clean: x-local-clean
-	$(RM) -f *.o *.lo *.a *.la *.so *.obj $(CLEAN_TARGETS) $(PROGRAMS)
-	$(RM) -rf .libs autom4te.cache
-
-local-distclean: local-clean x-local-distclean
-	$(RM) -f Makefile $(DISTCLEAN_TARGETS)
-
-local-extraclean: local-distclean x-local-extraclean
-	@if test -n "$(EXTRACLEAN_TARGETS)"; then \
-	    echo $(RM) -f $(EXTRACLEAN_TARGETS) ; \
-	    $(RM) -f $(EXTRACLEAN_TARGETS) ; \
-	fi
-
-local-all: $(TARGETS)
-
-local-depend: x-local-depend
-	@if test -n "`ls $(srcdir)/*.c 2> /dev/null`"; then \
-		$(RM) -f .deps; \
-		list='$(srcdir)/*.c'; \
-		for i in $$list; do \
-			$(MKDEP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) $$i | sed 's/\.o:/.lo:/' >> .deps; \
-		done; \
-	fi
-
-# to be filled in by the actual Makefile
-x-local-depend x-local-clean x-local-distclean x-local-extraclean:
-
-#
-# Implicit rules for creating outputs from input files
-#
-.SUFFIXES:
-.SUFFIXES: .c .lo .o
-
-.c.o:
-	$(COMPILE) -c $<
-
-.c.lo:
-	$(LT_COMPILE)
-
-.PHONY: all all-recursive local-all install \
-	depend depend-recursive local-depend x-local-depend \
-	clean clean-recursive local-clean x-local-clean \
-	distclean distclean-recursive local-distclean x-local-distclean \
-	extraclean extraclean-recursive local-extraclean x-local-extraclean
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_threads.m4 b/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_threads.m4
deleted file mode 100644
index 8491105a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_threads.m4
+++ /dev/null
@@ -1,267 +0,0 @@
-dnl -----------------------------------------------------------------
-dnl apr_threads.m4: APR's autoconf macros for testing thread support
-dnl
-
-dnl
-dnl APR_CHECK_PTHREADS_H([ ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl
-dnl gcc issues warnings when parsing AIX 4.3.3's pthread.h
-dnl which causes autoconf to incorrectly conclude that
-dnl pthreads is not available.
-dnl Turn off warnings if we're using gcc.
-dnl
-AC_DEFUN(APR_CHECK_PTHREADS_H, [
-  if test "$GCC" = "yes"; then
-    SAVE_FL="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS -w"
-    AC_CHECK_HEADERS(pthread.h, [ $1 ] , [ $2 ] )
-    CPPFLAGS="$SAVE_FL"
-  else
-    AC_CHECK_HEADERS(pthread.h, [ $1 ] , [ $2 ] )
-  fi
-])dnl
-
-
-dnl
-dnl APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS
-dnl
-AC_DEFUN(APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS, [
-AC_CACHE_CHECK(whether pthread_getspecific takes two arguments, ac_cv_pthread_getspecific_two_args,[
-AC_TRY_COMPILE([
-#include <pthread.h>
-],[
-pthread_key_t key;
-void *tmp;
-pthread_getspecific(key,&tmp);
-],[
-    ac_cv_pthread_getspecific_two_args=yes
-],[
-    ac_cv_pthread_getspecific_two_args=no
-])
-])
-
-if test "$ac_cv_pthread_getspecific_two_args" = "yes"; then
-  AC_DEFINE(PTHREAD_GETSPECIFIC_TAKES_TWO_ARGS, 1, [Define if pthread_getspecific() has two args])
-fi
-])dnl
-
-
-dnl
-dnl APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG
-dnl
-AC_DEFUN(APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG, [
-AC_CACHE_CHECK(whether pthread_attr_getdetachstate takes one argument, ac_cv_pthread_attr_getdetachstate_one_arg,[
-AC_TRY_COMPILE([
-#include <pthread.h>
-],[
-pthread_attr_t *attr;
-pthread_attr_getdetachstate(attr);
-],[
-    ac_cv_pthread_attr_getdetachstate_one_arg=yes
-],[
-    ac_cv_pthread_attr_getdetachstate_one_arg=no
-])
-])
-
-if test "$ac_cv_pthread_attr_getdetachstate_one_arg" = "yes"; then
-  AC_DEFINE(PTHREAD_ATTR_GETDETACHSTATE_TAKES_ONE_ARG, 1, [Define if pthread_attr_getdetachstate() has one arg])
-fi
-])dnl
-
-
-dnl
-dnl APR_PTHREADS_TRY_RUN(actions-if-success)
-dnl
-dnl Try running a program which uses pthreads, executing the
-dnl actions-if-success commands on success.
-dnl
-AC_DEFUN(APR_PTHREADS_TRY_RUN, [
-AC_TRY_RUN( [
-#include <pthread.h>
-#include <stddef.h>
-
-void *thread_routine(void *data) {
-    return data;
-}
-
-int main() {
-    pthread_t thd;
-    pthread_mutexattr_t mattr;
-    pthread_once_t once_init = PTHREAD_ONCE_INIT;
-    int data = 1;
-    pthread_mutexattr_init(&mattr);
-    return pthread_create(&thd, NULL, thread_routine, &data);
-} ], [apr_p_t_r=yes], [apr_p_t_r=no], [apr_p_t_r=no])
-
-if test $apr_p_t_r = yes; then
-  $1
-fi
-
-])dnl
-
-
-dnl
-dnl APR_PTHREADS_CHECK()
-dnl
-dnl Try to find a way to enable POSIX threads.  Sets the 
-dnl pthreads_working variable to "yes" on success.
-dnl
-AC_DEFUN(APR_PTHREADS_CHECK,[
-
-AC_CACHE_CHECK([for CFLAGS needed for pthreads], [apr_cv_pthreads_cflags],
-[apr_ptc_cflags=$CFLAGS
- for flag in none -kthread -pthread -pthreads -mt -mthreads -Kthread -threads; do 
-    CFLAGS=$apr_ptc_cflags
-    test "x$flag" != "xnone" && CFLAGS="$CFLAGS $flag"
-    APR_PTHREADS_TRY_RUN([
-      apr_cv_pthreads_cflags="$flag"
-      break
-    ])
- done
- CFLAGS=$apr_ptc_cflags
-])
-
-if test -n "$apr_cv_pthreads_cflags"; then
-   pthreads_working=yes
-   if test "x$apr_cv_pthreads_cflags" != "xnone"; then
-     APR_ADDTO(CFLAGS,[$apr_cv_pthreads_cflags])
-   fi
-fi
-
-# The CFLAGS may or may not be sufficient to ensure that libapr
-# depends on the pthreads library: some versions of libtool
-# drop -pthread when passed on the link line; some versions of
-# gcc ignore -pthread when linking a shared object.  So always
-# try and add the relevant library to LIBS too.
-
-AC_CACHE_CHECK([for LIBS needed for pthreads], [apr_cv_pthreads_lib], [
-  apr_ptc_libs=$LIBS
-  for lib in -lpthread -lpthreads -lc_r; do
-    LIBS="$apr_ptc_libs $lib"
-    APR_PTHREADS_TRY_RUN([
-      apr_cv_pthreads_lib=$lib
-      break
-    ])
-  done
-  LIBS=$apr_ptc_libs
-])
-
-if test -n "$apr_cv_pthreads_lib"; then
-   pthreads_working=yes
-   APR_ADDTO(LIBS,[$apr_cv_pthreads_lib])
-fi
-
-if test "$pthreads_working" = "yes"; then
-  threads_result="POSIX Threads found"
-else
-  threads_result="POSIX Threads not found"
-fi
-])dnl
-
-dnl
-dnl APR_PTHREADS_CHECK_SAVE
-dnl APR_PTHREADS_CHECK_RESTORE
-dnl
-dnl Save the global environment variables that might be modified during
-dnl the checks for threading support so that they can restored if the
-dnl result is not what the caller wanted.
-dnl
-AC_DEFUN(APR_PTHREADS_CHECK_SAVE, [
-  apr_pthsv_CFLAGS="$CFLAGS"
-  apr_pthsv_LIBS="$LIBS"
-])dnl
-
-AC_DEFUN(APR_PTHREADS_CHECK_RESTORE, [
-  CFLAGS="$apr_pthsv_CFLAGS"
-  LIBS="$apr_pthsv_LIBS"
-])dnl
-
-dnl
-dnl APR_CHECK_SIGWAIT_ONE_ARG
-dnl
-AC_DEFUN(APR_CHECK_SIGWAIT_ONE_ARG,[
-  AC_CACHE_CHECK(whether sigwait takes one argument,ac_cv_sigwait_one_arg,[
-  AC_TRY_COMPILE([
-#if defined(__NETBSD__) || defined(DARWIN)
-    /* When using the unproven-pthreads package, we need to pull in this
-     * header to get a prototype for sigwait().  Else things will fail later
-     * on.  XXX Should probably be fixed in the unproven-pthreads package.
-     * Darwin is declaring sigwait() in the wrong place as well.
-     */
-#include <pthread.h>
-#endif
-#include <signal.h>
-],[
-  sigset_t set;
- 
-  sigwait(&set);
-],[
-  ac_cv_sigwait_one_arg=yes
-],[
-  ac_cv_sigwait_one_arg=no
-])])
-  if test "$ac_cv_sigwait_one_arg" = "yes"; then
-    AC_DEFINE(SIGWAIT_TAKES_ONE_ARG,1,[ ])
-  fi
-])
-
-dnl Check for recursive mutex support (per SUSv3).
-AC_DEFUN([APR_CHECK_PTHREAD_RECURSIVE_MUTEX], [
-  AC_CACHE_CHECK([for recursive mutex support], [apr_cv_mutex_recursive],
-[AC_TRY_RUN([#include <sys/types.h>
-#include <pthread.h>
-#include <stdlib.h>
-
-int main() {
-    pthread_mutexattr_t attr;
-    pthread_mutex_t m;
-
-    exit (pthread_mutexattr_init(&attr) 
-          || pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE)
-          || pthread_mutex_init(&m, &attr));
-}], [apr_cv_mutex_recursive=yes], [apr_cv_mutex_recursive=no], 
-[apr_cv_mutex_recursive=no])])
-
-if test "$apr_cv_mutex_recursive" = "yes"; then
-   AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], 1,
-             [Define if recursive pthread mutexes are available])
-fi
-])
-
-dnl Check for robust process-shared mutex support
-AC_DEFUN([APR_CHECK_PTHREAD_ROBUST_SHARED_MUTEX], [
-AC_CACHE_CHECK([for robust cross-process mutex support], 
-[apr_cv_mutex_robust_shared],
-[AC_TRY_RUN([
-#include <sys/types.h>
-#include <pthread.h>
-#include <stdlib.h>
-
-int main(int argc, char **argv)
-{
-    pthread_mutex_t mutex;
-    pthread_mutexattr_t attr;
-
-    if (pthread_mutexattr_init(&attr))
-        exit(1);
-    if (pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED))
-        exit(2);
-    if (pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST_NP))
-        exit(3);
-    if (pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT))
-        exit(4);
-    if (pthread_mutex_init(&mutex, &attr))
-        exit(5);
-    if (pthread_mutexattr_destroy(&attr))
-        exit(6);
-    if (pthread_mutex_destroy(&mutex))
-        exit(7);
-
-    exit(0);
-}], [apr_cv_mutex_robust_shared=yes], [apr_cv_mutex_robust_shared=no])])
-
-if test "$apr_cv_mutex_robust_shared" = "yes"; then
-   AC_DEFINE([HAVE_PTHREAD_MUTEX_ROBUST], 1,
-             [Define if cross-process robust mutexes are available])
-fi
-])
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/buildcheck.sh b/rubbos/app/httpd-2.0.64/srclib/apr/build/buildcheck.sh
deleted file mode 100755
index 5670c0f6..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/buildcheck.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh
-
-echo "buildconf: checking installation..."
-
-# autoconf 2.13 or newer
-ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;q'`
-if test -z "$ac_version"; then
-echo "buildconf: autoconf not found."
-echo "           You need autoconf version 2.13 or newer installed"
-echo "           to build Apache from CVS."
-exit 1
-fi
-IFS=.; set $ac_version; IFS=' '
-if test "$1" = "2" -a "$2" -lt "13" || test "$1" -lt "2"; then
-echo "buildconf: autoconf version $ac_version found."
-echo "           You need autoconf version 2.13 or newer installed"
-echo "           to build Apache from CVS."
-exit 1
-else
-echo "buildconf: autoconf version $ac_version (ok)"
-fi
-
-# Sample libtool --version outputs:
-# ltmain.sh (GNU libtool) 1.3.3 (1.385.2.181 1999/07/02 15:49:11)
-# ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a
-# output is multiline from 1.5 onwards
-
-# Require libtool 1.3.3 or newer
-libtool=`build/PrintPath glibtool libtool`
-lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
-if test -z "$lt_pversion"; then
-echo "buildconf: libtool not found."
-echo "           You need libtool version 1.3.3 or newer installed"
-echo "           to build Apache from CVS."
-exit 1
-fi
-lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
-IFS=.; set $lt_version; IFS=' '
-lt_status="good"
-if test "$1" = "1"; then
-   if test "$2" -lt "3"; then
-      lt_status="bad"
-   else
-      if test "$2" = "3"; then
-         if test -z "$3" -o "$3" = "1" -o "$3" = "2"; then
-            lt_status="bad"
-         fi
-      fi
-   fi
-fi
-if test $lt_status = "good"; then
-   echo "buildconf: libtool version $lt_pversion (ok)"
-   exit 0
-fi
-
-echo "buildconf: libtool version $lt_pversion found."
-echo "           You need libtool version 1.3.3 or newer installed"
-echo "           to build Apache from CVS."
-
-exit 1
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/config.guess b/rubbos/app/httpd-2.0.64/srclib/apr/build/config.guess
deleted file mode 100755
index 115f944a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/config.guess
+++ /dev/null
@@ -1,1502 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
-
-timestamp='2010-04-03'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' HUP INT TERM
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH="i386"
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH="x86_64"
-	    fi
-	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[456])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep -q __LP64__
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:*)
-    	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
-    arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
-	exit ;;
-    i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit ;;
-    xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
-	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-        exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/config.sub b/rubbos/app/httpd-2.0.64/srclib/apr/build/config.sub
deleted file mode 100755
index 204218c0..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/config.sub
+++ /dev/null
@@ -1,1731 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
-
-timestamp='2010-05-21'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
-		os=
-		basic_machine=$1
-		;;
-        -bluegene*)
-	        os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nios-* | nios2-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile-* | tilegx-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-        cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-        microblaze)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-        # This must be matched before tile*.
-        tilegx*)
-		basic_machine=tilegx-unknown
-		os=-linux-gnu
-		;;
-	tile*)
-		basic_machine=tile-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-        -auroraux)
-	        os=-auroraux
-		;;
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-dicos*)
-		os=-dicos
-		;;
-        -nacl*)
-	        ;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-        score-*)
-		os=-elf
-		;;
-        spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-        c4x-* | tic4x-*)
-        	os=-coff
-		;;
-	tic54x-*)
-		os=-coff
-		;;
-	tic55x-*)
-		os=-coff
-		;;
-	tic6x-*)
-		os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-        mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-    	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-cnk*|-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/cvtdsp.pl b/rubbos/app/httpd-2.0.64/srclib/apr/build/cvtdsp.pl
deleted file mode 100644
index becb75bd..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/cvtdsp.pl
+++ /dev/null
@@ -1,605 +0,0 @@
-use IO::File;
-use File::Find;
-
-if ($ARGV[0] eq '-6') {
-    find(\&tovc6, '.');
-}
-elsif ($ARGV[0] eq '-5') {
-    find(\&tovc5, '.');
-}
-elsif ($ARGV[0] eq '-2005') {
-    find(\&tovc2005, '.');
-}
-elsif ($ARGV[0] eq '-w3') {
-    find(\&tow3, '.');
-}
-elsif ($ARGV[0] eq '-w4') {
-    find(\&tow4, '.');
-}
-elsif ($ARGV[0] eq '-ia64') {
-    find(\&tovc64, '.');
-}
-elsif ($ARGV[0] eq '-d') {
-    find(\&todebugpools, '.');
-}
-elsif ($ARGV[0] eq '-b') {
-    find(\&tobrowse, '.');
-}
-elsif ($ARGV[0] eq '-mt') {
-    find(\&addmt, '.');
-}
-elsif ($ARGV[0] eq '-m') {
-        ## 0 - conapp, 1 - dll lib, 2 - static lib
-        $dsptype = 2;
-        $name = "apr";
-        onemake();
-}
-else {
-    print "Specify -5 or -6 for Visual Studio 5 or 6 (98) .dsp format\n";
-    print "Specify -w3 or -w4 for .dsp build with warning level 3 or 4 (strict)\n\n";
-    print "Specify -ia64 for build targeted at Itanium (req's psdk tools)\n\n";
-    print "Specify -p for extreme pool debugging\n\n";
-    print "Specify -mt to add .manifest embedding\n\n";
-    die "Missing argument";
-}
-
-sub addmt { 
-    my $outpath, $outtype;
-
-    if (m|\.dsp$|) {
-        $oname = $_;
-        $tname = '.#' . $_;
-        $verchg = 0;
-        $srcfl = new IO::File $oname, "r" || die;
-        $dstfl = new IO::File $tname, "w" || die;
-        while ($src = <$srcfl>) {
-            if ($src =~ m|^# TARGTYPE .+ Application|) {
-                $outtype = ".exe"
-            }
-            if ($src =~ m|^# TARGTYPE .+ Dynamic-Link|) {
-                $outtype = ".dll"
-            }
-            if ($src =~ m|^# PROP Output_Dir "(.+)"|) {
-                $outdir = $1;
-                $outpath = $oname;
-                $outpath =~ s|\.dsp||;
-                $outpath =  ".\\" . $outdir . "\\" . $outpath . $outtype;
-            }
-            if ($src =~ m|^# ADD (BASE )?LINK32 .+ /out:"([^"]+)"|) {
-                $outpath = $2;
-                $outpath =~ s|/|\\|;
-                $outpath = ".\\" . $outpath if (!($outpath =~ m|^\.|));
-                $src =~ s|/out:"([^"]+)"|/out:"$outpath"|;
-            }
-            if (defined($outpath) && ($src =~ m|^# Begin Special Build Tool|)) {
-                undef $outpath;
-            }
-            if (defined($outpath) && defined($outtype) && ($src =~ m|^\s*$|)) {
-                print $dstfl '# Begin Special Build Tool' . "\n";
-                print $dstfl 'TargetPath=' . $outpath . "\n";
-                print $dstfl 'SOURCE="$(InputPath)"' . "\n";
-                print $dstfl 'PostBuild_Desc=Embed .manifest' . "\n";
-                print $dstfl 'PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2' . "\n";
-                print $dstfl '# End Special Build Tool' . "\n";
-                $verchg = -1;
-                undef $outpath;
-            }
-            print $dstfl $src;
-        }
-        undef $outtype if (defined($outtype));
-        undef $outpath if (defined($outpath));
-        undef $srcfl;
-        undef $dstfl;
-        if ($verchg) {
-            unlink $oname || die;
-            rename $tname, $oname || die;
-            print "Added manifest to " . $oname . " in " . $File::Find::dir . "\n"; 
-        }
-        else {
-            unlink $tname;
-        }
-    }
-}
-sub tovc5 { 
-
-    if (m|\.dsp$|) {
-        $oname = $_;
-        $tname = '.#' . $_;
-        $verchg = 0;
-        $srcfl = new IO::File $oname, "r" || die;
-        $dstfl = new IO::File $tname, "w" || die;
-        while ($src = <$srcfl>) {
-            if ($src =~ s|Format Version 6\.00|Format Version 5\.00|) {
-                $verchg = -1;
-            }
-            if ($src =~ s|^(# ADD CPP .*)/ZI (.*)|$1/Zi $2|) {
-                $verchg = -1;
-            }
-            if ($src =~ s|^(# ADD BASE CPP .*)/ZI (.*)|$1/Zi $2|) {
-                $verchg = -1;
-            }
-            if ($src =~ s|^(# ADD CPP .*)/EHsc (.*)|$1/GX $2|) {
-                $verchg = -1;
-            }
-            if ($src =~ s|^(# ADD BASE CPP .*)/EHsc (.*)|$1/GX $2|) {
-                $verchg = -1;
-            }
-            while ($src =~ s|^(# ADD RSC .*)/d "([^ ="]+)=([^"]+)"|$1/d $2="$3"|) {
-                $verchg = -1;
-            }
-            if ($src !~ m|^# PROP AllowPerConfigDependencies|) {
-                print $dstfl $src; }
-            else {
-                $verchg = -1;
-            }
-        }
-        undef $srcfl;
-        undef $dstfl;
-        if ($verchg) {
-            unlink $oname || die;
-            rename $tname, $oname || die;
-            print "Converted VC6 project " . $oname . " to VC5 in " . $File::Find::dir . "\n"; 
-        }
-        else {
-            unlink $tname;
-        }
-    }
-}
-
-sub tovc6 { 
-
-    if (m|\.dsp$|) {
-        $oname = $_;
-        $tname = '.#' . $_;
-        $verchg = 0;
-        $srcfl = new IO::File $_, "r" || die;
-        $dstfl = new IO::File $tname, "w" || die;
-        while ($src = <$srcfl>) {
-            if ($src =~ s|Format Version 5\.00|Format Version 6\.00|) {
-                $verchg = -1;
-            }
-            if ($src =~ s|^(!MESSAGE .*)\\\n|$1|) {
-                $cont = <$srcfl>;
-                $src = $src . $cont;
-                $verchg = -1;
-            }
-            if ($src =~ s|^(# ADD CPP .*)/GX (.*)|$1/EHsc $2|) {
-                $verchg = -1;
-            }
-            if ($src =~ s|^(# ADD BASE CPP .*)/GX (.*)|$1/EHsc $2|) {
-                $verchg = -1;
-            }
-            while ($src =~ s|^(# ADD RSC .*)/d "([^ ="]+)=([^"]+)"|$1/d $2="$3"|) {
-                $verchg = -1;
-            }
-            print $dstfl $src; 
-            if ($verchg && $src =~ m|^# Begin Project|) {
-                print $dstfl "# PROP AllowPerConfigDependencies 0\n"; 
-            }
-        }
-        undef $srcfl;
-        undef $dstfl;
-        if ($verchg) {
-            unlink $oname || die;
-            rename $tname, $oname || die;
-            print "Converted VC5 project " . $oname . " to VC6 in " . $File::Find::dir . "\n"; 
-        }
-        else {
-            unlink $tname;
-        }
-    }
-}
-
-sub tovc2005 { 
-
-    if (m|\.dsp$| || m|\.mak$|) {
-        $oname = $_;
-        $tname = '.#' . $_;
-        $verchg = 0;
-        $srcfl = new IO::File $_, "r" || die;
-        $dstfl = new IO::File $tname, "w" || die;
-        while ($src = <$srcfl>) {
-            if ($src =~ s|(\bCPP.*) /GX(.*)|$1 /EHsc$2|) {
-                $verchg = -1;
-            }
-            if ($src =~ s|(\bLINK32.*) /machine:I386(.*)|$1$2|) {
-                $verchg = -1;
-            }
-            while ($src =~ s|^(# ADD RSC .*)/d ([^ ="]+)="([^"]+)"|$1/d "$2=$3"|) {
-                $verchg = -1;
-            }
-            print $dstfl $src; 
-        }
-        undef $srcfl;
-        undef $dstfl;
-        if ($verchg) {
-            unlink $oname || die;
-            rename $tname, $oname || die;
-            print "Converted project " . $oname . " to 2005 in " . $File::Find::dir . "\n"; 
-        }
-        else {
-            unlink $tname;
-        }
-    }
-}
-
-sub tow3 { 
-
-    if (m|\.dsp$| || m|\.mak$|) {
-        $oname = $_;
-        $tname = '.#' . $_;
-        $verchg = 0;
-        $srcfl = new IO::File $_, "r" || die;
-        $dstfl = new IO::File $tname, "w" || die;
-        while ($src = <$srcfl>) {
-            while ($src =~ m|\\\n$|) {
-                $src = $src . <$srcfl>
-            }
-            if ($src =~ s|(\bCPP.*) /W4(.*)|$1 /W3$2|) {
-                $verchg = -1;
-            }
-            print $dstfl $src; 
-        }
-        undef $srcfl;
-        undef $dstfl;
-        if ($verchg) {
-            unlink $oname || die;
-            rename $tname, $oname || die;
-            print "Converted project " . $oname . " to warn:3 in " . $File::Find::dir . "\n"; 
-        }
-        else {
-            unlink $tname;
-        }
-    }
-}
-
-sub tow4 { 
-
-    if (m|\.dsp$| || m|\.mak$|) {
-        $oname = $_;
-        $tname = '.#' . $_;
-        $verchg = 0;
-        $srcfl = new IO::File $_, "r" || die;
-        $dstfl = new IO::File $tname, "w" || die;
-        while ($src = <$srcfl>) {
-            while ($src =~ m|\\\n$|) {
-                $src = $src . <$srcfl>
-            }
-            if ($src =~ s|(\bCPP.*) /W3(.*)|$1 /W4$2|) {
-                $verchg = -1;
-            }
-            print $dstfl $src; 
-        }
-        undef $srcfl;
-        undef $dstfl;
-        if ($verchg) {
-            unlink $oname || die;
-            rename $tname, $oname || die;
-            print "Converted project " . $oname . " to warn:4 " . $File::Find::dir . "\n"; 
-        }
-        else {
-            unlink $tname;
-        }
-    }
-}
-
-sub tovc64 { 
-
-    if (m|\.dsp$| || m|\.mak$|) {
-        $oname = $_;
-        $tname = '.#' . $_;
-        $verchg = 0;
-        $srcfl = new IO::File $_, "r" || die;
-        $dstfl = new IO::File $tname, "w" || die;
-        while ($src = <$srcfl>) {
-            while ($src =~ m|\\\n$|) {
-                $src = $src . <$srcfl>
-            }
-            if ($src =~ s|Win32 \(x86\) (Release)|Win32 (IA64) $1|s) {
-                $verchg = -1;
-            }
-            if ($src =~ s|Win32 \(x86\) (Debug)|Win32 (IA64) $1|s) {
-                $verchg = -1;
-            }
-            if ($src =~ s| - Win32 (Release)| - Win32 (IA64) $1|s) {
-                $verchg = -1;
-            }
-            if ($src =~ s| - Win32 (Debug)| - Win32 (IA64) $1|s) {
-                $verchg = -1;
-            }
-            # Cross compilation exceptions
-            if (!(m|gen[^/]*$| || m|dftables[^/]*$|)) {
-                if ($src =~ s|(\bCPP.* /W3)(.*) /FD(.*)|$1 /As64 /Wp64$2$3|s) {
-                    $verchg = -1;
-                }
-                if ($src =~ s|(\bLINK.*/machine):I386(.*)|$1:IA64$2|s) {
-                    $verchg = -1;
-                }
-            }
-            else {
-                if ($src =~ s|(\bCPP.* /W3)(.*) /FD(.*)|$1 /As32 /Wp64$2$3|s) {
-                    $verchg = -1;
-                }
-            }
-            print $dstfl $src; 
-        }
-        undef $srcfl;
-        undef $dstfl;
-        if ($verchg) {
-            unlink $oname || die;
-            rename $tname, $oname || die;
-            print "Converted build file " . $oname . " to Win64 in " . $File::Find::dir . "\n"; 
-        }
-        else {
-            unlink $tname;
-        }
-    }
-}
-
-sub todebugpools { 
-
-    if (m|\.dsp$|) {
-        $oname = $_;
-        $tname = '.#' . $_;
-        $verchg = 0;
-        $srcfl = new IO::File $oname, "r" || die;
-        $dstfl = new IO::File $tname, "w" || die;
-        while ($src = <$srcfl>) {
-            if ($src =~ s|^(# ADD CPP .* /D "_DEBUG" )|$1/D "APR_POOL_DEBUG" |) {
-                $verchg = -1;
-                if ($oname =~ /apr\.dsp$/) {
-                    $src =~ s|^(# ADD CPP .* /D "_DEBUG" )|$1/D "POOL_DEBUG" |;
-                }
-            }
-            print $dstfl $src; 
-        }
-        undef $srcfl;
-        undef $dstfl;
-        if ($verchg) {
-            unlink $oname || die;
-            rename $tname, $oname || die;
-            print "Converted project " . $oname . " to debug pools in " . $File::Find::dir . "\n"; 
-        }
-        else {
-            unlink $tname;
-        }
-    }
-}
-
-sub tobrowsesources { 
-
-    if (m|\.dsp$|) {
-        $oname = $_;
-        $tname = '.#' . $_;
-        $verchg = 0;
-        $srcfl = new IO::File $oname, "r" || die;
-        $dstfl = new IO::File $tname, "w" || die;
-        while ($src = <$srcfl>) {
-            if ($src =~ s|^(# ADD CPP .*)( /Fd)|$1 /Fr "/httpd-2.0/srclib/apr"$2|) {
-                $verchg = -1;
-            }
-            print $dstfl $src; 
-        }
-        undef $srcfl;
-        undef $dstfl;
-        if ($verchg) {
-            unlink $oname || die;
-            rename $tname, $oname || die;
-            print "Converted project " . $oname . " to browse sources in " . $File::Find::dir . "\n"; 
-        }
-        else {
-            unlink $tname;
-        }
-    }
-}
-
-sub frommakefiles {
-
-    if (m|\.mak\.in$|) {
-        $oname = $_;
-        $dname = $_;
-        $_ =~ s/\.mak\.in/.dsp/;
-        $verchg = 0;
-        $srcfl = new IO::File $oname, "r" || die;
-        $dstfl = new IO::File $tname, "w" || die;
-        while ($src = <$srcfl>) {
-            if ($src =~ s|^(# ADD CPP .*)( /Fd)|$1 /Fr "/httpd-2.0/srclib/apr"$2|) {
-                $verchg = -1;
-            }
-            print $dstfl $src; 
-        }
-        undef $srcfl;
-        undef $dstfl;
-        if ($verchg) {
-            unlink $oname || die;
-            rename $tname, $oname || die;
-            print "Converted project " . $oname . " to browse sources in " . $File::Find::dir . "\n"; 
-        }
-        else {
-            unlink $tname;
-        }
-    }
-}
-
-
-sub onemake {
-
-    if ($dsptype == 0) {
-        $cdefs = qq{/D "WIN32" /D "_CONSOLE"};
-        $lmodel = qq{/subsystem:console};
-        $targname = "Win32 (x86) Console Application";
-        $targid = "0x0103";
-        $debpath = "Debug"; $relpath = "Release";
-    } elsif ($dsptype == 1) {
-        $cdefs = qq{/D "WIN32" /D "_WINDOWS"};
-        $lmodel = qq{/subsystem:windows /dll};
-        $targname = "Win32 (x86) Dynamic-Link Library";
-        $targid = "0x0102";
-        $debpath = "Debug"; $relpath = "Release";
-    } elsif($dsptype == 2) {
-        $cdefs = qq{/D "WIN32" /D "_CONSOLE"};
-        $lmodel = qq{/subsystem:console};
-        $targname = "Win32 (x86) Static Library";
-        $targid = "0x0104";
-        $debpath = "LibD"; $relpath = "LibR";
-    }
-        $file = dspheader();
-
-
-        $second = "";
-
-        $model = "Release";
-        $usedebuglib = "0";
-        $debugdef = "NDEBUG";
-        $cflags = "/MD /W3 /O2";
-        $cincl = qq{/I "./include" /I "./os/win32" /I "./srclib/apr/include" /I "./srclib/apr-util/include"};
-        $lflags = qq{/map};
-        $file .= dsponemodel();
-
-        $second = "ELSE";
-        $model = "Debug";
-        $usedebuglib = "1";
-        $debugdef = "_DEBUG";
-        $cflags = "/MDd /W3 /GX /Zi /Od";
-        $cincl = qq{/I "./include" /I "./os/win32" /I "./srclib/apr/include" /I "./srclib/apr-util/include"};
-        $lflags = qq{/incremental:no /debug};
-        $file .= dsponemodel();
-
-        $file .= qq{
-!ENDIF 
-
-# Begin Target
-
-# Name "$name - Win32 Release"
-# Name "$name - Win32 Debug"
-};
-
-        $toroot = ".";
-
-#HERE IS OUR FOREACH!
-        $file .= qq{# Begin Source File
-
-SOURCE=./server/main.c
-# End Source File
-};
-
-    if ($dsptype == 0) {
-        #HERE IS OUR ICON!
-        $icon="$toroot/build/win32/apache.ico";
-        $file .= qq{# Begin Source File
-
-SOURCE=$icon
-# End Source File
-};
-        $icon = "icon=" . $icon . " ";
-    }
-    if ($dsptype == 0 || $dsptype == 1) {
-        $file .= qq{
-# Begin Source File
-
-SOURCE=./$name.rc
-# End Source File
-# Begin Source File
-
-SOURCE=$toroot/include/ap_release.h
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating Version Resource
-InputPath=$toroot/include/ap_release.h $toroot/build/win32/win32ver.awk
-
-"./$name.rc" : \$(SOURCE) "\$(INTDIR)" "\$(OUTDIR)"
-        awk -f $toroot/build/win32/win32ver.awk $name "Apache HTTP Server" $toroot/include/ap_release.h $icon> ./Apache.rc
-
-# End Custom Build
-# End Source File
-};
-    }
-        $file .= qq{
-# End Target
-# End Project
-};
-        print $file;
-}
-
-sub dspheader {
-    if ($dsptype == 1) {
-        $midl = "MTL=midl.exe\n";
-    } else {
-        $midl = ""
-    }
-qq{# Microsoft Developer Studio Project File - Name="$name" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "$targname" $targid
-
-CFG=$name - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "$name.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "$name.mak" CFG="$name - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "$name - Win32 Release" (based on "$targname")
-!MESSAGE "$name - Win32 Debug" (based on "$targname")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-${midl}RSC=rc.exe
-};
-}
-sub dsponemodel {
-    if ($model eq "Release") {
-        $targpath = $relpath;
-    } else {
-        $targpath = $debpath;
-    }
-    if ($dsptype == 1) {
-        $midl = 
-qq{# ADD BASE MTL /nologo /D "$debugdef" /win32
-# ADD MTL /nologo /D "$debugdef" /mktyplib203 /win32
-};  }
-    if ($dsptype == 2) {
-        $linkop = qq{LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-};
-    } else {
-        $linkop = qq{LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo $lmodel $lflags /machine:I386
-# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo $lmodel $lflags /machine:I386
-};
-    }        
-
-qq{
-!${second}IF  "\$(CFG)" == "$name - Win32 $model"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries $usedebuglib
-# PROP BASE Output_Dir "$targpath"
-# PROP BASE Intermediate_Dir "$targpath"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries $usedebuglib
-# PROP Output_Dir "$targpath"
-# PROP Intermediate_Dir "$targpath"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo $cflags $cincl /D "$debugdef" $cdefs /FD /c
-# ADD CPP /nologo $cflags $cincl /D "$debugdef" $cdefs /Fd"$targpath/$name" /FD /c
-${midl}# ADD BASE RSC /l 0x409 /d "$debugdef"
-# ADD RSC /l 0x409 /d "$debugdef"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-$linkop};
-}
\ No newline at end of file
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/find_apr.m4 b/rubbos/app/httpd-2.0.64/srclib/apr/build/find_apr.m4
deleted file mode 100644
index 90865aec..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/find_apr.m4
+++ /dev/null
@@ -1,104 +0,0 @@
-dnl
-dnl find_apr.m4 : locate the APR include files and libraries
-dnl
-dnl This macro file can be used by applications to find and use the APR
-dnl library. It provides a standardized mechanism for using APR. It supports
-dnl embedding APR into the application source, or locating an installed
-dnl copy of APR.
-dnl
-dnl APR_FIND_APR([srcdir [, builddir, implicit-install-check]])
-dnl
-dnl   where srcdir is the location of the bundled APR source directory, or
-dnl   empty if source is not bundled.
-dnl
-dnl   where blddir is the location where the bundled APR will will be built,
-dnl   or empty if the build will occur in the srcdir.
-dnl
-dnl   where implicit-install-check set to 1 indicates if there is no
-dnl   --with-apr option specified, we will look for installed copies.
-dnl
-dnl Sets the following variables on exit:
-dnl
-dnl   apr_found : "yes", "no", "reconfig"
-dnl
-dnl   apr_config : If the apr-config tool exists, this refers to it. If
-dnl                apr_found is "reconfig", then the bundled directory
-dnl                should be reconfigured *before* using apr_config.
-dnl
-dnl Note: this macro file assumes that apr-config has been installed; it
-dnl       is normally considered a required part of an APR installation.
-dnl
-dnl If a bundled source directory is available and needs to be (re)configured,
-dnl then apr_found is set to "reconfig". The caller should reconfigure the
-dnl (passed-in) source directory, placing the result in the build directory,
-dnl as appropriate.
-dnl
-dnl If apr_found is "yes" or "reconfig", then the caller should use the
-dnl value of apr_config to fetch any necessary build/link information.
-dnl
-
-AC_DEFUN(APR_FIND_APR, [
-  apr_found="no"
-
-  if test "$ac_cv_emxos2" = "yes"; then
-    # Scripts don't pass test -x on OS/2
-    TEST_X="test -f"
-  else
-    TEST_X="test -x"
-  fi
-
-  AC_MSG_CHECKING(for APR)
-  AC_ARG_WITH(apr,
-  [  --with-apr=DIR|FILE     prefix for installed APR, path to APR build tree,
-                          or the full path to apr-config],
-  [
-    if test "$withval" = "no" || test "$withval" = "yes"; then
-      AC_MSG_ERROR([--with-apr requires a directory to be provided])
-    fi
-
-    if $TEST_X "$withval/bin/apr-config"; then
-      apr_found="yes"
-      apr_config="$withval/bin/apr-config"
-    elif $TEST_X "$withval/apr-config"; then
-      apr_found="yes"
-      apr_config="$withval/apr-config"
-    elif $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
-      apr_found="yes"
-      apr_config="$withval"
-    fi
-
-    dnl if --with-apr is used, then the target prefix/directory must be valid
-    if test "$apr_found" != "yes"; then
-      AC_MSG_ERROR([the --with-apr parameter is incorrect. It must specify an install prefix, a
-build directory, or an apr-config file.])
-    fi
-  ],[
-    dnl if we have a bundled source directory, use it
-    if test -d "$1"; then
-      apr_temp_abs_srcdir="`cd $1 && pwd`"
-      apr_found="reconfig"
-      if test -n "$2"; then
-        apr_config="$2/apr-config"
-      else
-        apr_config="$1/apr-config"
-      fi
-    fi
-    if test "$apr_found" = "no" && test -n "$3" && test "$3" = "1"; then
-      if apr-config --help > /dev/null 2>&1 ; then
-        apr_found="yes"
-        apr_config="apr-config"
-      else
-        dnl look in some standard places (apparently not in builtin/default)
-        for lookdir in /usr /usr/local /opt/apr /usr/local/apache2 ; do
-          if $TEST_X "$lookdir/bin/apr-config"; then
-            apr_found="yes"
-            apr_config="$lookdir/bin/apr-config"
-            break
-          fi
-        done
-      fi
-    fi
-  ])
-
-  AC_MSG_RESULT($apr_found)
-])
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/fixwin32mak.pl b/rubbos/app/httpd-2.0.64/srclib/apr/build/fixwin32mak.pl
deleted file mode 100644
index 7efdc11b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/fixwin32mak.pl
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# fixwin32mak.pl ::: Apache/Win32 maintanace program
-#
-# This program, launched from the build/ directory, replaces all nasty absoulute paths
-# in the win32 .mak files with the appropriate relative root.
-#
-# Run this program prior to committing or packaging any newly exported make files.
-
-use Cwd;
-use IO::File;
-use File::Find;
-
-$root = cwd;
-# ignore our own direcory (allowing us to move into any parallel tree)
-$root =~ s|^.:(.*)?$|cd "$1|;
-$root =~ s|/|\\\\|g;
-$altroot = $root;
-$altroot =~ s| ".:| "|;
-print "Stripping " . $root . " and " . $altroot . "\n";
-find(\&fixcwd, '.');
-
-sub fixcwd { 
-    if (m|.mak$|) {
-        $thisroot = $File::Find::dir;
-        $thisroot =~ s|^./(.*)$|$1|;
-        $thisroot =~ s|/|\\\\|g;
-        $thisroot = $root . "\\\\" . $thisroot;
-        $thisaltroot = $altroot . "\\\\" . $thisroot;
-        $oname = $_;
-        $tname = '.#' . $_;
-        $verchg = 0;
-        $srcfl = new IO::File $_, "r" || die;
-        $dstfl = new IO::File $tname, "w" || die;
-        while ($src = <$srcfl>) {
-            if ($src =~ m|^\s*($root[^\"]*)\".*$|) {
-                $orig = $thisroot;
-            } elsif ($src =~ m|^\s*($altroot[^\"]*)\".*$|) {
-                $orig = $thisaltroot;
-            }
-            if (defined($orig)) {
-                $repl = "cd \".";
-                while (!($src =~ s|$orig|$repl|)) {
-                   if (!($orig =~ s|^(.*)\\\\[^\\]+$|$1|)) {
-                       break;
-                   }
-                   $repl .= "\\..";
-                }
-                print "Replaced " . $orig . " with " . $repl . "\n";
-                $verchg = -1;
-                undef $orig;
-            }
-            print $dstfl $src; 
-        }
-        undef $srcfl;
-        undef $dstfl;
-        if ($verchg) {
-            unlink $oname || die;
-            rename $tname, $oname || die;
-            print "Corrected absolute paths within " . $oname . " in " . $File::Find::dir . "\n"; 
-        }
-        else {
-            unlink $tname;
-        }
-        $dname = $oname;
-        $dname =~ s/.mak$/.dsp/;
-        @dstat = stat($dname);
-        @ostat = stat($oname);    
-        if ($ostat[9] && $dstat[9] && ($ostat[9] != $dstat[9])) {
-            @onames = ($oname);
-            utime $dstat[9], $dstat[9], @onames;
-            print "Touched datestamp for " . $oname . " in " . $File::Find::dir . "\n"; 
-        }
-        $oname =~ s/.mak$/.dep/;
-        @ostat = stat($oname);    
-        if ($ostat[9] && $dstat[9] && ($ostat[9] != $dstat[9])) {
-            @onames = ($oname);
-            utime $dstat[9], $dstat[9], @onames;
-            print "Touched datestamp for " . $oname . " in " . $File::Find::dir . "\n"; 
-        }
-    }
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/get-version.sh b/rubbos/app/httpd-2.0.64/srclib/apr/build/get-version.sh
deleted file mode 100755
index fd685b22..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/get-version.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# extract version numbers from a header file
-#
-# USAGE: get-version.sh CMD VERSION_HEADER PREFIX
-#   where CMD is one of: all, major, libtool
-#   where PREFIX is the prefix to {MAJOR|MINOR|PATCH}_VERSION defines
-#
-#   get-version.sh all returns a dotted version number
-#   get-version.sh major returns just the major version number
-#   get-version.sh libtool returns a version "libtool -version-info" format
-#
-
-if test $# != 3; then
-  echo "USAGE: $0 CMD VERSION_HEADER PREFIX"
-  echo "  where CMD is one of: all, major, libtool"
-  exit 1
-fi
-
-major_sed="/#define.*$3_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p"
-minor_sed="/#define.*$3_MINOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p"
-patch_sed="/#define.*$3_PATCH_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p"
-major="`sed -n $major_sed $2`"
-minor="`sed -n $minor_sed $2`"
-patch="`sed -n $patch_sed $2`"
-
-if test "$1" = "all"; then
-  echo ${major}.${minor}.${patch}
-elif test "$1" = "major"; then
-  echo ${major}
-elif test "$1" = "libtool"; then
-  # Yes, ${minor}:${patch}:${minor} is correct due to libtool idiocy.
-  echo ${minor}:${patch}:${minor}
-else
-  echo "ERROR: unknown version CMD ($1)"
-  exit 1
-fi
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/install.sh b/rubbos/app/httpd-2.0.64/srclib/apr/build/install.sh
deleted file mode 100755
index 9a8821fa..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/install.sh
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/sh
-##
-##  install.sh -- install a program, script or datafile
-##
-##  Based on `install-sh' from the X Consortium's X11R5 distribution
-##  as of 89/12/18 which is freely available.
-##  Cleaned up for Apache's Autoconf-style Interface (APACI)
-##  by Ralf S. Engelschall <rse@apache.org>
-##
-#
-# This script falls under the Apache License.
-# See http://www.apache.org/docs/LICENSE
-
-
-#
-#   put in absolute paths if you don't have them in your path; 
-#   or use env. vars.
-#
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-
-#
-#   parse argument line
-#
-instcmd="$mvprog"
-chmodcmd=""
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-ext=""
-src=""
-dst=""
-while [ "x$1" != "x" ]; do
-    case $1 in
-        -c) instcmd="$cpprog"
-            shift; continue
-            ;;
-        -m) chmodcmd="$chmodprog $2"
-            shift; shift; continue
-            ;;
-        -o) chowncmd="$chownprog $2"
-            shift; shift; continue
-            ;;
-        -g) chgrpcmd="$chgrpprog $2"
-            shift; shift; continue
-            ;;
-        -s) stripcmd="$stripprog"
-            shift; continue
-            ;;
-        -S) stripcmd="$stripprog $2"
-            shift; shift; continue
-            ;;
-        -e) ext="$2"
-            shift; shift; continue
-            ;;
-        *)  if [ "x$src" = "x" ]; then
-                src=$1
-            else
-                dst=$1
-            fi
-            shift; continue
-            ;;
-    esac
-done
-if [ "x$src" = "x" ]; then
-     echo "install.sh: no input file specified"
-     exit 1
-fi
-if [ "x$dst" = "x" ]; then
-     echo "install.sh: no destination specified"
-     exit 1
-fi
-
-#
-#  If destination is a directory, append the input filename; if
-#  your system does not like double slashes in filenames, you may
-#  need to add some logic
-#
-if [ -d $dst ]; then
-    dst="$dst/`basename $src`"
-fi
-
-#  Add a possible extension (such as ".exe") to src and dst
-src="$src$ext"
-dst="$dst$ext"
-
-#  Make a temp file name in the proper directory.
-dstdir=`dirname $dst`
-dsttmp=$dstdir/#inst.$$#
-
-#  Move or copy the file name to the temp name
-$instcmd $src $dsttmp
-
-#  And set any options; do chmod last to preserve setuid bits
-if [ "x$chowncmd" != "x" ]; then $chowncmd $dsttmp; fi
-if [ "x$chgrpcmd" != "x" ]; then $chgrpcmd $dsttmp; fi
-if [ "x$stripcmd" != "x" ]; then $stripcmd $dsttmp; fi
-if [ "x$chmodcmd" != "x" ]; then $chmodcmd $dsttmp; fi
-
-#  Now rename the file to the real destination.
-$rmcmd $dst
-$mvcmd $dsttmp $dst
-
-exit 0
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/libapr_app.dsp b/rubbos/app/httpd-2.0.64/srclib/apr/build/libapr_app.dsp
deleted file mode 100644
index 2067fe30..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/libapr_app.dsp
+++ /dev/null
@@ -1,93 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libapr_app" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libapr_app - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libapr_app.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libapr_app.mak" CFG="libapr_app - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libapr_app - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libapr_app - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libapr_app - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /Fd"Release\libapr_app_src" /FD /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "libapr_app - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../include" /I "../include/arch" /I "../include/arch/win32" /I "../include/arch/unix" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APR_APP" /Fd"Debug\libapr_app_src" /FD /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libapr_app - Win32 Release"
-# Name "libapr_app - Win32 Debug"
-# Begin Source File
-
-SOURCE=..\misc\win32\apr_app.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\misc\win32\internal.c
-# End Source File
-# End Target
-# End Project
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/libtool.m4 b/rubbos/app/httpd-2.0.64/srclib/apr/build/libtool.m4
deleted file mode 100644
index 1b0d7c9f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/libtool.m4
+++ /dev/null
@@ -1,6659 +0,0 @@
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007,
-## 2008  Free Software Foundation, Inc.
-## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-##
-## This file is free software; the Free Software Foundation gives
-## unlimited permission to copy and/or distribute it, with or without
-## modifications, as long as this notice is preserved.
-
-# serial 52 AC_PROG_LIBTOOL
-
-
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
-         [],
-         [m4_define([AC_PROVIDE_IFELSE],
-	         [m4_ifdef([AC_PROVIDE_$1],
-		           [$2], [$3])])])
-
-
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-  ])])
-dnl And a similar setup for Fortran 77 support
-  AC_PROVIDE_IFELSE([AC_PROG_F77],
-    [AC_LIBTOOL_F77],
-    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-      [AC_LIBTOOL_GCJ],
-      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	[AC_LIBTOOL_GCJ],
-      [ifdef([AC_PROG_GCJ],
-	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([A][M_PROG_GCJ],
-	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([LT_AC_PROG_GCJ],
-	     [define([LT_AC_PROG_GCJ],
-		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
-
-
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(apr_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
-
-
-# AC_LIBTOOL_SETUP
-# ----------------
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
-
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-
-# Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-_LT_REQUIRED_DARWIN_CHECKS
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-enable_win32_dll=yes, enable_win32_dll=no)
-
-AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-AC_ARG_WITH([pic],
-    [AC_HELP_STRING([--with-pic],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
-    [pic_mode=default])
-test -z "$pic_mode" && pic_mode=default
-
-# Use C for the default configuration in the libtool script
-tagname=
-AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
-])# AC_LIBTOOL_SETUP
-
-
-# _LT_AC_SYS_COMPILER
-# -------------------
-AC_DEFUN([_LT_AC_SYS_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_AC_SYS_COMPILER
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-AC_DEFUN([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# --------------------------
-# Check for some things on darwin
-AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-   # By default we will add the -single_module flag. You can override
-   # by either setting the environment variable LT_MULTI_MODULE
-   # non-empty at configure time, or by adding -multi_module to the
-   # link flags.
-   echo "int foo(void){return 1;}" > conftest.c
-   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-     -dynamiclib ${wl}-single_module conftest.c
-   if test -f libconftest.dylib; then
-     lt_cv_apple_cc_single_mod=yes
-     rm -rf libconftest.dylib*
-   fi
-   rm conftest.c
-      fi])
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-   [lt_cv_ld_exported_symbols_list=yes],
-   [lt_cv_ld_exported_symbols_list=no])
-   LDFLAGS="$save_LDFLAGS"
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[0123]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*)
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-   10.[[012]]*)
-     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-   10.*)
-     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-    fi
-    if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil="~$DSYMUTIL \$lib || :"
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
-
-# _LT_AC_SYS_LIBPATH_AIX
-# ----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_AC_SYS_LIBPATH_AIX
-
-
-# _LT_AC_SHELL_INIT(ARG)
-# ----------------------
-AC_DEFUN([_LT_AC_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-	 [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_AC_SHELL_INIT
-
-
-# _LT_AC_PROG_ECHO_BACKSLASH
-# --------------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-[_LT_AC_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-echo=${ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-[$]*
-EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "[$]0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(ECHO)
-])])# _LT_AC_PROG_ECHO_BACKSLASH
-
-
-# _LT_AC_LOCK
-# -----------
-AC_DEFUN([_LT_AC_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-   fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *32-bit*)
-      case $host in
-        x86_64-*kfreebsd*-gnu)
-          LD="${LD-ld} -m elf_i386_fbsd"
-          ;;
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      libsuff=64
-      case $host in
-        x86_64-*kfreebsd*-gnu)
-          LD="${LD-ld} -m elf_x86_64_fbsd"
-          ;;
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-  ])
-esac
-
-need_locks="$enable_libtool_lock"
-
-])# _LT_AC_LOCK
-
-
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $rm conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$5], , :, [$5])
-else
-    ifelse([$6], , :, [$6])
-fi
-])# AC_LIBTOOL_COMPILER_OPTION
-
-
-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                          [ACTION-SUCCESS], [ACTION-FAILURE])
-# ------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $rm -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$4], , :, [$4])
-else
-    ifelse([$5], , :, [$5])
-fi
-])# AC_LIBTOOL_LINKER_OPTION
-
-
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
-# --------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-[# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-	       = "XX$teststring") >/dev/null 2>&1 &&
-	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	      lt_cv_sys_max_cmd_len=$new_result &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on massive
-      # amounts of additional arguments before passing them to the linker.
-      # It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-
-
-# _LT_AC_CHECK_DLFCN
-# ------------------
-AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)dnl
-])# _LT_AC_CHECK_DLFCN
-
-
-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ---------------------------------------------------------------------
-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-    exit (status);
-}]
-EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_AC_TRY_DLOPEN_SELF
-
-
-# AC_LIBTOOL_DLOPEN_SELF
-# ----------------------
-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-   ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-    	  lt_cv_dlopen_self_static, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-])# AC_LIBTOOL_DLOPEN_SELF
-
-
-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-# ---------------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler
-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-])
-])# AC_LIBTOOL_PROG_CC_C_O
-
-
-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-# -----------------------------------------
-# Check to see if we can do hard links to lock some files if needed
-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-[AC_REQUIRE([_LT_AC_LOCK])dnl
-
-hard_links="nottested"
-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-
-
-# AC_LIBTOOL_OBJDIR
-# -----------------
-AC_DEFUN([AC_LIBTOOL_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-])# AC_LIBTOOL_OBJDIR
-
-
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-# ----------------------------------------------
-# Check hardcoding attributes.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_AC_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_AC_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-
-
-# AC_LIBTOOL_SYS_LIB_STRIP
-# ------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
-[striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         old_striplib="$STRIP -S"
-         AC_MSG_RESULT([yes])
-       else
-  AC_MSG_RESULT([no])
-fi
-       ;;
-   *)
-  AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-])# AC_LIBTOOL_SYS_LIB_STRIP
-
-
-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-m4_if($1,[],[
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
-  sys_lib_search_path_spec=`echo $lt_search_path_spec`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[[4-9]]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix[[3-9]]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
-[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
-[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
-
-# _LT_AC_TAGCONFIG
-# ----------------
-AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_ARG_WITH([tags],
-    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
-        [include additional configurations @<:@automatic@:>@])],
-    [tagnames="$withval"])
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    AC_MSG_WARN([output file `$ofile' does not exist])
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
-    else
-      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-    fi
-  fi
-  if test -z "$LTCFLAGS"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-  fi
-
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
-    IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
-    "") ;;
-    *)  AC_MSG_ERROR([invalid tag name: $tagname])
-	;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      AC_MSG_ERROR([tag name \"$tagname\" already exists])
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      case $tagname in
-      CXX)
-	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-	    (test "X$CXX" != "Xg++"))) ; then
-	  AC_LIBTOOL_LANG_CXX_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-	  AC_LIBTOOL_LANG_F77_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      GCJ)
-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-	  AC_LIBTOOL_LANG_GCJ_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      RC)
-	AC_LIBTOOL_LANG_RC_CONFIG
-	;;
-
-      *)
-	AC_MSG_ERROR([Unsupported tag name: $tagname])
-	;;
-      esac
-
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    AC_MSG_ERROR([unable to update list of available tagged configurations.])
-  fi
-fi
-])# _LT_AC_TAGCONFIG
-
-
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_DLOPEN
-
-
-# AC_LIBTOOL_WIN32_DLL
-# --------------------
-# declare package support for building win32 DLLs
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_WIN32_DLL
-
-
-# AC_ENABLE_SHARED([DEFAULT])
-# ---------------------------
-# implement the --enable-shared flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([shared],
-    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-])# AC_ENABLE_SHARED
-
-
-# AC_DISABLE_SHARED
-# -----------------
-# set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)
-])# AC_DISABLE_SHARED
-
-
-# AC_ENABLE_STATIC([DEFAULT])
-# ---------------------------
-# implement the --enable-static flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([static],
-    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-])# AC_ENABLE_STATIC
-
-
-# AC_DISABLE_STATIC
-# -----------------
-# set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)
-])# AC_DISABLE_STATIC
-
-
-# AC_ENABLE_FAST_INSTALL([DEFAULT])
-# ---------------------------------
-# implement the --enable-fast-install flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([fast-install],
-    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-])# AC_ENABLE_FAST_INSTALL
-
-
-# AC_DISABLE_FAST_INSTALL
-# -----------------------
-# set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)
-])# AC_DISABLE_FAST_INSTALL
-
-
-# AC_LIBTOOL_PICMODE([MODE])
-# --------------------------
-# implement the --with-pic flag
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)
-])# AC_LIBTOOL_PICMODE
-
-
-# AC_PROG_EGREP
-# -------------
-# This is predefined starting with Autoconf 2.54, so this conditional
-# definition can be removed once we require Autoconf 2.54 or later.
-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi])
- EGREP=$ac_cv_prog_egrep
- AC_SUBST([EGREP])
-])])
-
-
-# AC_PATH_TOOL_PREFIX
-# -------------------
-# find a file program which can recognize shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])# AC_PATH_TOOL_PREFIX
-
-
-# AC_PATH_MAGIC
-# -------------
-# find a file program which can recognize a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# AC_PATH_MAGIC
-
-
-# AC_PROG_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
-    [AC_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])
-AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])# AC_PROG_LD
-
-
-# AC_PROG_LD_GNU
-# --------------
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# AC_PROG_LD_GNU
-
-
-# AC_PROG_LD_RELOAD_FLAG
-# ----------------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-])# AC_PROG_LD_RELOAD_FLAG
-
-
-# AC_DEPLIBS_CHECK_METHOD
-# -----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognize dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[[4-9]]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[[45]]*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[[3-9]]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-])# AC_DEPLIBS_CHECK_METHOD
-
-
-# AC_PROG_NM
-# ----------
-# find the pathname to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-])# AC_PROG_NM
-
-
-# AC_CHECK_LIBM
-# -------------
-# check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-])# AC_CHECK_LIBM
-
-
-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl convenience library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
-# (note the single quotes!).  If your package is not flat and you're not
-# using automake, define top_builddir and top_srcdir appropriately in
-# the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_CONVENIENCE
-
-
-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl installable library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# and an installed libltdl is not found, it is assumed to be `libltdl'.
-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and top_srcdir
-# appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, lt_dlinit,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    LTDLINCL=
-  fi
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_INSTALLABLE
-
-
-# AC_LIBTOOL_CXX
-# --------------
-# enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX],
-[AC_REQUIRE([_LT_AC_LANG_CXX])
-])# AC_LIBTOOL_CXX
-
-
-# _LT_AC_LANG_CXX
-# ---------------
-AC_DEFUN([_LT_AC_LANG_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-])# _LT_AC_LANG_CXX
-
-# _LT_AC_PROG_CXXCPP
-# ------------------
-AC_DEFUN([_LT_AC_PROG_CXXCPP],
-[
-AC_REQUIRE([AC_PROG_CXX])
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-fi
-])# _LT_AC_PROG_CXXCPP
-
-# AC_LIBTOOL_F77
-# --------------
-# enable support for Fortran 77 libraries
-AC_DEFUN([AC_LIBTOOL_F77],
-[AC_REQUIRE([_LT_AC_LANG_F77])
-])# AC_LIBTOOL_F77
-
-
-# _LT_AC_LANG_F77
-# ---------------
-AC_DEFUN([_LT_AC_LANG_F77],
-[AC_REQUIRE([AC_PROG_F77])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-])# _LT_AC_LANG_F77
-
-
-# AC_LIBTOOL_GCJ
-# --------------
-# enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],
-[AC_REQUIRE([_LT_AC_LANG_GCJ])
-])# AC_LIBTOOL_GCJ
-
-
-# _LT_AC_LANG_GCJ
-# ---------------
-AC_DEFUN([_LT_AC_LANG_GCJ],
-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
-])# _LT_AC_LANG_GCJ
-
-
-# AC_LIBTOOL_RC
-# -------------
-# enable support for Windows resource files
-AC_DEFUN([AC_LIBTOOL_RC],
-[AC_REQUIRE([LT_AC_PROG_RC])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-])# AC_LIBTOOL_RC
-
-
-# AC_LIBTOOL_LANG_C_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-[lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF
-
-# Report which library types will actually be built
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix[[4-9]]*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-    ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_C_CONFIG
-
-
-# AC_LIBTOOL_LANG_CXX_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
-[AC_LANG_PUSH(C++)
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Dependencies to place before and after the object being linked:
-_LT_AC_TAGVAR(predep_objects, $1)=
-_LT_AC_TAGVAR(postdep_objects, $1)=
-_LT_AC_TAGVAR(predeps, $1)=
-_LT_AC_TAGVAR(postdeps, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
-  $as_unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
-  lt_cv_path_LD=$lt_cv_path_LDCXX
-else
-  $as_unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-else
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-fi
-
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
-
-  AC_PROG_LD
-
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if test "$with_gnu_ld" = yes; then
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-    #     investigate it a little bit more. (MM)
-    wlarc='${wl}'
-
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-	grep 'no-whole-archive' > /dev/null; then
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    with_gnu_ld=no
-    wlarc=
-
-    # A generic and very simple default shared library creation
-    # command for GNU C++ for the case where it uses the native
-    # linker, instead of GNU ld.  If possible, this setting should
-    # overridden to take advantage of the native linker features on
-    # the platform it is being used on.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
-
-  # Commands to make compiler produce verbose output that lists
-  # what "hidden" libraries, object files and flags are used when
-  # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-else
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  aix[[4-9]]*)
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
-
-      # Test if we are trying to use run time linking or normal
-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-      # need to do runtime linking.
-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	for ld_flag in $LDFLAGS; do
-	  case $ld_flag in
-	  *-brtl*)
-	    aix_use_runtimelinking=yes
-	    break
-	    ;;
-	  esac
-	done
-	;;
-      esac
-
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-    _LT_AC_TAGVAR(archive_cmds, $1)=''
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    if test "$GXX" = yes; then
-      case $host_os in aix4.[[012]]|aix4.[[012]].*)
-      # We only want to do this on AIX 4.2 and lower, the check
-      # below for broken collect2 doesn't work under 4.3+
-	collect2name=`${CC} -print-prog-name=collect2`
-	if test -f "$collect2name" && \
-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	then
-	  # We have reworked collect2
-	  :
-	else
-	  # We have old collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	fi
-	;;
-      esac
-      shared_flag='-shared'
-      if test "$aix_use_runtimelinking" = yes; then
-	shared_flag="$shared_flag "'${wl}-G'
-      fi
-    else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	shared_flag='-G'
-      else
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='${wl}-G'
-	else
-	  shared_flag='${wl}-bM:SRE'
-	fi
-      fi
-    fi
-
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      _LT_AC_SYS_LIBPATH_AIX
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-      if test "$host_cpu" = ia64; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-      else
-	# Determine the default libpath from the value encoded in an empty executable.
-	_LT_AC_SYS_LIBPATH_AIX
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	# Warning - without using the other run time loading flags,
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	# Exported symbols can be pulled into shared objects from archives
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	# This is similar to how AIX traditionally builds its shared libraries.
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-      fi
-    fi
-    ;;
-
-  beos*)
-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-      # support --undefined.  This deserves some investigation.  FIXME
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-    ;;
-
-  chorus*)
-    case $cc_basename in
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-    # as there is no search path for DLLs.
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      # If the export-symbols file already is a .def file (1st line
-      # is EXPORTS), use it as is; otherwise, prepend...
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	cp $export_symbols $output_objdir/$soname.def;
-      else
-	echo EXPORTS > $output_objdir/$soname.def;
-	cat $export_symbols >> $output_objdir/$soname.def;
-      fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-  ;;
-      darwin* | rhapsody*)
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-      if test "$GXX" = yes ; then
-      output_verbose_link_cmd='echo'
-      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-      fi
-      else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-          ;;
-      esac
-      fi
-        ;;
-
-  dgux*)
-    case $cc_basename in
-      ec++*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      ghcx*)
-	# Green Hills C++ Compiler
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  freebsd[[12]]*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  freebsd-elf*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    ;;
-  freebsd* | dragonfly*)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				# but as the default
-				# location of the library.
-
-    case $cc_basename in
-    CC*)
-      # FIXME: insert proper C++ library support
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    aCC*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      #
-      # There doesn't appear to be a way to prevent this compiler from
-      # explicitly linking system object files so we need to strip them
-      # from the output so that they don't get included in the library
-      # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-      ;;
-    *)
-      if test "$GXX" = yes; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-        # FIXME: insert proper C++ library support
-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-      case $host_cpu in
-      hppa*64*|ia64*) ;;
-      *)
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        ;;
-      esac
-    fi
-    case $host_cpu in
-    hppa*64*|ia64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-    *)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    esac
-
-    case $cc_basename in
-      CC*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      aCC*)
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	esac
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test $with_gnu_ld = no; then
-	    case $host_cpu in
-	    hppa*64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    ia64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    esac
-	  fi
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  interix[[3-9]]*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-    # Instead, shared libraries are loaded at an image base (0x10000000 by
-    # default) and relocated if they conflict, which is a slow very memory
-    # consuming and fragmenting process.  To avoid this, we pick a random,
-    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC*)
-	# SGI C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	# Archives containing C++ object files must be created using
-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test "$with_gnu_ld" = no; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	  else
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-	  fi
-	fi
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-	;;
-    esac
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    ;;
-  linux* | k*bsd*-gnu)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	;;
-      icpc*)
-	# Intel C++
-	with_gnu_ld=yes
-	# version 8.0 and above of icpc choke on multiply defined symbols
-	# if we add $predep_objects and $postdep_objects, however 7.1 and
-	# earlier do not add the objects themselves.
-	case `$CC -V 2>&1` in
-	*"Version 7."*)
-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	*)  # Version 8.0 or newer
-	  tmp_idyn=
-	  case $host_cpu in
-	    ia64*) tmp_idyn=' -i_dynamic';;
-	  esac
-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	esac
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	;;
-      pgCC* | pgcpp*)
-        # Portland Group C++ compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-        ;;
-      cxx*)
-	# Compaq C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	runpath_var=LD_RUN_PATH
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C++ 5.9
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-
-	  # Not sure whether something based on
-	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	  # would be better.
-	  output_verbose_link_cmd='echo'
-
-	  # Archives containing C++ object files must be created using
-	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	  # necessary to make sure instantiated templates are included
-	  # in the archive.
-	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	  ;;
-	esac
-	;;
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  netbsd*)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-    ;;
-  openbsd2*)
-    # C++ shared libraries are fairly broken
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  openbsd*)
-    if test -f /usr/libexec/ld.so; then
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      fi
-      output_verbose_link_cmd='echo'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-    ;;
-  osf3*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx*)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  osf4* | osf5*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx*)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
-	  $rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.x
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      lcc*)
-	# Lucid
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.2, 5.x and Centerline C++
-        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	case $host_os in
-	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	  *)
-	    # The compiler driver will combine and reorder linker options,
-	    # but understands `-z linker_flag'.
-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	    ;;
-	esac
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-	output_verbose_link_cmd='echo'
-
-	# Archives containing C++ object files must be created using
-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	;;
-      gcx*)
-	# Green Hills C++ Compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	# The C++ compiler must be used to create the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	;;
-      *)
-	# GNU C++ compiler with Solaris linker
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  else
-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	    # platform.
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  fi
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	  case $host_os in
-	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	  *)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	    ;;
-	  esac
-	fi
-	;;
-    esac
-    ;;
-  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  sysv5* | sco3.2v5* | sco5v6*)
-    # Note: We can NOT use -z defs as we might desire, because we do not
-    # link with -lc, and that would cause any symbols used from libc to
-    # always be unresolved, which means just about no library would
-    # ever link correctly.  If we're not using GNU ld we use -z text
-    # though, which does catch some bad symbols but isn't as heavy-handed
-    # as -z defs.
-    # For security reasons, it is highly recommended that you always
-    # use absolute paths for naming shared libraries, and exclude the
-    # DT_RUNPATH tag from executables and libraries.  But doing so
-    # requires that you compile everything twice, which is a pain.
-    # So that behaviour is only enabled if SCOABSPATH is set to a
-    # non-empty value in the environment.  Most likely only useful for
-    # creating official distributions of packages.
-    # This is a hack until libtool officially supports absolute path
-    # names for shared libraries.
-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC*)
-	# NonStop-UX NCC 3.20
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-esac
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_AC_TAGVAR(GCC, $1)="$GXX"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-AC_LIBTOOL_POSTDEP_PREDEP($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-])# AC_LIBTOOL_LANG_CXX_CONFIG
-
-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
-int a;
-void foo (void) { a = 0; }
-EOF
-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-EOF
-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-
-  for p in `eval $output_verbose_link_cmd`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" \
-	  || test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
-	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
-	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$rm -f confest.$objext
-
-_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-
-# PORTME: override above test on systems where it is broken
-ifelse([$1],[CXX],
-[case $host_os in
-interix[[3-9]]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_AC_TAGVAR(predep_objects,$1)=
-  _LT_AC_TAGVAR(postdep_objects,$1)=
-  _LT_AC_TAGVAR(postdeps,$1)=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-    #
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-])
-case " $_LT_AC_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
-])# AC_LIBTOOL_POSTDEP_PREDEP
-
-# AC_LIBTOOL_LANG_F77_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-[AC_REQUIRE([AC_PROG_F77])
-AC_LANG_PUSH(Fortran 77)
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="\
-      program t
-      end
-"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-aix[[4-9]]*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-_LT_AC_TAGVAR(GCC, $1)="$G77"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_F77_CONFIG
-
-
-# AC_LIBTOOL_LANG_GCJ_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_GCJ_CONFIG
-
-
-# AC_LIBTOOL_LANG_RC_CONFIG
-# -------------------------
-# Ensure that the configuration vars for the Windows resource compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_RC_CONFIG
-
-
-# AC_LIBTOOL_CONFIG([TAGNAME])
-# ----------------------------
-# If TAGNAME is not passed, then create an initial libtool script
-# with a default configuration from the untagged config vars.  Otherwise
-# add code to config.status for appending the configuration named by
-# TAGNAME from the matching tagged config vars.
-AC_DEFUN([AC_LIBTOOL_CONFIG],
-[# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    _LT_AC_TAGVAR(compiler, $1) \
-    _LT_AC_TAGVAR(CC, $1) \
-    _LT_AC_TAGVAR(LD, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
-    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
-    _LT_AC_TAGVAR(old_archive_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
-    _LT_AC_TAGVAR(predep_objects, $1) \
-    _LT_AC_TAGVAR(postdep_objects, $1) \
-    _LT_AC_TAGVAR(predeps, $1) \
-    _LT_AC_TAGVAR(postdeps, $1) \
-    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
-    _LT_AC_TAGVAR(archive_cmds, $1) \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(postinstall_cmds, $1) \
-    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
-    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
-    _LT_AC_TAGVAR(no_undefined_flag, $1) \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
-    _LT_AC_TAGVAR(hardcode_automatic, $1) \
-    _LT_AC_TAGVAR(module_cmds, $1) \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
-    _LT_AC_TAGVAR(exclude_expsyms, $1) \
-    _LT_AC_TAGVAR(include_expsyms, $1); do
-
-    case $var in
-    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(module_cmds, $1) | \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\[$]0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
-    ;;
-  esac
-
-ifelse([$1], [],
-  [cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  AC_MSG_NOTICE([creating $ofile])],
-  [cfgfile="$ofile"])
-
-  cat <<__EOF__ >> "$cfgfile"
-ifelse([$1], [],
-[#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e 1s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG],
-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-
-# Is the compiler the GNU C compiler?
-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-
-# Symbols that must always be exported.
-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
-
-ifelse([$1],[],
-[# ### END LIBTOOL CONFIG],
-[# ### END LIBTOOL TAG CONFIG: $tagname])
-
-__EOF__
-
-ifelse([$1],[], [
-  case $host_os in
-  aix3*)
-    cat <<\EOF >> "$cfgfile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-    ;;
-  esac
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-])
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-])# AC_LIBTOOL_CONFIG
-
-
-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-
-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
-
-
-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-# ---------------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([LT_AC_PROG_SED])
-AC_REQUIRE([AC_PROG_NM])
-AC_REQUIRE([AC_OBJEXT])
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-linux* | k*bsd*-gnu)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDGIRSTW]]'
-    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[[]] =
-{
-EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-
-
-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-# ---------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
-
-AC_MSG_CHECKING([for $compiler option to produce PIC])
- ifelse([$1],[CXX],[
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[[4-9]]*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-       darwin*)
-         # PIC is the default on this platform
-         # Common symbols not allowed in MH_DYLIB files
-         case $cc_basename in
-           xlc*)
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           ;;
-         esac
-       ;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  icpc* | ecpc*)
-	    # Intel C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler.
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-         ;;
-       esac
-       ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      m4_if([$1], [GCJ], [],
-	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    linux* | k*bsd*-gnu)
-      case $cc_basename in
-      icc* | ecc*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      *)
-        case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C 5.9
-	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
-    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-])
-
-
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
-# See if the linker supports building shared libraries.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-ifelse([$1],[CXX],[
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix[[4-9]]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
-  cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-  ;;
-  *)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-],[
-  runpath_var=
-  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_AC_TAGVAR(archive_cmds, $1)=
-  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
-  _LT_AC_TAGVAR(module_cmds, $1)=
-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(always_export_symbols, $1)=no
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_AC_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  _LT_CC_BASENAME([$compiler])
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[[3-9]]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    interix[[3-9]]*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | k*bsd*-gnu)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
-	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	*)
-	  tmp_sharedflag='-shared' ;;
-	esac
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-	if test $supports_anon_versioning = yes; then
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-	  else
-	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix[[4-9]]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_AC_TAGVAR(archive_cmds, $1)=''
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  :
-	  else
-  	  # We have old collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       _LT_AC_SYS_LIBPATH_AIX
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 _LT_AC_SYS_LIBPATH_AIX
-	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      # see comment about different semantics on the GNU ld section
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    bsdi[[45]]*)
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    freebsd1*)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	     ;;
-	   *)
-	     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-        fi
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	wlarc=''
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_AC_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $rm conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
-      ;;
-    esac
-  fi
-  ;;
-esac
-])# AC_LIBTOOL_PROG_LD_SHLIBS
-
-
-# _LT_AC_FILE_LTDLL_C
-# -------------------
-# Be careful that the start marker always follows a newline.
-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
-# /* ltdll.c starts here */
-# #define WIN32_LEAN_AND_MEAN
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
-#
-# #ifndef __CYGWIN__
-# #  ifdef __CYGWIN32__
-# #    define __CYGWIN__ __CYGWIN32__
-# #  endif
-# #endif
-#
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-# #ifdef __cplusplus
-# }
-# #endif
-#
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
-#
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
-#   __hDllInstance_base = hInst;
-#   return TRUE;
-# }
-# /* ltdll.c ends here */
-])# _LT_AC_FILE_LTDLL_C
-
-
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-# ---------------------------------
-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-
-
-# old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
-])
-
-
-# Cheap backport of AS_EXECUTABLE_P and required macros
-# from Autoconf 2.59; we should not use $as_executable_p directly.
-
-# _AS_TEST_PREPARE
-# ----------------
-m4_ifndef([_AS_TEST_PREPARE],
-[m4_defun([_AS_TEST_PREPARE],
-[if test -x / >/dev/null 2>&1; then
-  as_executable_p='test -x'
-else
-  as_executable_p='test -f'
-fi
-])])# _AS_TEST_PREPARE
-
-# AS_EXECUTABLE_P
-# ---------------
-# Check whether a file is executable.
-m4_ifndef([AS_EXECUTABLE_P],
-[m4_defun([AS_EXECUTABLE_P],
-[AS_REQUIRE([_AS_TEST_PREPARE])dnl
-$as_executable_p $1[]dnl
-])])# AS_EXECUTABLE_P
-
-############################################################
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-############################################################
-# LT_AC_PROG_SED
-# --------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-AC_DEFUN([LT_AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/lineends.pl b/rubbos/app/httpd-2.0.64/srclib/apr/build/lineends.pl
deleted file mode 100644
index 3e3067f7..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/lineends.pl
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/usr/local/bin/perl
-#
-#  Heuristically converts line endings to the current OS's preferred format
-#  
-#  All existing line endings must be identical (e.g. lf's only, or even
-#  the accedental cr.cr.lf sequence.)  If some lines end lf, and others as
-#  cr.lf, the file is presumed binary.  If the cr character appears anywhere
-#  except prefixed to an lf, the file is presumed binary.  If there is no 
-#  change in the resulting file size, or the file is binary, the conversion 
-#  is discarded.
-#  
-#  Todo: Handle NULL stdin characters gracefully.
-#
-
-use IO::File;
-use File::Find;
-
-# The ignore list is '-' seperated, with this leading hyphen and
-# trailing hyphens in ever concatinated list below.
-$ignore = "-";
-
-# Image formats
-$ignore .= "gif-jpg-jpeg-png-ico-bmp-";
-
-# Archive formats
-$ignore .= "tar-gz-z-zip-jar-war-bz2-tgz-";
-
-# Many document formats
-$ignore .= "eps-psd-pdf-chm-ai-";
-
-# Some encodings
-$ignore .= "ucs2-ucs4-";
-
-# Some binary objects
-$ignore .= "class-so-dll-exe-obj-lib-a-o-lo-slo-sl-dylib-";
-
-# Some build env files 
-$ignore .= "mcp-xdc-ncb-opt-pdb-ilk-exp-res-pch-idb-sbr-";
-
-$preservedate = 1;
-
-$forceending = 0;
-
-$givenpaths = 0;
-
-$notnative = 0;
-
-while (defined @ARGV[0]) {
-    if (@ARGV[0] eq '--touch') {
-        $preservedate = 0;
-    }
-    elsif (@ARGV[0] eq '--nocr') {
-        $notnative = -1;
-    }
-    elsif (@ARGV[0] eq '--cr') {
-        $notnative = 1;
-    }
-    elsif (@ARGV[0] eq '--force') {
-        $forceending = 1;
-    }
-    elsif (@ARGV[0] eq '--FORCE') {
-        $forceending = 2;
-    }
-    elsif (@ARGV[0] =~ m/^-/) {
-        die "What is " . @ARGV[0] . " supposed to mean?\n\n" 
-          . "Syntax:\t$0 [option()s] [path(s)]\n\n" . <<'OUTCH'
-Where:  paths specifies the top level directory to convert (default of '.')
-        options are;
-
-          --cr     keep/add one ^M
-          --nocr   remove ^M's
-          --touch  the datestamp (default: keeps date/attribs)
-          --force  mismatched corrections (unbalanced ^M's)
-          --FORCE  all files regardless of file name!
-
-OUTCH
-    }
-    else {
-        find(\&totxt, @ARGV[0]);
-        print "scanned " . @ARGV[0] . "\n";
-        $givenpaths = 1;
-    }
-    shift @ARGV;
-}
-
-if (!$givenpaths) {
-    find(\&totxt, '.');
-    print "did .\n";
-}
-
-sub totxt {
-        $oname = $_;
-        $tname = '.#' . $_;
-        if (!-f) {
-            return;
-        }
-        @exts = split /\./;
-        if ($forceending < 2) {
-            while ($#exts && ($ext = pop(@exts))) {
-                if ($ignore =~ m|-$ext-|i) {
-                    return;
-                }
-            }
-        }
-        return if ($File::Find::dir =~ m|^(.+/)?.svn(/.+)?$|);
-        @ostat = stat($oname);
-        $srcfl = new IO::File $oname, "r" or die;
-        $dstfl = new IO::File $tname, "w" or die;
-        binmode $srcfl; 
-        if ($notnative) {
-            binmode $dstfl;
-        }
-        undef $t;
-        while (<$srcfl>) { 
-            if (s/(\r*)\n$/\n/) {
-                $n = length $1;
-                if (!defined $t) { 
-                    $t = $n; 
-                }
-                if (!$forceending && (($n != $t) || m/\r/)) {
-                    print "mismatch in " .$oname. ":" .$n. " expected " .$t. "\n";
-                    undef $t;
-                    last;
-                }
-                elsif ($notnative > 0) {
-                    s/\n$/\r\n/; 
-                }
-            }
-            print $dstfl $_; 
-        }
-        if (defined $t && (tell $srcfl == tell $dstfl)) {
-            undef $t;
-        }
-        undef $srcfl;
-        undef $dstfl;
-        if (defined $t) {
-            unlink $oname or die;
-            rename $tname, $oname or die;
-            @anames = ($oname);
-            if ($preservedate) {
-                utime $ostat[9], $ostat[9], @anames;
-            }
-            chmod $ostat[2] & 07777, @anames;
-            chown $ostat[5], $ostat[6], @anames;
-            print "Converted file " . $oname . " to text in " . $File::Find::dir . "\n"; 
-        }
-        else {
-            unlink $tname or die;
-        }
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/ltmain.sh b/rubbos/app/httpd-2.0.64/srclib/apr/build/ltmain.sh
deleted file mode 100644
index 2bcb8482..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/ltmain.sh
+++ /dev/null
@@ -1,6956 +0,0 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008  Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-basename="s,^.*/,,g"
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5.26
-TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
-
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  SP2NL='tr \040 \012'
-  NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  SP2NL='tr \100 \n'
-  NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-lt_env=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-do
-  eval "if test \"\${$lt_var+set}\" = set; then
-	  save_$lt_var=\$$lt_var
-	  lt_env=\"$lt_var=\$$lt_var \$lt_env\"
-	  $lt_var=C
-	  export $lt_var
-	fi"
-done
-
-if test -n "$lt_env"; then
-  lt_env="env $lt_env"
-fi
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
-
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$modename: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit $EXIT_FAILURE
-fi
-
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-duplicate_deps=no
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
-
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
-
-# func_mktempdir [string]
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
-func_mktempdir ()
-{
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
-
-    if test "$run" = ":"; then
-      # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
-    else
-
-      # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-
-      if test ! -d "$my_tmpdir"; then
-	# Failing that, at least try and use $RANDOM to avoid a race
-	my_tmpdir="${my_template}-${RANDOM-0}$$"
-
-	save_mktempdir_umask=`umask`
-	umask 0077
-	$mkdir "$my_tmpdir"
-	umask $save_mktempdir_umask
-      fi
-
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || {
-        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
-	exit $EXIT_FAILURE
-      }
-    fi
-
-    $echo "X$my_tmpdir" | $Xsed
-}
-
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid ()
-{
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 | \
-	$SED -n -e '1,100{
-		/ I /{
-			s,.*,import,
-			p
-			q
-			}
-		}'`
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $echo $win32_libid_type
-}
-
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	case $arg in
-	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	CC_quoted="$CC_quoted $arg"
-      done
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	    # Double-quote args containing other shell metacharacters.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    CC_quoted="$CC_quoted $arg"
-	  done
-	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit $EXIT_FAILURE
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-
-    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
-    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
-      exit $EXIT_FAILURE
-    fi
-}
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-    my_status=""
-
-    $show "${rm}r $my_gentop"
-    $run ${rm}r "$my_gentop"
-    $show "$mkdir $my_gentop"
-    $run $mkdir "$my_gentop"
-    my_status=$?
-    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
-      exit $my_status
-    fi
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-	*" $my_xlib_u "*)
-	  extracted_serial=`expr $extracted_serial + 1`
-	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
-	*) break ;;
-	esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
-
-      $show "${rm}r $my_xdir"
-      $run ${rm}r "$my_xdir"
-      $show "$mkdir $my_xdir"
-      $run $mkdir "$my_xdir"
-      exit_status=$?
-      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
-	exit $exit_status
-      fi
-      case $host in
-      *-darwin*)
-	$show "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	if test -z "$run"; then
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
-	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-	  if test -n "$darwin_arches"; then 
-	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-	      cd "$darwin_curdir"
-	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-	    done # $darwin_arches
-      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-	      lipo -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    ${rm}r unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd "$darwin_orig_dir"
- 	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	fi # $run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-        ;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-    done
-    func_extract_archives_result="$my_oldobjs"
-}
-# End of Shell function definitions
-#####################################
-
-# Darwin sucks
-eval std_shrext=\"$shrext_cmds\"
-
-disable_libs=no
-
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
-  arg="$1"
-  shift
-
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
-      ;;
-    tag)
-      tagname="$arg"
-      preserve_args="${preserve_args}=$arg"
-
-      # Check whether tagname contains only valid characters
-      case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit $EXIT_FAILURE
-	;;
-      esac
-
-      case $tagname in
-      CC)
-	# Don't test for the "default" C tag, as we know, it's there, but
-	# not specially marked.
-	;;
-      *)
-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
-	  taglist="$taglist $tagname"
-	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
-	else
-	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
-	fi
-	;;
-      esac
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
-
-    prev=
-    prevopt=
-    continue
-  fi
-
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
-
-  --version)
-    echo "\
-$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
-
-Copyright (C) 2008  Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit $?
-    ;;
-
-  --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-    done
-    exit $?
-    ;;
-
-  --debug)
-    $echo "$progname: enabling shell trace mode"
-    set -x
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --dry-run | -n)
-    run=:
-    ;;
-
-  --features)
-    $echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
-    else
-      $echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
-    else
-      $echo "disable static libraries"
-    fi
-    exit $?
-    ;;
-
-  --finish) mode="finish" ;;
-
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
-
-  --preserve-dup-deps) duplicate_deps="yes" ;;
-
-  --quiet | --silent)
-    show=:
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --tag)
-    prevopt="--tag"
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
-  --tag=*)
-    set tag "$optarg" ${1+"$@"}
-    shift
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
-    ;;
-
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-
-  *)
-    nonopt="$arg"
-    break
-    ;;
-  esac
-done
-
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-fi
-
-case $disable_libs in
-no) 
-  ;;
-shared)
-  build_libtool_libs=no
-  build_old_libs=yes
-  ;;
-static)
-  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-  ;;
-esac
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-if test -z "$show_help"; then
-
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
-    case $nonopt in
-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-      mode=link
-      for arg
-      do
-	case $arg in
-	-c)
-	   mode=compile
-	   break
-	   ;;
-	esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
-      ;;
-    *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
-
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-	if test -n "$nonopt"; then
-	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-	else
-	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-	fi
-      fi
-      ;;
-    esac
-  fi
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
-
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  if test -n "$libobj" ; then
-	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
- 	  for arg in $args; do
-	    IFS="$save_ifs"
-
-	    # Double-quote args containing other shell metacharacters.
-	    # Many Bourne shells cannot handle close brackets correctly
-	    # in scan sets, so we specify it separately.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    lastarg="$lastarg $arg"
-	  done
-	  IFS="$save_ifs"
-	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-
-	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
-	  continue
-	  ;;
-
-	* )
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      case $lastarg in
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, and some SunOS ksh mistreat backslash-escaping
-      # in scan sets (worked around with variable expansion),
-      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
-      # at all, so we specify them separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      base_compile="$base_compile $lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      $echo "$modename: you must specify an argument for -Xcompile"
-      exit $EXIT_FAILURE
-      ;;
-    target)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *)
-      # Get the name of the library object.
-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSifmso]'
-    case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.ii) xform=ii ;;
-    *.class) xform=class ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.[fF][09]?) xform=[fF][09]. ;;
-    *.for) xform=for ;;
-    *.java) xform=java ;;
-    *.obj) xform=obj ;;
-    *.sx) xform=sx ;;
-    esac
-
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
-    case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-    *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -static)
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
-    case $qlibobj in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qlibobj="\"$qlibobj\"" ;;
-    esac
-    test "X$libobj" != "X$qlibobj" \
-	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
-	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$xdir" = "X$obj"; then
-      xdir=
-    else
-      xdir=$xdir/
-    fi
-    lobj=${xdir}$objdir/$objname
-
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
-	$show "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$echo "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-      $echo "$srcfile" > "$lockfile"
-    fi
-
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
-    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
-    case $qsrcfile in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      qsrcfile="\"$qsrcfile\"" ;;
-    esac
-
-    $run $rm "$libobj" "${libobj}T"
-
-    # Create a libtool object file (analogous to a ".la" file),
-    # but don't create it if we're doing a dry run.
-    test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      if test ! -d "${xdir}$objdir"; then
-	$show "$mkdir ${xdir}$objdir"
-	$run $mkdir ${xdir}$objdir
-	exit_status=$?
-	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
-	  exit $exit_status
-	fi
-      fi
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	command="$command -o $lobj"
-      fi
-
-      $run $rm "$lobj" "$output_obj"
-
-      $show "$command"
-      if $run eval $lt_env "$command"; then :
-      else
-	test -n "$output_obj" && $run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	$show "$mv $output_obj $lobj"
-	if $run $mv $output_obj $lobj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the PIC object to the libtool object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-        suppress_output=' >/dev/null 2>&1'
-      fi
-    else
-      # No PIC object so indicate it doesn't exist in the libtool
-      # object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      $run $rm "$obj" "$output_obj"
-      $show "$command"
-      if $run eval $lt_env "$command"; then :
-      else
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	$show "$mv $output_obj $obj"
-	if $run $mv $output_obj $obj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
-
-EOF
-    else
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
-
-EOF
-    fi
-
-    $run $mv "${libobj}T" "${libobj}"
-
-    # Unlock the critical section if it was locked
-    if test "$need_locks" != no; then
-      $run $rm "$lockfile"
-    fi
-
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args="$nonopt"
-    base_compile="$nonopt $@"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    notinst_path= # paths that contain not-installed libtool libraries
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-    single_module="${wl}-single_module"
-
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -all-static | -static | -static-libtool-libs)
-	case $arg in
-	-all-static)
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	-static)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=built
-	  ;;
-	-static-libtool-libs)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	esac
-	build_libtool_libs=no
-	build_old_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-	;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  compile_command="$compile_command @OUTPUT@"
-	  finalize_command="$finalize_command @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    compile_command="$compile_command @SYMFILE@"
-	    finalize_command="$finalize_command @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
-	    else
-	      dlprefiles="$dlprefiles $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  if test ! -f "$arg"; then
-	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat $save_arg`
-	    do
-#	      moreargs="$moreargs $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		# If there is no directory component, then add one.
-		case $arg in
-		*/* | *\\*) . $arg ;;
-		*) . ./$arg ;;
-		esac
-
-		if test -z "$pic_object" || \
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none && \
-		   test "$non_pic_object" = none; then
-		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-
-		# Extract subdirectory from the argument.
-		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		if test "X$xdir" = "X$arg"; then
-		  xdir=
-		else
-		  xdir="$xdir/"
-		fi
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  libobjs="$libobjs $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		else
-		  # If the PIC object exists, use it instead.
-		  # $xdir was prepended to $pic_object above.
-		  non_pic_object="$pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if test -z "$run"; then
-		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-		  exit $EXIT_FAILURE
-		else
-		  # Dry-run case.
-
-		  # Extract subdirectory from the argument.
-		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		  if test "X$xdir" = "X$arg"; then
-		    xdir=
-		  else
-		    xdir="$xdir/"
-		  fi
-
-		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-		  libobjs="$libobjs $pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      fi
-	    done
-	  else
-	    $echo "$modename: link input file \`$save_arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
-	  prev=
-	  compile_command="$compile_command $wl$qarg"
-	  finalize_command="$finalize_command $wl$qarg"
-	  continue
-	  ;;
-	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	shrext)
-  	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
-	darwin_framework|darwin_framework_skip)
-	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  prev=
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-	continue
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit $EXIT_FAILURE
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -framework|-arch|-isysroot)
-	case " $CC " in
-	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
-		prev=darwin_framework_skip ;;
-	  *) compiler_flags="$compiler_flags $arg"
-	     prev=darwin_framework ;;
-	esac
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  if test -z "$absdir"; then
-	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    absdir="$dir"
-	    notinst_path="$notinst_path $dir"
-	  fi
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "*) ;;
-	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      -model)
-	compile_command="$compile_command $arg"
-	compiler_flags="$compiler_flags $arg"
-	finalize_command="$finalize_command $arg"
-	prev=xcompiler
-	continue
-	;;
-
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	compiler_flags="$compiler_flags $arg"
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-	continue
-	;;
-
-      -multi_module)
-	single_module="${wl}-multi_module"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -m* pass through architecture-specific compiler args for GCC
-      # -m*, -t[45]*, -txscale* pass through architecture-specific
-      # compiler args for GCC
-      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-      # -F/path gives path to uninstalled frameworks, gcc on darwin
-      # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-        compile_command="$compile_command $arg"
-        finalize_command="$finalize_command $arg"
-        compiler_flags="$compiler_flags $arg"
-        continue
-        ;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # and Darwin in order for the loader to find any dlls it needs.
-	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
-	esac
-	continue
-	;;
-
-      -static | -static-libtool-libs)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Wl,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $wl$flag"
-	  linker_flags="$linker_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # Some other compiler flag.
-      -* | +*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-
-      *.$objext)
-	# A standard object.
-	objs="$objs $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  # If there is no directory component, then add one.
-	  case $arg in
-	  */* | *\\*) . $arg ;;
-	  *) . ./$arg ;;
-	  esac
-
-	  if test -z "$pic_object" || \
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none && \
-	     test "$non_pic_object" = none; then
-	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	  if test "X$xdir" = "X$arg"; then
-	    xdir=
- 	  else
-	    xdir="$xdir/"
-	  fi
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    libobjs="$libobjs $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  else
-	    # If the PIC object exists, use it instead.
-	    # $xdir was prepended to $pic_object above.
-	    non_pic_object="$pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if test -z "$run"; then
-	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-	    exit $EXIT_FAILURE
-	  else
-	    # Dry-run case.
-
-	    # Extract subdirectory from the argument.
-	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	    if test "X$xdir" = "X$arg"; then
-	      xdir=
-	    else
-	      xdir="$xdir/"
-	    fi
-
-	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-	    libobjs="$libobjs $pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
-	  prev=
-	else
-	  deplibs="$deplibs $arg"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-      fi
-    done # argument parsing loop
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$output_objdir" = "X$output"; then
-      output_objdir="$objdir"
-    else
-      output_objdir="$output_objdir/$objdir"
-    fi
-    # Create the object directory.
-    if test ! -d "$output_objdir"; then
-      $show "$mkdir $output_objdir"
-      $run $mkdir $output_objdir
-      exit_status=$?
-      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
-	exit $exit_status
-      fi
-    fi
-
-    # Determine the type of output
-    case $output in
-    "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplications in $postdeps and $predeps
-      duplicate_compiler_generated_deps=yes
-      ;;
-    *)
-      duplicate_compiler_generated_deps=$duplicate_deps
-      ;;
-    esac
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if test "X$duplicate_deps" = "Xyes" ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	esac
-      fi
-      libs="$libs $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    case $linkmode in
-    lib)
-	passes="conv link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-    for pass in $passes; do
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-	esac
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    compiler_flags="$compiler_flags $deplib"
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
-	    continue
-	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  if test "$linkmode" = lib; then
-	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-	  else
-	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-	  fi
-	  for searchdir in $searchdirs; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if (${SED} -e '2q' $lib |
-                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		  library_names=
-		  old_library=
-		  case $lib in
-		  */* | *\\*) . $lib ;;
-		  *) . ./$lib ;;
-		  esac
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-		    test "X$ladir" = "X$lib" && ladir="."
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-	        ;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  *)
-	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la) lib="$deplib" ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    valid_a_lib=no
-	    case $deplibs_check_method in
-	      match_pattern*)
-		set dummy $deplibs_check_method
-	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-		if eval $echo \"$deplib\" 2>/dev/null \
-		    | $SED 10q \
-		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		  valid_a_lib=yes
-		fi
-		;;
-	      pass_all)
-		valid_a_lib=yes
-		;;
-            esac
-	    if test "$valid_a_lib" != yes; then
-	      $echo
-	      $echo "*** Warning: Trying to link with static lib archive $deplib."
-	      $echo "*** I have the capability to make that library automatically link in when"
-	      $echo "*** you link to this library.  But I can only do this if you have a"
-	      $echo "*** shared version of the library, which you do not appear to have"
-	      $echo "*** because the file extensions .$libext of this argument makes me believe"
-	      $echo "*** that it is just a static archive that I should not used here."
-	    else
-	      $echo
-	      $echo "*** Warning: Linking the shared library $output against the"
-	      $echo "*** static library $deplib is not portable!"
-	      deplibs="$deplib $deplibs"
-	    fi
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      newdlfiles="$newdlfiles $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$ladir" = "X$lib" && ladir="."
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	case $lib in
-	*/* | *\\*) . $lib ;;
-	*) . ./$lib ;;
-	esac
-
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit $EXIT_FAILURE
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-              if test "X$duplicate_deps" = "Xyes" ; then
-	        case "$tmp_libs " in
-	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	        esac
-              fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
-	  else
-	    newdlfiles="$newdlfiles $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$libdir"
-	    absdir="$libdir"
-	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  fi
-	fi # $installed = yes
-	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { { test "$prefer_static_libs" = no ||
-		 test "$prefer_static_libs,$installed" = "built,yes"; } ||
-	       test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath " in
-	      *" $dir "*) ;;
-	      *" $absdir "*) ;;
-	      *) temp_rpath="$temp_rpath $absdir" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes ; then
-	  use_static_libs=no
-	fi
-	if test -n "$library_names" &&
-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
-	  if test "$installed" = no; then
-	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
-	  fi
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on
-	  # some systems (darwin)
-	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
-	    $echo
-	    if test "$linkmode" = prog; then
-	      $echo "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $echo "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $echo "*** $linklib is not portable!"
-	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    realname="$2"
-	    shift; shift
-	    libname=`eval \\$echo \"$libname_spec\"`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw*)
-		major=`expr $current - $age`
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      $show "extracting exported symbol list from \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$extract_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      $show "generating import library for \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$old_archive_from_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		    *-*-unixware7*) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a module then we can not link against
-		    # it, someone is ignoring the new warnings I added
-		    if /usr/bin/file -L $add 2> /dev/null |
-                      $EGREP ": [^:]* bundle" >/dev/null ; then
-		      $echo "** Warning, lib $linklib is a module, not a shared library"
-		      if test -z "$old_library" ; then
-		        $echo
-		        $echo "** And there doesn't seem to be a static archive available"
-		        $echo "** The link will probably fail, sorry"
-		      else
-		        add="$dir/$old_library"
-		      fi
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit $EXIT_FAILURE
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes && \
-		 test "$hardcode_minus_L" != yes && \
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-	        add="$inst_prefix_dir$libdir/$linklib"
-	      else
-	        add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case $libdir in
-		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    $echo
-	    $echo "*** Warning: This system can not link to static lib archive $lib."
-	    $echo "*** I have the capability to make that library automatically link in when"
-	    $echo "*** you link to this library.  But I can only do this if you have a"
-	    $echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      $echo "*** But as you try to build a module library, libtool will still create "
-	      $echo "*** a static module, that should work as long as the dlopening application"
-	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		$echo
-		$echo "*** However, this would only work if libtool was able to extract symbol"
-		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$echo "*** not find such a program.  So, this module is probably useless."
-		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
-		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  newlib_search_path="$newlib_search_path $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-		test "X$dir" = "X$deplib" && dir="."
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if grep "^installed=no" $deplib > /dev/null; then
-		  path="$absdir/$objdir"
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  if test -z "$libdir"; then
-		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		    exit $EXIT_FAILURE
-		  fi
-		  if test "$absdir" != "$libdir"; then
-		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  fi
-		  path="$absdir"
-		fi
-		depdepl=
-		case $host in
-		*-*-darwin*)
-		  # we do not want to link against static libs,
-		  # but need to link against shared
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$deplibdir/$depdepl" ; then
-		      depdepl="$deplibdir/$depdepl"
-	      	    elif test -f "$path/$depdepl" ; then
-		      depdepl="$path/$depdepl"
-		    else
-		      # Can't find it, oh well...
-		      depdepl=
-		    fi
-		    # do not add paths which are already there
-		    case " $newlib_search_path " in
-		    *" $path "*) ;;
-		    *) newlib_search_path="$newlib_search_path $path";;
-		    esac
-		  fi
-		  path=""
-		  ;;
-		*)
-		  path="-L$path"
-		  ;;
-		esac
-		;;
-	      -l*)
-		case $host in
-		*-*-darwin*)
-		  # Again, we only want to link against shared libraries
-		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-		  for tmp in $newlib_search_path ; do
-		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
-		      eval depdepl="$tmp/lib$tmp_libs.dylib"
-		      break
-		    fi
-		  done
-		  path=""
-		  ;;
-		*) continue ;;
-		esac
-		;;
-	      *) continue ;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	      case " $deplibs " in
-	      *" $depdepl "*) ;;
-	      *) deplibs="$depdepl $deplibs" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
-	      esac
-	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
-      esac
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-      fi
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	if test "$module" = no; then
-	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-	  exit $EXIT_FAILURE
-	else
-	  $echo
-	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-	  $echo "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
-	fi
-      fi
-
-      if test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-      fi
-
-      set dummy $rpath
-      if test "$#" -gt 2; then
-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	if test -n "$vinfo"; then
-	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
-	fi
-
-	if test -n "$release"; then
-	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-	fi
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	IFS="$save_ifs"
-
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major="$2"
-	  number_minor="$3"
-	  number_revision="$4"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  darwin|linux|osf|windows|none)
-	    current=`expr $number_major + $number_minor`
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor`
-	    age="$number_minor"
-	    revision="$number_minor"
-	    lt_irix_increment=no
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$2"
-	  revision="$3"
-	  age="$4"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  minor_current=`expr $current + 1`
-	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current";
-	  ;;
-
-	irix | nonstopux)
-	  if test "X$lt_irix_increment" = "Xno"; then
-	    major=`expr $current - $age`
-	  else
-	    major=`expr $current - $age + 1`
-	  fi
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux)
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  major=.`expr $current - $age`
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    iface=`expr $current - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  major=`expr $current - $age`
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-      fi
-
-      if test "$mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$echo "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
-	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-	         then
-		   continue
-		 fi
-	       fi
-	       removelist="$removelist $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	if test -n "$removelist"; then
-	  $show "${rm}r $removelist"
-	  $run ${rm}r $removelist
-	fi
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      #for path in $notinst_path; do
-      #	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-      #	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-      #	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-      #done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs -framework System"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    ;;
- 	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $rm conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $rm conftest
-	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
-		    i=""
-		    ;;
-		  esac
-	        fi
-		if test -n "$i" ; then
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    $echo
-		    $echo "*** Warning: dynamic linker does not accept needed library $i."
-		    $echo "*** I have the capability to make that library automatically link in when"
-		    $echo "*** you link to this library.  But I can only do this if you have a"
-		    $echo "*** shared version of the library, which I believe you do not have"
-		    $echo "*** because a test_compile did reveal that the linker did not use it for"
-		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-		$rm conftest
-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
-		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval \\$echo \"$libname_spec\"`
-		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		    set dummy $deplib_matches
-		    deplib_match=$2
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
-		    else
-		      droppeddeps=yes
-		      $echo
-		      $echo "*** Warning: dynamic linker does not accept needed library $i."
-		      $echo "*** I have the capability to make that library automatically link in when"
-		      $echo "*** you link to this library.  But I can only do this if you have a"
-		      $echo "*** shared version of the library, which you do not appear to have"
-		      $echo "*** because a test_compile did reveal that the linker did not use this one"
-		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  $echo
-		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "*** make it link in!  You will probably need to install it or some"
-		  $echo "*** library that it depends on before this library will be fully"
-		  $echo "*** functional.  Installing it before continuing would be even better."
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method
-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-            if test "$name" != "" && test  "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null \
-			 | grep " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | ${SED} 10q \
-			 | $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-	    if test -n "$name" && test "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval $echo \"$potent_lib\" 2>/dev/null \
-		        | ${SED} 10q \
-		        | $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	    -e 's/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
-	    done
-	  fi
-	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
-	    | grep . >/dev/null; then
-	    $echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      $echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    $echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	  fi
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library is the System framework
-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    $echo
-	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $echo "*** a static module, that should work as long as the dlopening"
-	    $echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      $echo
-	      $echo "*** However, this would only work if libtool was able to extract symbol"
-	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $echo "*** not find such a program.  So, this module is probably useless."
-	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    $echo "*** The inter-library dependencies that have been dropped here will be"
-	    $echo "*** automatically added whenever a program is linked with this library"
-	    $echo "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      $echo
-	      $echo "*** Since this library must not contain undefined symbols,"
-	      $echo "*** because either the platform does not support them or"
-	      $echo "*** it was explicitly requested with -no-undefined,"
-	      $echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $deplibs " in
-	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
-	  esac
-	  ;;
-	*) new_libs="$new_libs $deplib" ;;
-	esac
-      done
-      deplibs="$new_libs"
-
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      case $archive_cmds in
-	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
-	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
-	      esac
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	realname="$2"
-	shift; shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	linknames=
-	for link
-	do
-	  linknames="$linknames $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      if len=`expr "X$cmd" : ".*"` &&
-	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	        $show "$cmd"
-	        $run eval "$cmd" || exit $?
-	        skipped_export=false
-	      else
-	        # The command line is too long to execute in one step.
-	        $show "using reloadable object file for export list..."
-	        skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex"; then
-	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-		case " $convenience " in
-		*" $test_deplib "*) ;;
-		*)
-			tmp_deplibs="$tmp_deplibs $test_deplib"
-			;;
-		esac
-	done
-	deplibs="$tmp_deplibs"
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    func_extract_archives $gentop $convenience
-	    libobjs="$libobjs $func_extract_archives_result"
-	  fi
-	fi
-	
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	  eval test_cmds=\"$archive_expsym_cmds\"
-	  cmds=$archive_expsym_cmds
-	else
-	  eval test_cmds=\"$archive_cmds\"
-	  cmds=$archive_cmds
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" &&
-	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise.
-	  $echo "creating reloadable object files..."
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  delfiles=
-	  last_robj=
-	  k=1
-	  output=$output_objdir/$output_la-${k}.$objext
-	  # Loop over the list of objects to be linked.
-	  for obj in $save_libobjs
-	  do
-	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-	    if test "X$objlist" = X ||
-	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-		 test "$len" -le "$max_cmd_len"; }; then
-	      objlist="$objlist $obj"
-	    else
-	      # The command $test_cmds is almost too long, add a
-	      # command to the queue.
-	      if test "$k" -eq 1 ; then
-		# The first file doesn't have a previous command to add.
-		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-	      else
-		# All subsequent reloadable object files will link in
-		# the last one created.
-		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
-	      fi
-	      last_robj=$output_objdir/$output_la-${k}.$objext
-	      k=`expr $k + 1`
-	      output=$output_objdir/$output_la-${k}.$objext
-	      objlist=$obj
-	      len=1
-	    fi
-	  done
-	  # Handle the remaining objects by creating one last
-	  # reloadable object file.  All subsequent reloadable object
-	  # files will link in the last one created.
-	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-
-	  if ${skipped_export-false}; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    libobjs=$output
-	    # Append the command to create the export file.
-	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-          fi
-
-	  # Set up a command to remove the reloadable object files
-	  # after they are used.
-	  i=0
-	  while test "$i" -lt "$k"
-	  do
-	    i=`expr $i + 1`
-	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
-	  done
-
-	  $echo "creating a temporary reloadable object file: $output"
-
-	  # Loop through the commands generated above and execute them.
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $concat_cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    cmds=$archive_expsym_cmds
-	  else
-	    cmds=$archive_cmds
-	    fi
-	  fi
-
-	  # Append the command to remove the reloadable object files
-	  # to the just-reset $cmds.
-	  eval cmds=\"\$cmds~\$rm $delfiles\"
-	fi
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || {
-	    lt_exit=$?
-
-	    # Restore the uninstalled library and exit
-	    if test "$mode" = relink; then
-	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-	    fi
-
-	    exit $lt_exit
-	  }
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-
-	  if test -n "$convenience"; then
-	    if test -z "$whole_archive_flag_spec"; then
-	      $show "${rm}r $gentop"
-	      $run ${rm}r "$gentop"
-	    fi
-	  fi
-
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
-      esac
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
-
-      case $output in
-      *.lo)
-	if test -n "$objs$old_deplibs"; then
-	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	libobj="$output"
-	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $run $rm $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
-      wl=
-
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
-	else
-	  gentop="$output_objdir/${obj}x"
-	  generated="$generated $gentop"
-
-	  func_extract_archives $gentop $convenience
-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-	fi
-      fi
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      cmds=$reload_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $run eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	cmds=$reload_cmds
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-      fi
-
-      if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-      esac
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
-
-      if test "$preload" = yes; then
-	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-	   test "$dlopen_self_static" = unknown; then
-	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-	fi
-      fi
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	;;
-      esac
-
-      case $host in
-      *darwin*)
-        # Don't allow lazy linking, it breaks C++ global constructors
-        if test "$tagname" = CXX ; then
-        compile_command="$compile_command ${wl}-bind_at_load"
-        finalize_command="$finalize_command ${wl}-bind_at_load"
-        fi
-        ;;
-      esac
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $compile_deplibs " in
-	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $compile_deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
-	  esac
-	  ;;
-	*) new_libs="$new_libs $deplib" ;;
-	esac
-      done
-      compile_deplibs="$new_libs"
-
-
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-      fi
-
-      dlsyms=
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	  dlsyms="${outputname}S.c"
-	else
-	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-	fi
-      fi
-
-      if test -n "$dlsyms"; then
-	case $dlsyms in
-	"") ;;
-	*.c)
-	  # Discover the nlist of each of the dlfiles.
-	  nlist="$output_objdir/${outputname}.nm"
-
-	  $show "$rm $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Parse the name list into a source file.
-	  $show "creating $output_objdir/$dlsyms"
-
-	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
-	  if test "$dlself" = yes; then
-	    $show "generating symbol list for \`$output'"
-
-	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-
-	    # Add our own program objects to the symbol list.
-	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	    for arg in $progfiles; do
-	      $show "extracting global C symbols from \`$arg'"
-	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	    done
-
-	    if test -n "$exclude_expsyms"; then
-	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    if test -n "$export_symbols_regex"; then
-	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    # Prepare the list of exported symbols
-	    if test -z "$export_symbols"; then
-	      export_symbols="$output_objdir/$outputname.exp"
-	      $run $rm $export_symbols
-	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-              case $host in
-              *cygwin* | *mingw* )
-	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-		$run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-                ;;
-              esac
-	    else
-	      $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      $run eval 'mv "$nlist"T "$nlist"'
-              case $host in
-              *cygwin* | *mingw* )
-	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-		$run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-                ;;
-              esac
-	    fi
-	  fi
-
-	  for arg in $dlprefiles; do
-	    $show "extracting global C symbols from \`$arg'"
-	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
-	    $run eval '$echo ": $name " >> "$nlist"'
-	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -z "$run"; then
-	    # Make sure we have at least an empty file.
-	    test -f "$nlist" || : > "$nlist"
-
-	    if test -n "$exclude_expsyms"; then
-	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	      $mv "$nlist"T "$nlist"
-	    fi
-
-	    # Try sorting and uniquifying the output.
-	    if grep -v "^: " < "$nlist" |
-		if sort -k 3 </dev/null >/dev/null 2>&1; then
-		  sort -k 3
-		else
-		  sort +2
-		fi |
-		uniq > "$nlist"S; then
-	      :
-	    else
-	      grep -v "^: " < "$nlist" > "$nlist"S
-	    fi
-
-	    if test -f "$nlist"S; then
-	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-	    else
-	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-"
-
-	    case $host in
-	    *cygwin* | *mingw* )
-	  $echo >> "$output_objdir/$dlsyms" "\
-/* DATA imports from DLLs on WIN32 can't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs */
-struct {
-"
-	      ;;
-	    * )
-	  $echo >> "$output_objdir/$dlsyms" "\
-const struct {
-"
-	      ;;
-	    esac
-
-
-	  $echo >> "$output_objdir/$dlsyms" "\
-  const char *name;
-  lt_ptr address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	  fi
-
-	  pic_flag_for_symtable=
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
-	    esac;;
-	  *-*-hpux*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag";;
-	    esac
-	  esac
-
-	  # Now compile the dynamic symbol file.
-	  $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-	  $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
-	  # Clean up the generated files.
-	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Transform the symbol file into the correct name.
-          case $host in
-          *cygwin* | *mingw* )
-            if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            else
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-             fi
-            ;;
-          * )
-            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            ;;
-          esac
-	  ;;
-	*)
-	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      else
-	# We keep going just in case the user didn't refer to
-	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-	# really was required.
-
-	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-      fi
-
-      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	$show "$link_command"
-	$run eval "$link_command"
-	exit_status=$?
-
-	# Delete the generated files.
-	if test -n "$dlsyms"; then
-	  $show "$rm $output_objdir/${outputname}S.${objext}"
-	  $run $rm "$output_objdir/${outputname}S.${objext}"
-	fi
-
-	exit $exit_status
-      fi
-
-      if test -n "$shlibpath_var"; then
-	# We should set the shlibpath_var
-	rpath=
-	for dir in $temp_rpath; do
-	  case $dir in
-	  [\\/]* | [A-Za-z]:[\\/]*)
-	    # Absolute path.
-	    rpath="$rpath$dir:"
-	    ;;
-	  *)
-	    # Relative path: add a thisdir entry.
-	    rpath="$rpath\$thisdir/$dir:"
-	    ;;
-	  esac
-	done
-	temp_rpath="$rpath"
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$run $rm $output
-	# Link the executable and exit
-	$show "$link_command"
-	$run eval "$link_command" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-	$echo "$modename: \`$output' will be relinked during installation" 1>&2
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      $show "$link_command"
-      $run eval "$link_command" || exit $?
-
-      # Now create the wrapper script.
-      $show "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
-      fi
-
-      # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
-	case $progpath in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-	esac
-	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if our run command is non-null.
-      if test -z "$run"; then
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-            output_name=`basename $output`
-            output_path=`dirname $output`
-            cwrappersource="$output_path/$objdir/lt-$output_name.c"
-            cwrapper="$output_path/$output_name.exe"
-            $rm $cwrappersource $cwrapper
-            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    cat > $cwrappersource <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "/bin/sh $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-	    cat >> $cwrappersource<<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/stat.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-/* -DDEBUG is fairly common in CFLAGS.  */
-#undef DEBUG
-#if defined DEBUGWRAPPER
-# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
-#else
-# define DEBUG(format, ...)
-#endif
-
-const char *program_name = NULL;
-
-void * xmalloc (size_t num);
-char * xstrdup (const char *string);
-const char * base_name (const char *name);
-char * find_executable(const char *wrapper);
-int    check_executable(const char *path);
-char * strendzap(char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int i;
-
-  program_name = (char *) xstrdup (base_name (argv[0]));
-  DEBUG("(main) argv[0]      : %s\n",argv[0]);
-  DEBUG("(main) program_name : %s\n",program_name);
-  newargz = XMALLOC(char *, argc+2);
-EOF
-
-            cat >> $cwrappersource <<EOF
-  newargz[0] = (char *) xstrdup("$SHELL");
-EOF
-
-            cat >> $cwrappersource <<"EOF"
-  newargz[1] = find_executable(argv[0]);
-  if (newargz[1] == NULL)
-    lt_fatal("Couldn't find %s", argv[0]);
-  DEBUG("(main) found exe at : %s\n",newargz[1]);
-  /* we know the script has the same name, without the .exe */
-  /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe");
-  for (i = 1; i < argc; i++)
-    newargz[i+1] = xstrdup(argv[i]);
-  newargz[argc+1] = NULL;
-
-  for (i=0; i<argc+1; i++)
-  {
-    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
-    ;
-  }
-
-EOF
-
-            case $host_os in
-              mingw*)
-                cat >> $cwrappersource <<EOF
-  execv("$SHELL",(char const **)newargz);
-EOF
-              ;;
-              *)
-                cat >> $cwrappersource <<EOF
-  execv("$SHELL",newargz);
-EOF
-              ;;
-            esac
-
-            cat >> $cwrappersource <<"EOF"
-  return 127;
-}
-
-void *
-xmalloc (size_t num)
-{
-  void * p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-;
-}
-
-const char *
-base_name (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return base;
-}
-
-int
-check_executable(const char * path)
-{
-  struct stat st;
-
-  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
-  if ((!path) || (!*path))
-    return 0;
-
-  if ((stat (path, &st) >= 0) &&
-      (
-        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
-#if defined (S_IXOTH)
-       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
-#endif
-#if defined (S_IXGRP)
-       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
-#endif
-       ((st.st_mode & S_IXUSR) == S_IXUSR))
-      )
-    return 1;
-  else
-    return 0;
-}
-
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise */
-char *
-find_executable (const char* wrapper)
-{
-  int has_slash = 0;
-  const char* p;
-  const char* p_next;
-  /* static buffer for getcwd */
-  char tmp[LT_PATHMAX + 1];
-  int tmp_len;
-  char* concat_name;
-
-  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
-
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
-
-  /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
-  {
-    concat_name = xstrdup (wrapper);
-    if (check_executable(concat_name))
-      return concat_name;
-    XFREE(concat_name);
-  }
-  else
-  {
-#endif
-    if (IS_DIR_SEPARATOR (wrapper[0]))
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable(concat_name))
-        return concat_name;
-      XFREE(concat_name);
-    }
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  }
-#endif
-
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-    {
-      has_slash = 1;
-      break;
-    }
-  if (!has_slash)
-  {
-    /* no slashes; search PATH */
-    const char* path = getenv ("PATH");
-    if (path != NULL)
-    {
-      for (p = path; *p; p = p_next)
-      {
-        const char* q;
-        size_t p_len;
-        for (q = p; *q; q++)
-          if (IS_PATH_SEPARATOR(*q))
-            break;
-        p_len = q - p;
-        p_next = (*q == '\0' ? q : q + 1);
-        if (p_len == 0)
-        {
-          /* empty path: current directory */
-          if (getcwd (tmp, LT_PATHMAX) == NULL)
-            lt_fatal ("getcwd failed");
-          tmp_len = strlen(tmp);
-          concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-          memcpy (concat_name, tmp, tmp_len);
-          concat_name[tmp_len] = '/';
-          strcpy (concat_name + tmp_len + 1, wrapper);
-        }
-        else
-        {
-          concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
-          memcpy (concat_name, p, p_len);
-          concat_name[p_len] = '/';
-          strcpy (concat_name + p_len + 1, wrapper);
-        }
-        if (check_executable(concat_name))
-          return concat_name;
-        XFREE(concat_name);
-      }
-    }
-    /* not found in PATH; assume curdir */
-  }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  tmp_len = strlen(tmp);
-  concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_name[tmp_len] = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
-
-  if (check_executable(concat_name))
-    return concat_name;
-  XFREE(concat_name);
-  return NULL;
-}
-
-char *
-strendzap(char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert(str != NULL);
-  assert(pat != NULL);
-
-  len = strlen(str);
-  patlen = strlen(pat);
-
-  if (patlen <= len)
-  {
-    str += len - patlen;
-    if (strcmp(str, pat) == 0)
-      *str = '\0';
-  }
-  return str;
-}
-
-static void
-lt_error_core (int exit_status, const char * mode,
-          const char * message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-EOF
-          # we should really use a build-platform specific compiler
-          # here, but OTOH, the wrappers (shell script and this C one)
-          # are only useful if you want to execute the "real" binary.
-          # Since the "real" binary is built for $host, then this
-          # wrapper might as well be built for $host, too.
-          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
-          ;;
-        esac
-        $rm $output
-        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
-
-	$echo > $output "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variable:
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    echo=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$echo will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$echo >> $output "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $echo >> $output "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" || \\
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $mkdir \"\$progdir\"
-    else
-      $rm \"\$progdir/\$file\"
-    fi"
-
-	  $echo >> $output "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$echo \"\$relink_command_output\" >&2
-	$rm \"\$progdir/\$file\"
-	exit $EXIT_FAILURE
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-	else
-	  $echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$echo >> $output "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $echo >> $output "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $echo >> $output "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	$echo >> $output "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $echo >> $output "\
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \$*\"
-      exit $EXIT_FAILURE
-    fi
-  else
-    # The program doesn't exist.
-    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi\
-"
-	chmod +x $output
-      fi
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	generated="$generated $gentop"
-
-	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-       cmds=$old_archive_from_new_cmds
-      else
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  $echo "copying selected object files to avoid basename conflicts..."
-
-	  if test -z "$gentop"; then
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    exit_status=$?
-	    if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
-	      exit $exit_status
-	    fi
-	  fi
-
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		counter=`expr $counter + 1`
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      $run ln "$obj" "$gentop/$newobj" ||
-	      $run cp "$obj" "$gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
-	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
-	    esac
-	  done
-	fi
-
-	eval cmds=\"$old_archive_cmds\"
-
-	if len=`expr "X$cmds" : ".*"` &&
-	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  $echo "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  for obj in $save_oldobjs
-	  do
-	    oldobjs="$objlist $obj"
-	    objlist="$objlist $obj"
-	    eval test_cmds=\"$old_archive_cmds\"
-	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	       test "$len" -le "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-	        RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-        eval cmd=\"$cmd\"
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$generated"; then
-      $show "${rm}r$generated"
-      $run ${rm}r$generated
-    fi
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      $show "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
-      if test "$hardcode_automatic" = yes ; then
-	relink_command=
-      fi
-
-
-      # Only create the output if not a dry run.
-      if test -z "$run"; then
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		if test -z "$libdir"; then
-		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-		newdependency_libs="$newdependency_libs $libdir/$name"
-		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlfiles="$newdlfiles $libdir/$name"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlprefiles="$newdlprefiles $libdir/$name"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlfiles="$newdlfiles $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlprefiles="$newdlprefiles $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $rm $output
-	  # place dlname in correct position for cygwin
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-	  esac
-	  $echo > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $echo >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      fi
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool install mode
-  install)
-    modename="$modename: install"
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | grep shtool > /dev/null; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f) 
-      	case " $install_prog " in
-	*[\\\ /]cp\ *) ;;
-	*) prev=$arg ;;
-	esac
-	;;
-      -g | -m | -o) prev=$arg ;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	$echo "$modename: no file or destination specified" 1>&2
-      else
-	$echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test "$#" -gt 2; then
-	$echo "$modename: \`$dest' is not a directory" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	library_names=
-	old_library=
-	relink_command=
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
-	  esac
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-	test "X$dir" = "X$file/" && dir=
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  if test "$inst_prefix_dir" = "$destdir"; then
-	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
-	  else
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
-	  fi
-
-	  $echo "$modename: warning: relinking \`$file'" 1>&2
-	  $show "$relink_command"
-	  if $run eval "$relink_command"; then :
-	  else
-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names
-	if test -n "$2"; then
-	  realname="$2"
-	  shift
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  $show "$install_prog $dir/$srcname $destdir/$realname"
-	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-	  if test -n "$stripme" && test -n "$striplib"; then
-	    $show "$striplib $destdir/$realname"
-	    $run eval "$striplib $destdir/$realname" || exit $?
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      if test "$linkname" != "$realname"; then
-                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-	      fi
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  cmds=$postinstall_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || {
-	      lt_exit=$?
-
-	      # Restore the uninstalled library and exit
-	      if test "$mode" = relink; then
-		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-	      fi
-
-	      exit $lt_exit
-	    }
-	  done
-	  IFS="$save_ifs"
-	fi
-
-	# Install the pseudo-library for information purposes.
-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	if test -n "$destfile"; then
-	  $show "$install_prog $file $destfile"
-	  $run eval "$install_prog $file $destfile" || exit $?
-	fi
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
-	  $show "$install_prog $staticobj $staticdest"
-	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      file=`$echo $file|${SED} 's,.exe$,,'`
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin*|*mingw*)
-	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-	  # `FILE.' does not work on cygwin managed mounts.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  # Check the variables that should have been set.
-	  if test -z "$notinst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      # If there is no directory component, then add one.
-	      case $lib in
-	      */* | *\\*) . $lib ;;
-	      *) . ./$lib ;;
-	      esac
-	    fi
-	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-	  # `FILE.' does not work on cygwin managed mounts.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    if test "$finalize" = yes && test -z "$run"; then
-	      tmpdir=`func_mktempdir`
-	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
-	      outputname="$tmpdir/$file"
-	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
-
-	      $show "$relink_command"
-	      if $run eval "$relink_command"; then :
-	      else
-		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-		${rm}r "$tmpdir"
-		continue
-	      fi
-	      file="$outputname"
-	    else
-	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
-	    fi
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway 
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
-	    ;;
-	  esac
-	  ;;
-	esac
-	$show "$install_prog$stripme $file $destfile"
-	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-	test -n "$outputname" && ${rm}r "$tmpdir"
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	$show "$old_striplib $oldlib"
-	$run eval "$old_striplib $oldlib" || exit $?
-      fi
-
-      # Do each command in the postinstall commands.
-      cmds=$old_postinstall_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  cmds=$finish_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-	  done
-	  IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    test "$show" = : && exit $EXIT_SUCCESS
-
-    $echo "X----------------------------------------------------------------------" | $Xsed
-    $echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $echo "   $libdir"
-    done
-    $echo
-    $echo "If you ever happen to want to link against installed libraries"
-    $echo "in a given directory, LIBDIR, you must either use libtool, and"
-    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $echo
-    $echo "See any operating system documentation about shared libraries for"
-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "X----------------------------------------------------------------------" | $Xsed
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit $EXIT_FAILURE
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-	$echo "$modename: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  if test ! -f "$dir/$dlname"; then
-	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-	;;
-
-      *)
-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
-
-    if test -z "$run"; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-	eval "if test \"\${save_$lt_var+set}\" = set; then
-		$lt_var=\$save_$lt_var; export $lt_var
-	      fi"
-      done
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-	$echo "export $shlibpath_var"
-      fi
-      $echo "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool clean and uninstall mode
-  clean | uninstall)
-    modename="$modename: $mode"
-    rm="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) rm="$rm $arg"; rmforce=yes ;;
-      -*) rm="$rm $arg" ;;
-      *) files="$files $arg" ;;
-      esac
-    done
-
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    rmdirs=
-
-    origobjdir="$objdir"
-    for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-	dir=.
-	objdir="$origobjdir"
-      else
-	objdir="$dir/$origobjdir"
-      fi
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-      test "$mode" = uninstall && objdir="$dir"
-
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
-	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if (test -L "$file") >/dev/null 2>&1 \
-	|| (test -h "$file") >/dev/null 2>&1 \
-	|| test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
-	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-
-	  case "$mode" in
-	  clean)
-	    case "  $library_names " in
-	    # "  " in the beginning catches empty $dlname
-	    *" $dlname "*) ;;
-	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
-	    esac
-	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-	    ;;
-	  uninstall)
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      cmds=$postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      cmds=$old_postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	    ;;
-	  esac
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-
-	  # Read the .lo file
-	  . $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" \
-	     && test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" \
-	     && test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    file=`$echo $file|${SED} 's,.exe$,,'`
-	    noexename=`$echo $name|${SED} 's,.exe$,,'`
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	    relink_command=
-	    . $dir/$noexename
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles || exit_status=1
-    done
-    objdir="$origobjdir"
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	$show "rmdir $dir"
-	$run rmdir $dir >/dev/null 2>&1
-      fi
-    done
-
-    exit $exit_status
-    ;;
-
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-  esac
-
-  if test -z "$exec_cmd"; then
-    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi # test -z "$show_help"
-
-if test -n "$exec_cmd"; then
-  eval exec $exec_cmd
-  exit $EXIT_FAILURE
-fi
-
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-Provide generalized library-building support services.
-
-    --config          show all configuration variables
-    --debug           enable verbose shell tracing
--n, --dry-run         display commands without modifying any files
-    --features        display basic configuration information and exit
-    --finish          same as \`--mode=finish'
-    --help            display this help message and exit
-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
-    --tag=TAG         use configuration variables from tag TAG
-    --version         print version information
-
-MODE must be one of the following:
-
-      clean           remove files from the build directory
-      compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
-      finish          complete the installation of libtool libraries
-      install         install libraries or executables
-      link            create a library or an executable
-      uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-
-Report bugs to <bug-libtool@gnu.org>."
-  exit $EXIT_SUCCESS
-  ;;
-
-clean)
-  $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-compile)
-  $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -static           always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-  ;;
-
-execute)
-  $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-  ;;
-
-finish)
-  $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-  ;;
-
-install)
-  $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-  ;;
-
-uninstall)
-  $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-  ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit $?
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-disable_libs=shared
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-disable_libs=static
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/make_exports.awk b/rubbos/app/httpd-2.0.64/srclib/apr/build/make_exports.awk
deleted file mode 100644
index 1d12fc65..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/make_exports.awk
+++ /dev/null
@@ -1,150 +0,0 @@
-
-BEGIN {
-    printf("/*\n")
-    printf(" * THIS FILE WAS AUTOGENERATED BY make_exports.awk\n")
-    printf(" *\n")
-    printf(" * This is an ugly hack that needs to be here, so\n")
-    printf(" * that libtool will link all of the APR functions\n")
-    printf(" * into server regardless of whether the base server\n")
-    printf(" * uses them.\n")
-    printf(" */\n")
-    printf("\n")
-    printf("#define CORE_PRIVATE\n")
-    printf("\n")
-    
-    for (i = 1; i < ARGC; i++) {
-        file = ARGV[i]
-        sub("([^/]*[/])*", "", file)
-        printf("#include \"%s\"\n", file)
-    }
-
-    printf("\n")
-    printf("const void *ap_ugly_hack = NULL;\n")
-    printf("\n")
-    
-    TYPE_NORMAL = 0
-    TYPE_HEADER = 1
-
-    stackptr = 0
-}
-
-function push(line) {
-    stack[stackptr] = line
-    stackptr++
-}
-
-function do_output() {
-    printf("/*\n")
-    printf(" * %s\n", FILENAME)
-    printf(" */\n")
-    
-    for (i = 0; i < stackptr; i++) {
-        printf("%s\n", stack[i])
-    }
-    
-    stackptr = 0
-
-    printf("\n");
-}
-
-function enter_scope(type) {
-    scope++
-    scope_type[scope] = type
-    scope_stack[scope] = stackptr
-    delete scope_used[scope]
-}
-
-function leave_scope() {
-    used = scope_used[scope]
-   
-    if (!used)
-        stackptr = scope_stack[scope]
-
-    scope--
-    if (used) {
-        scope_used[scope] = 1
-        
-        if (!scope)
-            do_output()
-    }
-}
-
-function add_symbol(symbol) {
-    if (!index(symbol, "#")) {
-        push("const void *ap_hack_" symbol " = (const void *)" symbol ";")
-        scope_used[scope] = 1
-    }
-}
-
-/^[ \t]*AP[RUI]?_(CORE_)?DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
-    sub("[ \t]*AP[RUI]?_(CORE_)?DECLARE[^(]*[(][^)]*[)][ \t]*", "")
-    sub("[(].*", "")
-    sub("([^ ]* (^([ \t]*[(])))+", "")
-
-    add_symbol($0)
-    next
-}
-
-/^[ \t]*AP_DECLARE_HOOK[^(]*[(][^)]*/ {
-    split($0, args, ",")
-    symbol = args[2]
-    sub("^[ \t]+", "", symbol)
-    sub("[ \t]+$", "", symbol)
-
-    add_symbol("ap_hook_" symbol)
-    add_symbol("ap_hook_get_" symbol)
-    add_symbol("ap_run_" symbol)
-    next
-}
-
-/^[ \t]*APR_POOL_DECLARE_ACCESSOR[^(]*[(][^)]*[)]/ {
-    sub("[ \t]*APR_POOL_DECLARE_ACCESSOR[^(]*[(]", "", $0)
-    sub("[)].*$", "", $0)
-    add_symbol("apr_" $0 "_pool_get")
-    next
-}
-
-/^[ \t]*APR_DECLARE_INHERIT_SET[^(]*[(][^)]*[)]/ {
-    sub("[ \t]*APR_DECLARE_INHERIT_SET[^(]*[(]", "", $0)
-    sub("[)].*$", "", $0)
-    add_symbol("apr_" $0 "_inherit_set")
-    next
-}
-
-/^[ \t]*APR_DECLARE_INHERIT_UNSET[^(]*[(][^)]*[)]/ {
-    sub("[ \t]*APR_DECLARE_INHERIT_UNSET[^(]*[(]", "", $0)
-    sub("[)].*$", "", $0)
-    add_symbol("apr_" $0 "_inherit_unset")
-    next
-}
-
-/^#[ \t]*if(ndef| !defined[(])([^_]*_)*H/ {
-    enter_scope(TYPE_HEADER)
-    next
-}
-
-/^#[ \t]*if([n]?def)? / {
-    enter_scope(TYPE_NORMAL)
-    push($0)
-    next
-}
-
-/^#[ \t]*endif/ {
-    if (scope_type[scope] == TYPE_NORMAL)
-        push($0)
-        
-    leave_scope()
-    next
-}
-
-/^#[ \t]*else/ {
-    push($0)
-    next
-}
-
-/^#[ \t]*elif/ {
-    push($0)
-    next
-}
-
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/make_nw_export.awk b/rubbos/app/httpd-2.0.64/srclib/apr/build/make_nw_export.awk
deleted file mode 100644
index 291ecc0b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/make_nw_export.awk
+++ /dev/null
@@ -1,78 +0,0 @@
-# Based on apr's make_export.awk, which is
-# based on Ryan Bloom's make_export.pl
-
-BEGIN {
-    printf(" (APRLIB)\n")
-}
-
-# List of functions that we don't support, yet??
-#/apr_##name##_set_inherit/{next}
-#/apr_##name##_unset_inherit/{next}
-
-
-function add_symbol (sym_name) {
-	if (count) {
-		found++
-	}
-    gsub (/ /, "", sym_name)
-	line = line sym_name ",\n"
-
-	if (count == 0) {
-		printf(" %s", line)
-		line = ""
-	}
-}
-
-/^[ \t]*AP[RUI]?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
-    sub("[ \t]*AP[RUI]?_DECLARE[^(]*[(][^)]*[)][ \t]*", "")
-    sub("[(].*", "")
-    sub("([^ ]* (^([ \t]*[(])))+", "")
-
-    add_symbol($0)
-    next
-}
-
-/^[ \t]*AP_DECLARE_HOOK[^(]*[(][^)]*/ {
-    split($0, args, ",")
-    symbol = args[2]
-    sub("^[ \t]+", "", symbol)
-    sub("[ \t]+$", "", symbol)
-
-    add_symbol("ap_hook_" symbol)
-    add_symbol("ap_hook_get_" symbol)
-    add_symbol("ap_run_" symbol)
-    next
-}
-
-/^[ \t]*APR_POOL_DECLARE_ACCESSOR[^(]*[(][^)]*[)]/ {
-    sub("[ \t]*APR_POOL_DECLARE_ACCESSOR[^(]*[(]", "", $0)
-    sub("[)].*$", "", $0)
-    add_symbol("apr_" $0 "_pool_get")
-    next
-}
-
-/^[ \t]*APR_DECLARE_INHERIT_SET[^(]*[(][^)]*[)]/ {
-    sub("[ \t]*APR_DECLARE_INHERIT_SET[^(]*[(]", "", $0)
-    sub("[)].*$", "", $0)
-    add_symbol("apr_" $0 "_inherit_set")
-    next
-}
-
-/^[ \t]*APR_DECLARE_INHERIT_UNSET[^(]*[(][^)]*[)]/ {
-    sub("[ \t]*APR_DECLARE_INHERIT_UNSET[^(]*[(]", "", $0)
-    sub("[)].*$", "", $0)
-    add_symbol("apr_" $0 "_inherit_unset")
-    next
-}
-
-/^[ \t]*AP[RUI]?_DECLARE_DATA .*;$/ {
-       varname = $NF;
-       gsub( /[*;]/, "", varname);
-       gsub( /\[.*\]/, "", varname);
-       add_symbol(varname);
-}
-
-
-#END {
-#	printf(" %s", line)
-#}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/make_var_export.awk b/rubbos/app/httpd-2.0.64/srclib/apr/build/make_var_export.awk
deleted file mode 100644
index 59922758..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/make_var_export.awk
+++ /dev/null
@@ -1,59 +0,0 @@
-# Based on apr's make_export.awk, which is
-# based on Ryan Bloom's make_export.pl
-
-/^#[ \t]*if(def)? (AP[RUI]?_|!?defined).*/ {
-	if (old_filename != FILENAME) {
-		if (old_filename != "") printf("%s", line)
-		macro_no = 0
-		found = 0
-		count = 0
-		old_filename = FILENAME
-		line = ""
-	}
-	macro_stack[macro_no++] = macro
-	macro = substr($0, length($1)+2)
-	count++
-	line = line "#ifdef " macro "\n"
-	next
-}
-
-/^#[ \t]*endif/ {
-	if (count > 0) {
-		count--
-		line = line "#endif /* " macro " */\n"
-		macro = macro_stack[--macro_no]
-	}
-	if (count == 0) {
-		if (found != 0) {
-			printf("%s", line)
-		}
-		line = ""
-	}
-	next
-}
-
-function add_symbol (sym_name) {
-	if (count) {
-		found++
-	}
-	for (i = 0; i < count; i++) {
-		line = line "\t"
-	}
-	line = line sym_name "\n"
-
-	if (count == 0) {
-		printf("%s", line)
-		line = ""
-	}
-}
-
-/^[ \t]*(extern[ \t]+)?AP[RUI]?_DECLARE_DATA .*;$/ {
-       varname = $NF;
-       gsub( /[*;]/, "", varname);
-       gsub( /\[.*\]/, "", varname);
-       add_symbol(varname);
-}
-
-END {
-	printf("%s", line)
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/mkdir.sh b/rubbos/app/httpd-2.0.64/srclib/apr/build/mkdir.sh
deleted file mode 100755
index b947c926..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/mkdir.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-## 
-##  mkdir.sh -- make directory hierarchy
-##
-##  Based on `mkinstalldirs' from Noah Friedman <friedman@prep.ai.mit.edu>
-##  as of 1994-03-25, which was placed in the Public Domain.
-##  Cleaned up for Apache's Autoconf-style Interface (APACI)
-##  by Ralf S. Engelschall <rse@apache.org>
-##
-#
-# This script falls under the Apache License.
-# See http://www.apache.org/docs/LICENSE
-
-
-umask 022
-errstatus=0
-for file in ${1+"$@"} ; do 
-    set fnord `echo ":$file" |\
-               sed -e 's/^:\//%/' -e 's/^://' -e 's/\// /g' -e 's/^%/\//'`
-    shift
-    pathcomp=
-    for d in ${1+"$@"}; do
-        pathcomp="$pathcomp$d"
-        case "$pathcomp" in
-            -* ) pathcomp=./$pathcomp ;;
-            ?: ) pathcomp="$pathcomp/" 
-                 continue ;;
-        esac
-        if test ! -d "$pathcomp"; then
-            echo "mkdir $pathcomp" 1>&2
-            mkdir "$pathcomp" || errstatus=$?
-        fi
-        pathcomp="$pathcomp/"
-    done
-done
-exit $errstatus
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/nw_export.inc b/rubbos/app/httpd-2.0.64/srclib/apr/build/nw_export.inc
deleted file mode 100644
index 38e225cb..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/nw_export.inc
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Must include apr.h first so that we can undefine
-    the standard prototypes macros after it messes with
-    them. */
-#include "apr.h"
-
-#undef APR_DECLARE
-#undef APR_DECLARE_NONSTD
-#undef APR_DECLARE_HOOK
-#undef APR_POOL_DECLARE_ACCESSOR
-#undef APR_DECLARE_DATA
-
-/* Preprocess all of the standard APR headers. */
-#include "apr_allocator.h"
-#include "apr_atomic.h"
-#include "apr_compat.h"
-#include "apr_dso.h"
-#include "apr_env.h"
-#include "apr_errno.h"
-#include "apr_file_info.h"
-#include "apr_file_io.h"
-#include "apr_fnmatch.h"
-#include "apr_general.h"
-#include "apr_getopt.h"
-#include "apr_global_mutex.h"
-#include "apr_hash.h"
-#include "apr_inherit.h"
-#include "apr_lib.h"
-#include "apr_mmap.h"
-#include "apr_network_io.h"
-#include "apr_poll.h"
-#include "apr_pools.h"
-#include "apr_portable.h"
-#include "apr_proc_mutex.h"
-#include "apr_ring.h"
-#include "apr_shm.h"
-#include "apr_signal.h"
-#include "apr_strings.h"
-#include "apr_support.h"
-#include "apr_tables.h"
-#include "apr_thread_cond.h"
-#include "apr_thread_mutex.h"
-#include "apr_thread_proc.h"
-#include "apr_thread_rwlock.h"
-#include "apr_time.h"
-#include "apr_user.h"
-#include "apr_version.h"
-#include "apr_want.h"
-
-
-/* Must include apu.h first so that we can undefine
-    the standard prototypes macros after it messes with
-    them. */
-#include "apu.h"
-
-#undef APU_DECLARE
-#undef APU_DECLARE_NONSTD
-#undef APU_DECLARE_DATA
-
-/* Preprocess all of the standard APR headers. */
-#include "apr_anylock.h"
-#include "apr_base64.h"
-#include "apr_buckets.h"
-#include "apr_date.h"
-#include "apr_dbm.h"
-#include "apr_hooks.h"
-#include "apr_md4.h"
-#include "apr_md5.h"
-#include "apr_optional.h"
-#include "apr_optional_hooks.h"
-#include "apr_queue.h"
-#include "apr_reslist.h"
-#include "apr_rmm.h"
-#include "apr_sdbm.h"
-#include "apr_sha1.h"
-#include "apr_strmatch.h"
-#include "apr_uri.h"
-#include "apr_uuid.h"
-#include "apr_xlate.h"
-#include "apr_xml.h"
-#include "apu_compat.h"
-#include "apu_version.h"
-#include "apu_want.h"
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/nw_ver.awk b/rubbos/app/httpd-2.0.64/srclib/apr/build/nw_ver.awk
deleted file mode 100644
index 7eef25fe..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/nw_ver.awk
+++ /dev/null
@@ -1,40 +0,0 @@
-BEGIN {
-
-  # fetch APR version numbers from input file and writes them to STDOUT
-
-  while ((getline < ARGV[1]) > 0) {
-    if (match ($0, /^#define APR_MAJOR_VERSION/)) {
-      ver_major = $3;
-    }
-    else if (match ($0, /^#define APR_MINOR_VERSION/)) {
-      ver_minor = $3;
-    }
-    else if (match ($0, /^#define APR_PATCH_VERSION/)) {
-      ver_patch = $3;
-    }
-    else if (match ($0, /^#define APR_IS_DEV_VERSION/)) {
-      ver_devbuild = 1;
-    }
-  }
-  ver_str = ver_major "." ver_minor "." ver_patch (ver_devbuild ? "-dev" : "");
-  if (WANTED) {
-    ver_num = ver_major * 1000000 + ver_minor * 1000 + ver_patch;
-    if (ver_num < WANTED) {
-      print "ERROR: APR version " ver_str " does NOT match!";
-      exit 1;
-    } else if (ver_num >= 1000000) {
-      print "ERROR: APR version " ver_str " higher than expected!";
-      exit 1;
-    } else {
-      print "OK: APR version " ver_str "";
-      exit 0;
-    }
-  } else {
-    ver_nlm = ver_major "," ver_minor "," ver_patch;
-    print "VERSION = " ver_nlm "";
-    print "VERSION_STR = " ver_str "";
-  }
-
-}
-
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/pkg/README b/rubbos/app/httpd-2.0.64/srclib/apr/build/pkg/README
deleted file mode 100644
index f6b0e633..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/pkg/README
+++ /dev/null
@@ -1,17 +0,0 @@
-The script in this directory will attempt to build a Solaris package
-out of a source tree for APR.
-
-To build a package, make sure you are in the root of the source tree,
-and run:
-
-build/pkg/buildpkg.sh
-
-A Solaris package called apr-<version>-<architecture>-local.gz will be
-created in the root of the source tree.
-
-By default, if you attempt to build packages for apr-util, it will
-search for the sources for apr in:
-
-../apr-<version>
-
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/pkg/buildpkg.sh b/rubbos/app/httpd-2.0.64/srclib/apr/build/pkg/buildpkg.sh
deleted file mode 100755
index 073e89d7..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/pkg/buildpkg.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-# 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.
-#
-#
-
-# buildpkg.sh: This script builds a Solaris PKG from the source tree
-#              provided.
-
-PREFIX=/usr/local
-TEMPDIR=/var/tmp/$USER/apr-root
-rm -rf $TEMPDIR
-
-apr_src_dir=.
-
-while test $# -gt 0 
-do
-  # Normalize
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case "$1" in
-  --with-apr=*)
-  apr_src_dir=$optarg
-  ;;
-  esac
-
-  shift
-done
-
-if [ -f "$apr_src_dir/configure.in" ]; then
-  cd $apr_src_dir
-else
-  echo "The apr source could not be found within $apr_src_dir"
-  echo "Usage: buildpkg [--with-apr=dir]"
-  exit 1
-fi
-
-./configure --prefix=$PREFIX
-make
-make install DESTDIR=$TEMPDIR
-rm $TEMPDIR$PREFIX/lib/apr.exp
-. build/pkg/pkginfo
-cp build/pkg/pkginfo $TEMPDIR$PREFIX
-
-current=`pwd`
-cd $TEMPDIR$PREFIX
-echo "i pkginfo=./pkginfo" > prototype
-find . -print | grep -v ./prototype | grep -v ./pkginfo | pkgproto | awk '{print $1" "$2" "$3" "$4" root bin"}' >> prototype
-mkdir $TEMPDIR/pkg
-pkgmk -r $TEMPDIR$PREFIX -d $TEMPDIR/pkg
-
-cd $current
-pkgtrans -s $TEMPDIR/pkg $current/$NAME-$VERSION-$ARCH-local
-gzip $current/$NAME-$VERSION-$ARCH-local
-
-rm -rf $TEMPDIR
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/pkg/pkginfo b/rubbos/app/httpd-2.0.64/srclib/apr/build/pkg/pkginfo
deleted file mode 100644
index 4fd66333..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/pkg/pkginfo
+++ /dev/null
@@ -1,11 +0,0 @@
-PKG="ASFapr-0"
-NAME="apr"
-ARCH="x86_64"
-VERSION="0.9.19"
-CATEGORY="application"
-VENDOR="Apache Software Foundation"
-EMAIL="dev@apr.apache.org"
-PSTAMP="dev@apr.apache.org"
-BASEDIR="/bottlenecks/rubbos/app/apache2"
-CLASSES="none"
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/pkg/pkginfo.in b/rubbos/app/httpd-2.0.64/srclib/apr/build/pkg/pkginfo.in
deleted file mode 100644
index 91fbc2b7..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/pkg/pkginfo.in
+++ /dev/null
@@ -1,11 +0,0 @@
-PKG="ASFapr-0"
-NAME="apr"
-ARCH="@target_cpu@"
-VERSION="@APR_DOTTED_VERSION@"
-CATEGORY="application"
-VENDOR="Apache Software Foundation"
-EMAIL="dev@apr.apache.org"
-PSTAMP="dev@apr.apache.org"
-BASEDIR="@prefix@"
-CLASSES="none"
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/prebuildNW.bat b/rubbos/app/httpd-2.0.64/srclib/apr/build/prebuildNW.bat
deleted file mode 100755
index 941d920c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/prebuildNW.bat
+++ /dev/null
@@ -1,48 +0,0 @@
-@echo off
-
-if not "%NovellLibC%" == "" goto CheckNDK
-set NovellLibC=\novell\ndk\libc
-@echo Could not find the NovellLibC environment variable
-@echo Setting NovellLibC = %NovellLibC%
-@echo ---------------------  
-
-:CheckNDK
-if exist %NovellLibC%\include\netware.h goto NDKOK
-@echo The path to the NDK "%NovellLibC%" is invalid.
-@echo Please set then NovellLibC environment variable to the location of the NDK
-@echo ---------------------  
-goto Done
-
-:NDKOK
-@echo # As part of the pre-build process, the utility GenURI.NLM
-@echo #  (Gen URI Delims) must be built, copied to a NetWare server 
-@echo #  and run using the following command:
-@echo #
-@echo # "sys:\genuri >sys:\uri_delims.h"
-@echo #
-@echo #  The file "sys:\uri_delims.h" must then be copied to
-@echo #  "apr-util\uri\uri_delims.h" on the build machine.
-
-@echo Fixing up the APR headers
-copy ..\include\apr.hnw ..\include\apr.h
-
-@echo Fixing up the APR-Util headers
-copy ..\..\apr-util\include\apu.hnw ..\..\apr-util\include\apu.h
-copy ..\..\apr-util\include\apu_want.hnw ..\..\apr-util\include\apu_want.h
-copy ..\..\apr-util\include\apr_ldap.hnw ..\..\apr-util\include\apr_ldap.h
-copy ..\..\apr-util\include\private\apu_config.hw ..\..\apr-util\include\private\apu_config.h
-copy ..\..\apr-util\xml\expat\lib\expat.h.in ..\..\apr-util\xml\expat\lib\expat.h
-copy ..\..\apr-util\xml\expat\lib\config.hnw ..\..\apr-util\xml\expat\lib\config.h
-copy ..\..\apr-util\include\private\apu_select_dbm.hw ..\..\apr-util\include\private\apu_select_dbm.h
-
-@echo Fixing up the pcre headers
-copy ..\..\pcre\config.hw ..\..\pcre\config.h
-copy ..\..\pcre\pcre.hw ..\..\pcre\pcre.h
-
-@echo Generating the import list...
-set MWCIncludes=..\include;..\include\arch\netware;..\include\arch\unix;..\..\apr-util\include;+%NovellLibC%
-mwccnlm -P nw_export.inc -d NETWARE -EP
-awk -f make_nw_export.awk nw_export.i |sort >..\aprlib.imp
-
-:Done
-pause
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/rpm/apr.spec.in b/rubbos/app/httpd-2.0.64/srclib/apr/build/rpm/apr.spec.in
deleted file mode 100644
index dd0c2735..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/rpm/apr.spec.in
+++ /dev/null
@@ -1,105 +0,0 @@
-
-%define aprver 0
-
-Summary: Apache Portable Runtime library
-Name: apr
-Version: APR_VERSION
-Release: APR_RELEASE
-License: Apache Software License
-Group: System Environment/Libraries
-URL: http://apr.apache.org/
-Source0: %{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildPrereq: autoconf, libtool, doxygen
-
-%description
-The mission of the Apache Portable Runtime (APR) is to provide a
-free library of C data structures and routines, forming a system
-portability layer to as many operating systems as possible,
-including Unices, MS Win32, BeOS and OS/2.
-
-%package devel
-Group: Development/Libraries
-Summary: APR library development kit
-Requires: apr = %{version}
-
-%description devel
-This package provides the support files which can be used to 
-build applications using the APR library.  The mission of the
-Apache Portable Runtime (APR) is to provide a free library of 
-C data structures and routines.
-
-%prep
-%setup -q
-
-%build
-# regenerate configure script etc.
-./buildconf
-%configure \
-        --prefix=/usr \
-        --includedir=%{_includedir}/apr-%{aprver} \
-        --with-installbuilddir=%{_libdir}/apr/build-%{aprver} \
-        --with-devrandom=/dev/urandom \
-        CC=gcc CXX=g++
-make %{?_smp_mflags} && make dox
-
-%check
-# Run non-interactive tests
-pushd test
-make %{?_smp_mflags} testall CFLAGS=-fno-strict-aliasing
-#./testall -v || exit 1
-popd
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-# Move docs to more convenient location
-mv docs/dox/html html
-
-# Copy helper files for apr-util
-#mkdir $RPM_BUILD_ROOT%{_libdir}/apr/build-%{aprver}
-cp build/apr_common.m4 build/find_apr.m4 build/install.sh \
-   build/config.guess build/config.sub \
-      $RPM_BUILD_ROOT%{_libdir}/apr/build-%{aprver}
-
-# Unpackaged files:
-rm -f $RPM_BUILD_ROOT%{_libdir}/apr.exp
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%doc CHANGES LICENSE NOTICE
-%{_libdir}/libapr-%{aprver}.so.*
-
-%files devel
-%defattr(-,root,root,-)
-%doc docs/APRDesign.html docs/canonical_filenames.html
-%doc docs/incomplete_types docs/non_apr_programs
-%doc --parents html
-%{_bindir}/apr*config
-%{_libdir}/libapr-%{aprver}.*a
-%{_libdir}/libapr-%{aprver}.so
-%dir %{_libdir}/apr
-%dir %{_libdir}/apr/build-%{aprver}
-%{_libdir}/apr/build-%{aprver}/*
-#%{_libdir}/pkgconfig/apr-%{aprver}.pc
-%dir %{_includedir}/apr-%{aprver}
-%{_includedir}/apr-%{aprver}/*.h
-
-%changelog
-* Mon Dec 13 2004 Graham Leggett <minfrin@sharp.fm> 0.9.6-1
-- backport to support v0.9.6 of APR
-
-* Tue Jun 22 2004 Graham Leggett <minfrin@sharp.fm> 1.0.0-1
-- update to support v1.0.0 of APR
-
-* Tue Jun 22 2004 Graham Leggett <minfrin@sharp.fm> 1.0.0-1
-- derived from Fedora Core apr.spec
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/build/win32ver.awk b/rubbos/app/httpd-2.0.64/srclib/apr/build/win32ver.awk
deleted file mode 100644
index e41811df..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/build/win32ver.awk
+++ /dev/null
@@ -1,117 +0,0 @@
-BEGIN {
-
-  # ff bits: 1(debug), 2(prerelease), 4(patched), 8(vendor) and 32(special)
-  # debug is summed based on the /Define _DEBUG
-  # prerelease is based on the -dev extension,
-  # patched is based on a non-standard "-ver" extension, 
-  # special and vendor are toggled by their args.
-  #
-  ff = 0;
-
-  file=ARGV[1];
-  desc=ARGV[2];
-  rel_h=ARGV[3];
-
-  filename = file;
-  if (match(file, /\./)) {
-    sub(/\.[^\.]*$/, "", file);
-  }
-
-  i = 4;
-  while (length(ARGV[i])) {
-    if (match(ARGV[i], /icon=/)) {
-      icon = substr(ARGV[i], 6);
-    }
-    if (match(ARGV[i], /vendor=/)) {
-      vendor = substr(ARGV[i], 8);
-      ff = ff + 8;
-    }
-    if (match(ARGV[i], /special=/)) {
-      special = substr(ARGV[i], 9);
-      ff = ff + 32;
-    }
-    i = i + 1
-  }
-
-  i = i - 1;
-  while (i) {
-    delete ARGV[i];
-    i = i - 1;
-  }
-
-  while ((getline < rel_h) > 0) {
-    if (match ($0, /^#define AP_SERVER_BASEREVISION "[^"]+"/)) {
-      ver = substr($0, RSTART + 32, RLENGTH - 33);
-    }
-  }
-  if (ver) {
-    verc = ver;
-    gsub(/\./, ",", verc);
-    if (build) {
-      sub(/-.*/, "", verc)
-      verc = verc "," build;
-    } else if (sub(/-dev/, ",0", verc)) {
-        ff = ff + 2;
-    } else if (!sub(/-alpha/, ",10", verc)  \
-            && !sub(/-beta/, ",100", verc)  \
-            && !sub(/-gold/, ",200", verc)) {
-      sub(/-.*/, "", verc);
-      verc = verc "," 0;
-    }
-  } else {
-# XXX Gotta fix this for non-httpd installs :(
-    ver = "0.0.0.0"
-    verc = "0,0,0,0"
-    ff = ff + 2;
-  }
-
-  if (length(vendor)) {
-    ff = ff + 8;
-  }
-
-  if (length(icon)) {
-    print "1 ICON DISCARDABLE \"" icon "\"";
-  }
-  print "1 VERSIONINFO";
-  print " FILEVERSION " verc "";
-  print " PRODUCTVERSION " verc "";
-  print " FILEFLAGSMASK 0x3fL";
-  print "#if defined(_DEBUG)"
-  print " FILEFLAGS 0x" sprintf("%02x", ff + 1) "L";
-  print "#else"
-  print " FILEFLAGS 0x" sprintf("%02x", ff) "L";
-  print "#endif"
-  print " FILEOS 0x40004L";
-  print " FILETYPE 0x1L";
-  print " FILESUBTYPE 0x0L";
-  print "BEGIN";
-  print "  BLOCK \"StringFileInfo\"";
-  print "  BEGIN";
-  print "    BLOCK \"040904b0\"";
-  print "    BEGIN";
-  print "      VALUE \"Comments\", \"All rights reserved.  The "\
-        "license is available at <http://www.apache.org/LICENSE.txt>.  "\
-        "The APR project pages are at <http://apr.apache.org/>.\\0\"";
-  print "      VALUE \"CompanyName\", \"Apache Software Foundation\\0\"";
-  print "      VALUE \"FileDescription\", \"" desc "\\0\"";
-  print "      VALUE \"FileVersion\", \"" ver "\\0\"";
-  print "      VALUE \"InternalName\", \"" file "\\0\"";
-  print "      VALUE \"LegalCopyright\", \"Copyright © 2000-2003 "\
-        "The Apache Software Foundation.\\0\"";
-  print "      VALUE \"OriginalFilename\", \"" filename "\\0\"";
-  if (vendor) {
-    print "      VALUE \"PrivateBuild\", \"" vendor "\\0\"";
-  }
-  if (special) {
-    print "      VALUE \"SpecialBuild\", \"" vendor "\\0\"";
-  }
-  print "      VALUE \"ProductName\", \"Apache Portable Runtime\\0\"";
-  print "      VALUE \"ProductVersion\", \"" ver "\\0\"";
-  print "    END";
-  print "  END";
-  print "  BLOCK \"VarFileInfo\"";
-  print "  BEGIN";
-  print "    VALUE \"Translation\", 0x409, 1200";
-  print "  END";
-  print "END";
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/buildconf b/rubbos/app/httpd-2.0.64/srclib/apr/buildconf
deleted file mode 100755
index 2afd04de..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/buildconf
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-# 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.
-#
-#
-
-# buildconf: Build the support scripts needed to compile from a
-#            checked-out version of the source code.
-
-# Verify that the builder has the right config tools installed
-#
-build/buildcheck.sh || exit 1
-
-libtoolize=`build/PrintPath glibtoolize libtoolize`
-if [ "x$libtoolize" = "x" ]; then
-    echo "libtoolize not found in path"
-    exit 1
-fi
-
-# Create the libtool helper files
-#
-# Note: we copy (rather than link) them to simplify distribution.
-# Note: APR supplies its own config.guess and config.sub -- we do not
-#       rely on libtool's versions
-#
-echo "Copying libtool helper files ..."
-
-# Remove any libtool files so one can switch between libtool 1.3
-# and libtool 1.4 by simply rerunning the buildconf script.
-(cd build ; rm -f ltconfig ltmain.sh libtool.m4)
-
-$libtoolize --copy --automake
-
-ltpath=`dirname $libtoolize`
-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
-
-if [ ! -f $ltfile ]; then
-    echo "$ltfile not found"
-    exit 1
-fi
-
-echo "buildconf: Using libtool.m4 at ${ltfile}."
-
-cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
-
-# This is just temporary until people's workspaces are cleared -- remove
-# any old aclocal.m4 left over from prior build so it doesn't cause errors.
-rm -f aclocal.m4
-
-#
-# Generate the autoconf header and ./configure
-#
-echo "Creating include/arch/unix/apr_private.h.in ..."
-${AUTOHEADER:-autoheader}
-
-echo "Creating configure ..."
-### do some work to toss config.cache?
-${AUTOCONF:-autoconf}
-
-# Remove autoconf 2.5x's cache directory
-rm -rf autom4te*.cache
-
-# Create RPM Spec file
-if [ -f `which cut` ]; then
-  echo rebuilding rpm spec file
-  ( REVISION=`build/get-version.sh all include/apr_version.h APR`
-    VERSION=`echo $REVISION | cut -d- -s -f1`
-    RELEASE=`echo $REVISION | cut -d- -s -f2`
-    if [ "x$VERSION" = "x" ]; then
-      VERSION=$REVISION
-      RELEASE=1
-    fi
-    cat ./build/rpm/apr.spec.in | \
-    sed -e "s/APR_VERSION/$VERSION/" \
-        -e "s/APR_RELEASE/$RELEASE/" \
-    > apr.spec )
-fi
-
-exit 0
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/config.layout b/rubbos/app/httpd-2.0.64/srclib/apr/config.layout
deleted file mode 100644
index 731710bd..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/config.layout
+++ /dev/null
@@ -1,231 +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 `apr'
-##  - a trailing plus character (`+') on paths is replaced with a 
-##    `/<target>' suffix where <target> is currently hardcoded to 'apr'.
-##    (This may become a configurable parameter at some point.)
-##
-
-#   Classical APR path layout designed for parallel installs.
-<Layout apr>
-    prefix:        /usr/local/apr
-    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
-    includedir:    ${prefix}/include/apr-${APR_MAJOR_VERSION}
-    localstatedir: ${prefix}
-    libsuffix:     -${APR_MAJOR_VERSION}
-</Layout>
-
-#   Classical single-installation APR path layout.
-<Layout classic>
-    prefix:        /usr/local/apr
-    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
-    includedir:    ${prefix}/include
-    localstatedir: ${prefix}
-</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
-    includedir:    ${prefix}/include+
-    localstatedir: ${prefix}/var+
-    runtimedir:    ${localstatedir}/run
-</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/apr/Modules
-    mandir:        ${exec_prefix}/share/man
-    sysconfdir:    ${prefix}/Configuration
-    datadir:       ${prefix}
-    installbuilddir: /System/Library/apr/Build
-    includedir:    /System/Library/Frameworks/apr.framework/Versions/2.0/Headers
-    localstatedir: /var
-    runtimedir:    ${prefix}/Logs
-</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
-    includedir:    ${prefix}/include+
-    localstatedir: /var
-    runtimedir:    ${localstatedir}/run
-</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/apr
-    mandir:        ${prefix}/man
-    sysconfdir:    /etc/httpd/conf
-    datadir:       /var/www
-    installbuilddir: ${datadir}/build
-    includedir:    ${prefix}/include/apr
-    localstatedir: /var
-    runtimedir:    ${localstatedir}/run
-</Layout>     
-
-#   According to the /opt filesystem conventions
-<Layout opt>
-    prefix:        /opt/apr
-    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
-    includedir:    ${prefix}/include
-    localstatedir: /var${prefix}
-    runtimedir:    ${localstatedir}/run
-</Layout>
-
-#  BeOS layout...
-<Layout beos>
-    prefix:        /boot/home/apr
-    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
-    includedir:    ${prefix}/include
-    localstatedir: ${prefix}
-    runtimedir:    ${localstatedir}/logs
-</Layout>
-
-#   SuSE 6.x layout
-<Layout SuSE>
-    prefix:        /usr
-    exec_prefix:   ${prefix}
-    bindir:        ${prefix}/bin
-    sbindir:       ${prefix}/sbin
-    libdir:        ${prefix}/lib
-    libexecdir:    ${prefix}/lib/apr
-    mandir:        ${prefix}/share/man
-    sysconfdir:    /etc/httpd
-    datadir:       /usr/local/httpd
-    installbuilddir: ${datadir}/build
-    includedir:    ${prefix}/include/apr
-    localstatedir: /var/lib/httpd
-    runtimedir:    /var/run
-</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/apr
-    mandir:        ${exec_prefix}/man
-    sysconfdir:    ${prefix}/conf
-    datadir:       ${prefix}
-    installbuilddir: ${datadir}/build
-    includedir:    ${exec_prefix}/include/apr
-    localstatedir: /var
-    runtimedir:    ${localstatedir}/run
-</Layout>
-
-#   Solaris 8 Layout
-<Layout Solaris>
-    prefix:        /usr/apr
-    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/apr
-    datadir:       /var/apr
-    installbuilddir: ${datadir}/build
-    includedir:    ${exec_prefix}/include
-    localstatedir: ${prefix}
-    runtimedir:    /var/run
-</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/apr/modules
-    mandir:        ${exec_prefix}/share/man
-    sysconfdir:    ${prefix}/conf
-    datadir:       ${prefix}
-    installbuilddir: ${prefix}/build
-    includedir:    ${exec_prefix}/lib/apr/include
-    localstatedir: ${prefix}
-    runtimedir:    ${prefix}/logs
-</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/apr/modules
-    mandir:        ${exec_prefix}/share/man
-    datadir:       ${exec_prefix}/share/apr
-    includedir:    ${exec_prefix}/include/apr-${APR_MAJOR_VERSION}
-    localstatedir: ${prefix}/var/run
-    runtimedir:    ${prefix}/var/run
-    infodir:       ${exec_prefix}/share/info
-    libsuffix:    -${APR_MAJOR_VERSION}
-</Layout>
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/config.log b/rubbos/app/httpd-2.0.64/srclib/apr/config.log
deleted file mode 100644
index ab60c1ba..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/config.log
+++ /dev/null
@@ -1,12911 +0,0 @@
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by configure, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
-
-  $ /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/configure --disable-option-checking --prefix=/bottlenecks/rubbos/app/apache2 --enable-module=so --enable-so --with-mpm=worker --cache-file=/dev/null --srcdir=/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr --prefix=/bottlenecks/rubbos/app/apache2 --exec-prefix=/bottlenecks/rubbos/app/apache2 --libdir=${prefix}/lib --includedir=/bottlenecks/rubbos/app/apache2/include --bindir=${prefix}/bin --datadir=/bottlenecks/rubbos/app/apache2 --with-installbuilddir=${prefix}/build
-
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = ubuntu
-uname -m = x86_64
-uname -r = 3.16.0-30-generic
-uname -s = Linux
-uname -v = #40~14.04.1-Ubuntu SMP Thu Jan 15 17:43:14 UTC 2015
-
-/usr/bin/uname -p = unknown
-/bin/uname -X     = unknown
-
-/bin/arch              = unknown
-/usr/bin/arch -k       = unknown
-/usr/convex/getsysinfo = unknown
-/usr/bin/hostinfo      = unknown
-/bin/machine           = unknown
-/usr/bin/oslevel       = unknown
-/bin/universe          = unknown
-
-PATH: /bottlenecks/rubbos/app/jdk1.6.0_27/bin
-PATH: /bin/unix
-PATH: /bottlenecks/rubbos/app/apache-ant-1.6.5/bin
-PATH: /bottlenecks/rubbos/app/apache-tomcat-5.5.17/bin
-PATH: /usr/local/sbin
-PATH: /usr/local/bin
-PATH: /usr/sbin
-PATH: /usr/bin
-PATH: /sbin
-PATH: /bin
-PATH: /usr/games
-PATH: /usr/local/games
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-configure:2931: checking build system type
-configure:2949: result: x86_64-unknown-linux-gnu
-configure:2971: checking host system type
-configure:2986: result: x86_64-unknown-linux-gnu
-configure:3008: checking target system type
-configure:3023: result: x86_64-unknown-linux-gnu
-configure:3087: checking for working mkdir -p
-configure:3103: result: yes
-configure:3188: checking for chosen layout
-configure:3190: result: apr
-configure:3457: checking for gcc
-configure:3473: found /usr/bin/gcc
-configure:3484: result: gcc
-configure:3716: checking for C compiler version
-configure:3724: gcc --version >&5
-gcc (Ubuntu 4.8.4-2ubuntu1~14.04) 4.8.4
-Copyright (C) 2013 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-configure:3728: $? = 0
-configure:3735: gcc -v >&5
-Using built-in specs.
-COLLECT_GCC=gcc
-COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/4.8/lto-wrapper
-Target: x86_64-linux-gnu
-Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.8.4-2ubuntu1~14.04' --with-bugurl=file:///usr/share/doc/gcc-4.8/README.Bugs --enable-languages=c,c++,java,go,d,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.8 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.8 --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --enable-gnu-unique-object --disable-libmudflap --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-4.8-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-4.8-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-4.8-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-objc-gc --enable-multiarch --disable-werror --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
-Thread model: posix
-gcc version 4.8.4 (Ubuntu 4.8.4-2ubuntu1~14.04) 
-configure:3739: $? = 0
-configure:3746: gcc -V >&5
-gcc: error: unrecognized command line option '-V'
-gcc: fatal error: no input files
-compilation terminated.
-configure:3750: $? = 4
-configure:3773: checking for C compiler default output file name
-configure:3795: gcc    conftest.c  >&5
-configure:3799: $? = 0
-configure:3837: result: a.out
-configure:3856: checking whether the C compiler works
-configure:3866: ./a.out
-configure:3870: $? = 0
-configure:3889: result: yes
-configure:3896: checking whether we are cross compiling
-configure:3898: result: no
-configure:3901: checking for suffix of executables
-configure:3908: gcc -o conftest    conftest.c  >&5
-configure:3912: $? = 0
-configure:3938: result: 
-configure:3944: checking for suffix of object files
-configure:3970: gcc -c   conftest.c >&5
-configure:3974: $? = 0
-configure:3999: result: o
-configure:4003: checking whether we are using the GNU C compiler
-configure:4032: gcc -c   conftest.c >&5
-configure:4039: $? = 0
-configure:4056: result: yes
-configure:4065: checking whether gcc accepts -g
-configure:4095: gcc -c -g  conftest.c >&5
-configure:4102: $? = 0
-configure:4203: result: yes
-configure:4220: checking for gcc option to accept ISO C89
-configure:4294: gcc  -c -g -O2  conftest.c >&5
-configure:4301: $? = 0
-configure:4324: result: none needed
-configure:7489: checking whether make sets $(MAKE)
-configure:7511: result: yes
-configure:7525: checking how to run the C preprocessor
-configure:7565: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:7572: $? = 0
-configure:7603: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:8:28: fatal error: ac_nonexistent.h: No such file or directory
- #include <ac_nonexistent.h>
-                            ^
-compilation terminated.
-configure:7610: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| /* end confdefs.h.  */
-| #include <ac_nonexistent.h>
-configure:7643: result: gcc -E
-configure:7672: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:7679: $? = 0
-configure:7710: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:8:28: fatal error: ac_nonexistent.h: No such file or directory
- #include <ac_nonexistent.h>
-                            ^
-compilation terminated.
-configure:7717: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| /* end confdefs.h.  */
-| #include <ac_nonexistent.h>
-configure:7760: checking for gawk
-configure:7776: found /usr/bin/gawk
-configure:7787: result: gawk
-configure:7798: checking whether ln -s works
-configure:7802: result: yes
-configure:7852: checking for ranlib
-configure:7868: found /usr/bin/ranlib
-configure:7879: result: ranlib
-configure:7915: checking for a BSD-compatible install
-configure:7983: result: /usr/bin/install -c
-configure:7996: checking for rm
-configure:8012: found /bin/rm
-configure:8023: result: rm
-configure:8033: checking for as
-configure:8049: found /usr/bin/as
-configure:8060: result: as
-configure:8070: checking for cpp
-configure:8086: found /usr/bin/cpp
-configure:8097: result: cpp
-configure:8148: checking for ar
-configure:8164: found /usr/bin/ar
-configure:8175: result: ar
-configure:8201: checking for grep that handles long lines and -e
-configure:8261: result: /bin/grep
-configure:8266: checking for egrep
-configure:8330: result: /bin/grep -E
-configure:8335: checking for ANSI C header files
-configure:8365: gcc -c -g -O2 -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:8372: $? = 0
-configure:8471: gcc -o conftest -g -O2 -D_REENTRANT -D_GNU_SOURCE  conftest.c  >&5
-configure:8475: $? = 0
-configure:8481: ./conftest
-configure:8485: $? = 0
-configure:8503: result: yes
-configure:8527: checking for sys/types.h
-configure:8548: gcc -c -g -O2 -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:8555: $? = 0
-configure:8572: result: yes
-configure:8527: checking for sys/stat.h
-configure:8548: gcc -c -g -O2 -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:8555: $? = 0
-configure:8572: result: yes
-configure:8527: checking for stdlib.h
-configure:8548: gcc -c -g -O2 -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:8555: $? = 0
-configure:8572: result: yes
-configure:8527: checking for string.h
-configure:8548: gcc -c -g -O2 -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:8555: $? = 0
-configure:8572: result: yes
-configure:8527: checking for memory.h
-configure:8548: gcc -c -g -O2 -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:8555: $? = 0
-configure:8572: result: yes
-configure:8527: checking for strings.h
-configure:8548: gcc -c -g -O2 -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:8555: $? = 0
-configure:8572: result: yes
-configure:8527: checking for inttypes.h
-configure:8548: gcc -c -g -O2 -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:8555: $? = 0
-configure:8572: result: yes
-configure:8527: checking for stdint.h
-configure:8548: gcc -c -g -O2 -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:8555: $? = 0
-configure:8572: result: yes
-configure:8527: checking for unistd.h
-configure:8548: gcc -c -g -O2 -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:8555: $? = 0
-configure:8572: result: yes
-configure:8597: checking minix/config.h usability
-configure:8614: gcc -c -g -O2 -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:51:26: fatal error: minix/config.h: No such file or directory
- #include <minix/config.h>
-                          ^
-compilation terminated.
-configure:8621: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <minix/config.h>
-configure:8635: result: no
-configure:8639: checking minix/config.h presence
-configure:8654: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:18:26: fatal error: minix/config.h: No such file or directory
- #include <minix/config.h>
-                          ^
-compilation terminated.
-configure:8661: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| /* end confdefs.h.  */
-| #include <minix/config.h>
-configure:8675: result: no
-configure:8703: checking for minix/config.h
-configure:8710: result: no
-configure:8741: checking whether it is safe to define __EXTENSIONS__
-configure:8769: gcc -c -g -O2 -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:8776: $? = 0
-configure:8791: result: yes
-configure:8817: checking for library containing strerror
-configure:8858: gcc -o conftest -g -O2 -D_REENTRANT -D_GNU_SOURCE  conftest.c  >&5
-configure:8865: $? = 0
-configure:8896: result: none required
-configure:8905: checking whether system uses EBCDIC
-configure:8934: gcc -o conftest -g -O2 -D_REENTRANT -D_GNU_SOURCE  conftest.c  >&5
-configure:8938: $? = 0
-configure:8944: ./conftest
-configure:8948: $? = 1
-configure: program exited with status 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| /* end confdefs.h.  */
-| 
-| int main(void) {
-|   return (unsigned char)'A' != (unsigned char)0xC1;
-| }
-| 
-configure:8969: result: no
-configure:9087: checking for a sed that does not truncate output
-configure:9143: result: /bin/sed
-configure:9157: checking for ld used by gcc
-configure:9224: result: /usr/bin/ld
-configure:9233: checking if the linker (/usr/bin/ld) is GNU ld
-configure:9248: result: yes
-configure:9253: checking for /usr/bin/ld option to reload object files
-configure:9260: result: -r
-configure:9278: checking for BSD-compatible nm
-configure:9327: result: /usr/bin/nm -B
-configure:9331: checking how to recognize dependent libraries
-configure:9517: result: pass_all
-configure:9605: gcc -c -g -O2 -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:9608: $? = 0
-configure:9777: checking dlfcn.h usability
-configure:9794: gcc -c -g -O2 -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:9801: $? = 0
-configure:9815: result: yes
-configure:9819: checking dlfcn.h presence
-configure:9834: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:9841: $? = 0
-configure:9855: result: yes
-configure:9883: checking for dlfcn.h
-configure:9892: result: yes
-configure:9965: checking for g++
-configure:9981: found /usr/bin/g++
-configure:9992: result: g++
-configure:10019: checking for C++ compiler version
-configure:10027: g++ --version >&5
-g++ (Ubuntu 4.8.4-2ubuntu1~14.04) 4.8.4
-Copyright (C) 2013 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-configure:10031: $? = 0
-configure:10038: g++ -v >&5
-Using built-in specs.
-COLLECT_GCC=g++
-COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/4.8/lto-wrapper
-Target: x86_64-linux-gnu
-Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.8.4-2ubuntu1~14.04' --with-bugurl=file:///usr/share/doc/gcc-4.8/README.Bugs --enable-languages=c,c++,java,go,d,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.8 --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.8 --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --enable-gnu-unique-object --disable-libmudflap --enable-plugin --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-4.8-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-4.8-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-4.8-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --enable-objc-gc --enable-multiarch --disable-werror --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
-Thread model: posix
-gcc version 4.8.4 (Ubuntu 4.8.4-2ubuntu1~14.04) 
-configure:10042: $? = 0
-configure:10049: g++ -V >&5
-g++: error: unrecognized command line option '-V'
-g++: fatal error: no input files
-compilation terminated.
-configure:10053: $? = 4
-configure:10056: checking whether we are using the GNU C++ compiler
-configure:10085: g++ -c  -D_REENTRANT -D_GNU_SOURCE conftest.cpp >&5
-configure:10092: $? = 0
-configure:10109: result: yes
-configure:10118: checking whether g++ accepts -g
-configure:10148: g++ -c -g -D_REENTRANT -D_GNU_SOURCE conftest.cpp >&5
-configure:10155: $? = 0
-configure:10256: result: yes
-configure:10289: checking how to run the C++ preprocessor
-configure:10325: g++ -E -D_REENTRANT -D_GNU_SOURCE conftest.cpp
-configure:10332: $? = 0
-configure:10363: g++ -E -D_REENTRANT -D_GNU_SOURCE conftest.cpp
-conftest.cpp:24:28: fatal error: ac_nonexistent.h: No such file or directory
- #include <ac_nonexistent.h>
-                            ^
-compilation terminated.
-configure:10370: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| /* end confdefs.h.  */
-| #include <ac_nonexistent.h>
-configure:10403: result: g++ -E
-configure:10432: g++ -E -D_REENTRANT -D_GNU_SOURCE conftest.cpp
-configure:10439: $? = 0
-configure:10470: g++ -E -D_REENTRANT -D_GNU_SOURCE conftest.cpp
-conftest.cpp:24:28: fatal error: ac_nonexistent.h: No such file or directory
- #include <ac_nonexistent.h>
-                            ^
-compilation terminated.
-configure:10477: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| /* end confdefs.h.  */
-| #include <ac_nonexistent.h>
-configure:10572: checking for g77
-configure:10602: result: no
-configure:10572: checking for xlf
-configure:10602: result: no
-configure:10572: checking for f77
-configure:10602: result: no
-configure:10572: checking for frt
-configure:10602: result: no
-configure:10572: checking for pgf77
-configure:10602: result: no
-configure:10572: checking for cf77
-configure:10602: result: no
-configure:10572: checking for fort77
-configure:10602: result: no
-configure:10572: checking for fl32
-configure:10602: result: no
-configure:10572: checking for af77
-configure:10602: result: no
-configure:10572: checking for xlf90
-configure:10602: result: no
-configure:10572: checking for f90
-configure:10602: result: no
-configure:10572: checking for pgf90
-configure:10602: result: no
-configure:10572: checking for pghpf
-configure:10602: result: no
-configure:10572: checking for epcf90
-configure:10602: result: no
-configure:10572: checking for gfortran
-configure:10602: result: no
-configure:10572: checking for g95
-configure:10602: result: no
-configure:10572: checking for xlf95
-configure:10602: result: no
-configure:10572: checking for f95
-configure:10602: result: no
-configure:10572: checking for fort
-configure:10602: result: no
-configure:10572: checking for ifort
-configure:10602: result: no
-configure:10572: checking for ifc
-configure:10602: result: no
-configure:10572: checking for efc
-configure:10602: result: no
-configure:10572: checking for pgf95
-configure:10602: result: no
-configure:10572: checking for lf95
-configure:10602: result: no
-configure:10572: checking for ftn
-configure:10602: result: no
-configure:10625: checking for Fortran 77 compiler version
-configure:10633:  --version >&5
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/configure: line 10635: --version: command not found
-configure:10637: $? = 127
-configure:10644:  -v >&5
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/configure: line 10646: -v: command not found
-configure:10648: $? = 127
-configure:10655:  -V >&5
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/configure: line 10657: -V: command not found
-configure:10659: $? = 127
-configure:10667: checking whether we are using the GNU Fortran 77 compiler
-configure:10686:  -c  conftest.F >&5
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/configure: line 10688: -c: command not found
-configure:10693: $? = 127
-configure: failed program was:
-|       program main
-| #ifndef __GNUC__
-|        choke me
-| #endif
-| 
-|       end
-configure:10710: result: no
-configure:10716: checking whether  accepts -g
-configure:10733:  -c -g conftest.f >&5
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/configure: line 10735: -c: command not found
-configure:10740: $? = 127
-configure: failed program was:
-|       program main
-| 
-|       end
-configure:10756: result: no
-configure:10789: checking the maximum length of command line arguments
-configure:10901: result: 1572864
-configure:10913: checking command to parse /usr/bin/nm -B output from gcc object
-configure:11018: gcc -c -g -O2 -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:11021: $? = 0
-configure:11025: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ 	]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ 	][ 	]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' \> conftest.nm
-configure:11028: $? = 0
-configure:11080: gcc -o conftest -g -O2 -D_REENTRANT -D_GNU_SOURCE  conftest.c conftstm.o >&5
-configure:11083: $? = 0
-configure:11121: result: ok
-configure:11125: checking for objdir
-configure:11140: result: .libs
-configure:11232: checking for ar
-configure:11259: result: ar
-configure:11324: checking for ranlib
-configure:11351: result: ranlib
-configure:11416: checking for strip
-configure:11432: found /usr/bin/strip
-configure:11443: result: strip
-configure:12037: checking if gcc supports -fno-rtti -fno-exceptions
-configure:12055: gcc -c -g -O2 -D_REENTRANT -D_GNU_SOURCE -fno-rtti -fno-exceptions conftest.c >&5
-cc1: warning: command line option '-fno-rtti' is valid for C++/ObjC++ but not for C [enabled by default]
-configure:12059: $? = 0
-configure:12072: result: no
-configure:12087: checking for gcc option to produce PIC
-configure:12319: result: -fPIC
-configure:12327: checking if gcc PIC flag -fPIC works
-configure:12345: gcc -c -g -O2 -D_REENTRANT -D_GNU_SOURCE -fPIC -DPIC conftest.c >&5
-configure:12349: $? = 0
-configure:12362: result: yes
-configure:12390: checking if gcc static flag -static works
-configure:12418: result: yes
-configure:12428: checking if gcc supports -c -o file.o
-configure:12449: gcc -c -g -O2 -D_REENTRANT -D_GNU_SOURCE -o out/conftest2.o conftest.c >&5
-configure:12453: $? = 0
-configure:12475: result: yes
-configure:12501: checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
-configure:13489: result: yes
-configure:13510: checking whether -lc should be explicitly linked in
-configure:13515: gcc -c -g -O2 -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:13518: $? = 0
-configure:13533: gcc -shared conftest.o  -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| grep  -lc  \>/dev/null 2\>\&1
-configure:13536: $? = 0
-configure:13548: result: no
-configure:13556: checking dynamic linker characteristics
-configure:14160: result: GNU/Linux ld.so
-configure:14184: checking how to hardcode library paths into programs
-configure:14209: result: immediate
-configure:14223: checking whether stripping libraries is possible
-configure:14228: result: yes
-configure:15058: checking if libtool supports shared libraries
-configure:15060: result: yes
-configure:15063: checking whether to build shared libraries
-configure:15084: result: yes
-configure:15087: checking whether to build static libraries
-configure:15091: result: yes
-configure:15185: creating libtool
-configure:15778: checking for ld used by g++
-configure:15845: result: /usr/bin/ld -m elf_x86_64
-configure:15854: checking if the linker (/usr/bin/ld -m elf_x86_64) is GNU ld
-configure:15869: result: yes
-configure:15920: checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
-configure:16874: result: yes
-configure:16895: g++ -c -g -O2 -D_REENTRANT -D_GNU_SOURCE conftest.cpp >&5
-configure:16898: $? = 0
-configure:17054: checking for g++ option to produce PIC
-configure:17338: result: -fPIC
-configure:17346: checking if g++ PIC flag -fPIC works
-configure:17364: g++ -c -g -O2 -D_REENTRANT -D_GNU_SOURCE -fPIC -DPIC conftest.cpp >&5
-configure:17368: $? = 0
-configure:17381: result: yes
-configure:17409: checking if g++ static flag -static works
-configure:17437: result: yes
-configure:17447: checking if g++ supports -c -o file.o
-configure:17468: g++ -c -g -O2 -D_REENTRANT -D_GNU_SOURCE -o out/conftest2.o conftest.cpp >&5
-configure:17472: $? = 0
-configure:17494: result: yes
-configure:17520: checking whether the g++ linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
-configure:17546: result: yes
-configure:17613: checking dynamic linker characteristics
-configure:18165: result: GNU/Linux ld.so
-configure:18189: checking how to hardcode library paths into programs
-configure:18214: result: immediate
-configure:25518: checking for res_init in -lresolv
-configure:25553: gcc -o conftest -g -O2 -D_REENTRANT -D_GNU_SOURCE  conftest.c -lresolv   >&5
-/tmp/cc8dGFK1.o: In function `main':
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/conftest.c:35: undefined reference to `res_init'
-collect2: error: ld returned 1 exit status
-configure:25560: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| /* end confdefs.h.  */
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char res_init ();
-| int
-| main ()
-| {
-| return res_init ();
-|   ;
-|   return 0;
-| }
-configure:25581: result: no
-configure:25593: checking for gethostbyname in -lnsl
-configure:25628: gcc -o conftest -g -O2 -D_REENTRANT -D_GNU_SOURCE  conftest.c -lnsl   >&5
-configure:25635: $? = 0
-configure:25656: result: yes
-configure:25667: checking for library containing gethostname
-configure:25708: gcc -o conftest -g -O2 -D_REENTRANT -D_GNU_SOURCE  conftest.c -lnsl  >&5
-configure:25715: $? = 0
-configure:25746: result: none required
-configure:25755: checking for socket in -lsocket
-configure:25790: gcc -o conftest -g -O2 -D_REENTRANT -D_GNU_SOURCE  conftest.c -lsocket  -lnsl  >&5
-/usr/bin/ld: cannot find -lsocket
-collect2: error: ld returned 1 exit status
-configure:25797: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| /* end confdefs.h.  */
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char socket ();
-| int
-| main ()
-| {
-| return socket ();
-|   ;
-|   return 0;
-| }
-configure:25818: result: no
-configure:25829: checking for library containing crypt
-configure:25870: gcc -o conftest -g -O2 -D_REENTRANT -D_GNU_SOURCE  conftest.c -lnsl  >&5
-/tmp/ccTRafjf.o: In function `main':
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/conftest.c:36: undefined reference to `crypt'
-collect2: error: ld returned 1 exit status
-configure:25877: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| /* end confdefs.h.  */
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char crypt ();
-| int
-| main ()
-| {
-| return crypt ();
-|   ;
-|   return 0;
-| }
-configure:25870: gcc -o conftest -g -O2 -D_REENTRANT -D_GNU_SOURCE  conftest.c -lcrypt  -lnsl  >&5
-configure:25877: $? = 0
-configure:25908: result: -lcrypt
-configure:25917: checking for main in -ltruerand
-configure:25946: gcc -o conftest -g -O2 -D_REENTRANT -D_GNU_SOURCE  conftest.c -ltruerand  -lcrypt -lnsl  >&5
-/usr/bin/ld: cannot find -ltruerand
-collect2: error: ld returned 1 exit status
-configure:25953: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| /* end confdefs.h.  */
-| 
-| 
-| int
-| main ()
-| {
-| return main ();
-|   ;
-|   return 0;
-| }
-configure:25974: result: no
-configure:25985: checking for library containing modf
-configure:26026: gcc -o conftest -g -O2 -D_REENTRANT -D_GNU_SOURCE  conftest.c -lcrypt -lnsl  >&5
-conftest.c:32:6: warning: conflicting types for built-in function 'modf' [enabled by default]
- char modf ();
-      ^
-configure:26033: $? = 0
-configure:26064: result: none required
-configure:26072: checking for library containing sqrt
-configure:26113: gcc -o conftest -g -O2 -D_REENTRANT -D_GNU_SOURCE  conftest.c -lcrypt -lnsl  >&5
-conftest.c:32:6: warning: conflicting types for built-in function 'sqrt' [enabled by default]
- char sqrt ();
-      ^
-/tmp/cciET2lf.o: In function `main':
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/conftest.c:36: undefined reference to `sqrt'
-collect2: error: ld returned 1 exit status
-configure:26120: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| /* end confdefs.h.  */
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char sqrt ();
-| int
-| main ()
-| {
-| return sqrt ();
-|   ;
-|   return 0;
-| }
-configure:26113: gcc -o conftest -g -O2 -D_REENTRANT -D_GNU_SOURCE  conftest.c -lm  -lcrypt -lnsl  >&5
-conftest.c:32:6: warning: conflicting types for built-in function 'sqrt' [enabled by default]
- char sqrt ();
-      ^
-configure:26120: $? = 0
-configure:26151: result: -lm
-configure:26187: checking pthread.h usability
-configure:26204: gcc -c -g -O2 -D_REENTRANT -D_GNU_SOURCE -w conftest.c >&5
-configure:26211: $? = 0
-configure:26225: result: yes
-configure:26229: checking pthread.h presence
-configure:26244: gcc -E -D_REENTRANT -D_GNU_SOURCE -w conftest.c
-configure:26251: $? = 0
-configure:26265: result: yes
-configure:26293: checking for pthread.h
-configure:26302: result: yes
-configure:26489: checking for CFLAGS needed for pthreads
-configure:26531: gcc -o conftest -g -O2 -D_REENTRANT -D_GNU_SOURCE  conftest.c -lm -lcrypt -lnsl  >&5
-/tmp/ccKuAZUs.o: In function `main':
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/conftest.c:39: undefined reference to `pthread_mutexattr_init'
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/conftest.c:40: undefined reference to `pthread_create'
-collect2: error: ld returned 1 exit status
-configure:26535: $? = 1
-configure: program exited with status 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| /* end confdefs.h.  */
-| 
-| #include <pthread.h>
-| #include <stddef.h>
-| 
-| void *thread_routine(void *data) {
-|     return data;
-| }
-| 
-| int main() {
-|     pthread_t thd;
-|     pthread_mutexattr_t mattr;
-|     pthread_once_t once_init = PTHREAD_ONCE_INIT;
-|     int data = 1;
-|     pthread_mutexattr_init(&mattr);
-|     return pthread_create(&thd, NULL, thread_routine, &data);
-| }
-configure:26531: gcc -o conftest -g -O2 -kthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lm -lcrypt -lnsl  >&5
-gcc: error: unrecognized command line option '-kthread'
-configure:26535: $? = 1
-configure: program exited with status 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| /* end confdefs.h.  */
-| 
-| #include <pthread.h>
-| #include <stddef.h>
-| 
-| void *thread_routine(void *data) {
-|     return data;
-| }
-| 
-| int main() {
-|     pthread_t thd;
-|     pthread_mutexattr_t mattr;
-|     pthread_once_t once_init = PTHREAD_ONCE_INIT;
-|     int data = 1;
-|     pthread_mutexattr_init(&mattr);
-|     return pthread_create(&thd, NULL, thread_routine, &data);
-| }
-configure:26531: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lm -lcrypt -lnsl  >&5
-configure:26535: $? = 0
-configure:26541: ./conftest
-configure:26545: $? = 0
-configure:26574: result: -pthread
-configure:26610: checking for LIBS needed for pthreads
-configure:26652: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lm -lcrypt -lnsl  -lpthread >&5
-configure:26656: $? = 0
-configure:26662: ./conftest
-configure:26666: $? = 0
-configure:26695: result: -lpthread
-configure:26738: checking for pthread.h
-configure:26745: result: yes
-configure:27652: checking whether pthread_getspecific takes two arguments
-configure:27685: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:37:1: error: too many arguments to function 'pthread_getspecific'
- pthread_getspecific(key,&tmp);
- ^
-In file included from conftest.c:29:0:
-/usr/include/pthread.h:1130:14: note: declared here
- extern void *pthread_getspecific (pthread_key_t __key) __THROW;
-              ^
-configure:27692: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| /* end confdefs.h.  */
-| 
-| #include <pthread.h>
-| 
-| int
-| main ()
-| {
-| 
-| pthread_key_t key;
-| void *tmp;
-| pthread_getspecific(key,&tmp);
-| 
-|   ;
-|   return 0;
-| }
-configure:27712: result: no
-configure:27724: checking whether pthread_attr_getdetachstate takes one argument
-configure:27756: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:36:1: error: too few arguments to function 'pthread_attr_getdetachstate'
- pthread_attr_getdetachstate(attr);
- ^
-In file included from conftest.c:29:0:
-/usr/include/pthread.h:305:12: note: declared here
- extern int pthread_attr_getdetachstate (const pthread_attr_t *__attr,
-            ^
-configure:27763: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| /* end confdefs.h.  */
-| 
-| #include <pthread.h>
-| 
-| int
-| main ()
-| {
-| 
-| pthread_attr_t *attr;
-| pthread_attr_getdetachstate(attr);
-| 
-|   ;
-|   return 0;
-| }
-configure:27783: result: no
-configure:27799: checking for pthread_key_delete
-configure:27855: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lm -lcrypt -lnsl  -lpthread >&5
-configure:27862: $? = 0
-configure:27884: result: yes
-configure:27799: checking for pthread_rwlock_init
-configure:27855: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lm -lcrypt -lnsl  -lpthread >&5
-configure:27862: $? = 0
-configure:27884: result: yes
-configure:27898: checking for pthread_rwlock_t
-configure:27925: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:27932: $? = 0
-configure:27947: result: yes
-configure:27960: checking for recursive mutex support
-configure:27993: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lm -lcrypt -lnsl  -lpthread >&5
-configure:27997: $? = 0
-configure:28003: ./conftest
-configure:28007: $? = 0
-configure:28024: result: yes
-configure:28043: checking for readdir in -lc_r
-configure:28078: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lc_r  -lm -lcrypt -lnsl  -lpthread >&5
-/usr/bin/ld: cannot find -lc_r
-collect2: error: ld returned 1 exit status
-configure:28085: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| /* end confdefs.h.  */
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char readdir ();
-| int
-| main ()
-| {
-| return readdir ();
-|   ;
-|   return 0;
-| }
-configure:28106: result: no
-configure:28117: checking for gethostbyname in -lc_r
-configure:28152: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lc_r  -lm -lcrypt -lnsl  -lpthread >&5
-/usr/bin/ld: cannot find -lc_r
-collect2: error: ld returned 1 exit status
-configure:28159: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| /* end confdefs.h.  */
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char gethostbyname ();
-| int
-| main ()
-| {
-| return gethostbyname ();
-|   ;
-|   return 0;
-| }
-configure:28180: result: no
-configure:28195: checking for gethostbyaddr in -lc_r
-configure:28230: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lc_r  -lm -lcrypt -lnsl  -lpthread >&5
-/usr/bin/ld: cannot find -lc_r
-collect2: error: ld returned 1 exit status
-configure:28237: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| /* end confdefs.h.  */
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char gethostbyaddr ();
-| int
-| main ()
-| {
-| return gethostbyaddr ();
-|   ;
-|   return 0;
-| }
-configure:28258: result: no
-configure:28277: checking for gethostbyname_r
-configure:28333: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lm -lcrypt -lnsl  -lpthread >&5
-configure:28340: $? = 0
-configure:28362: result: yes
-configure:28277: checking for gethostbyaddr_r
-configure:28333: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lm -lcrypt -lnsl  -lpthread >&5
-configure:28340: $? = 0
-configure:28362: result: yes
-configure:28382: checking for sigsuspend
-configure:28438: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lm -lcrypt -lnsl  -lpthread >&5
-configure:28445: $? = 0
-configure:28467: result: yes
-configure:28485: checking for sigwait
-configure:28541: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lm -lcrypt -lnsl  -lpthread >&5
-configure:28548: $? = 0
-configure:28570: result: yes
-configure:28598: checking for poll
-configure:28654: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lm -lcrypt -lnsl  -lpthread >&5
-configure:28661: $? = 0
-configure:28683: result: yes
-configure:28703: checking for getpwnam_r
-configure:28759: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lm -lcrypt -lnsl  -lpthread >&5
-configure:28766: $? = 0
-configure:28788: result: yes
-configure:28703: checking for getpwuid_r
-configure:28759: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lm -lcrypt -lnsl  -lpthread >&5
-configure:28766: $? = 0
-configure:28788: result: yes
-configure:28703: checking for getgrnam_r
-configure:28759: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lm -lcrypt -lnsl  -lpthread >&5
-configure:28766: $? = 0
-configure:28788: result: yes
-configure:28703: checking for getgrgid_r
-configure:28759: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lm -lcrypt -lnsl  -lpthread >&5
-configure:28766: $? = 0
-configure:28788: result: yes
-configure:28805: checking for library containing shm_open
-configure:28846: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lm -lcrypt -lnsl  -lpthread >&5
-/tmp/ccz1UcbD.o: In function `main':
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/conftest.c:52: undefined reference to `shm_open'
-collect2: error: ld returned 1 exit status
-configure:28853: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| /* end confdefs.h.  */
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char shm_open ();
-| int
-| main ()
-| {
-| return shm_open ();
-|   ;
-|   return 0;
-| }
-configure:28846: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt  -lm -lcrypt -lnsl  -lpthread >&5
-configure:28853: $? = 0
-configure:28884: result: -lrt
-configure:28923: checking sys/mman.h usability
-configure:28940: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:28947: $? = 0
-configure:28961: result: yes
-configure:28965: checking sys/mman.h presence
-configure:28980: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:28987: $? = 0
-configure:29001: result: yes
-configure:29029: checking for sys/mman.h
-configure:29038: result: yes
-configure:28923: checking sys/ipc.h usability
-configure:28940: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:28947: $? = 0
-configure:28961: result: yes
-configure:28965: checking sys/ipc.h presence
-configure:28980: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:28987: $? = 0
-configure:29001: result: yes
-configure:29029: checking for sys/ipc.h
-configure:29038: result: yes
-configure:28923: checking sys/mutex.h usability
-configure:28940: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:76:23: fatal error: sys/mutex.h: No such file or directory
- #include <sys/mutex.h>
-                       ^
-compilation terminated.
-configure:28947: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <sys/mutex.h>
-configure:28961: result: no
-configure:28965: checking sys/mutex.h presence
-configure:28980: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:43:23: fatal error: sys/mutex.h: No such file or directory
- #include <sys/mutex.h>
-                       ^
-compilation terminated.
-configure:28987: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| /* end confdefs.h.  */
-| #include <sys/mutex.h>
-configure:29001: result: no
-configure:29029: checking for sys/mutex.h
-configure:29038: result: no
-configure:28923: checking sys/shm.h usability
-configure:28940: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:28947: $? = 0
-configure:28961: result: yes
-configure:28965: checking sys/shm.h presence
-configure:28980: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:28987: $? = 0
-configure:29001: result: yes
-configure:29029: checking for sys/shm.h
-configure:29038: result: yes
-configure:28923: checking sys/file.h usability
-configure:28940: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:28947: $? = 0
-configure:28961: result: yes
-configure:28965: checking sys/file.h presence
-configure:28980: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:28987: $? = 0
-configure:29001: result: yes
-configure:29029: checking for sys/file.h
-configure:29038: result: yes
-configure:28923: checking kernel/OS.h usability
-configure:28940: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:78:23: fatal error: kernel/OS.h: No such file or directory
- #include <kernel/OS.h>
-                       ^
-compilation terminated.
-configure:28947: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <kernel/OS.h>
-configure:28961: result: no
-configure:28965: checking kernel/OS.h presence
-configure:28980: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:45:23: fatal error: kernel/OS.h: No such file or directory
- #include <kernel/OS.h>
-                       ^
-compilation terminated.
-configure:28987: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| /* end confdefs.h.  */
-| #include <kernel/OS.h>
-configure:29001: result: no
-configure:29029: checking for kernel/OS.h
-configure:29038: result: no
-configure:28923: checking os2.h usability
-configure:28940: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:78:17: fatal error: os2.h: No such file or directory
- #include <os2.h>
-                 ^
-compilation terminated.
-configure:28947: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <os2.h>
-configure:28961: result: no
-configure:28965: checking os2.h presence
-configure:28980: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:45:17: fatal error: os2.h: No such file or directory
- #include <os2.h>
-                 ^
-compilation terminated.
-configure:28987: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| /* end confdefs.h.  */
-| #include <os2.h>
-configure:29001: result: no
-configure:29029: checking for os2.h
-configure:29038: result: no
-configure:29066: checking for mmap
-configure:29122: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:29129: $? = 0
-configure:29151: result: yes
-configure:29066: checking for munmap
-configure:29122: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:29129: $? = 0
-configure:29151: result: yes
-configure:29066: checking for shm_open
-configure:29122: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:29129: $? = 0
-configure:29151: result: yes
-configure:29066: checking for shm_unlink
-configure:29122: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:29129: $? = 0
-configure:29151: result: yes
-configure:29066: checking for shmget
-configure:29122: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:29129: $? = 0
-configure:29151: result: yes
-configure:29066: checking for shmat
-configure:29122: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:29129: $? = 0
-configure:29151: result: yes
-configure:29066: checking for shmdt
-configure:29122: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:29129: $? = 0
-configure:29151: result: yes
-configure:29066: checking for shmctl
-configure:29122: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:29129: $? = 0
-configure:29151: result: yes
-configure:29066: checking for create_area
-configure:29122: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-/tmp/cc3UymK3.o: In function `main':
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/conftest.c:87: undefined reference to `create_area'
-collect2: error: ld returned 1 exit status
-configure:29129: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| /* end confdefs.h.  */
-| /* Define create_area to an innocuous variant, in case <limits.h> declares create_area.
-|    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-| #define create_area innocuous_create_area
-| 
-| /* System header to define __stub macros and hopefully few prototypes,
-|     which can conflict with char create_area (); below.
-|     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-|     <limits.h> exists even on freestanding compilers.  */
-| 
-| #ifdef __STDC__
-| # include <limits.h>
-| #else
-| # include <assert.h>
-| #endif
-| 
-| #undef create_area
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char create_area ();
-| /* The GNU C library defines this for functions which it implements
-|     to always fail with ENOSYS.  Some functions are actually named
-|     something starting with __ and the normal name is an alias.  */
-| #if defined __stub_create_area || defined __stub___create_area
-| choke me
-| #endif
-| 
-| int
-| main ()
-| {
-| return create_area ();
-|   ;
-|   return 0;
-| }
-configure:29151: result: no
-configure:29164: checking for MAP_ANON in sys/mman.h
-configure:29193: result: yes
-configure:29203: checking for /dev/zero
-configure:29218: result: yes
-configure:29225: checking for mmap that can map /dev/zero
-configure:29267: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:29271: $? = 0
-configure:29277: ./conftest
-configure:29281: $? = 0
-configure:29298: result: yes
-configure:29536: result: decision on anonymous shared memory allocation method... 4.4BSD-style mmap() via MAP_ANON
-configure:29793: result: decision on namebased memory allocation method... SysV IPC shmget()
-configure:29855: checking for alloca
-configure:29911: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-conftest.c:81:6: warning: conflicting types for built-in function 'alloca' [enabled by default]
- char alloca ();
-      ^
-/tmp/cclYoRWq.o: In function `main':
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/conftest.c:92: undefined reference to `alloca'
-collect2: error: ld returned 1 exit status
-configure:29918: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| /* end confdefs.h.  */
-| /* Define alloca to an innocuous variant, in case <limits.h> declares alloca.
-|    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-| #define alloca innocuous_alloca
-| 
-| /* System header to define __stub macros and hopefully few prototypes,
-|     which can conflict with char alloca (); below.
-|     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-|     <limits.h> exists even on freestanding compilers.  */
-| 
-| #ifdef __STDC__
-| # include <limits.h>
-| #else
-| # include <assert.h>
-| #endif
-| 
-| #undef alloca
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char alloca ();
-| /* The GNU C library defines this for functions which it implements
-|     to always fail with ENOSYS.  Some functions are actually named
-|     something starting with __ and the normal name is an alias.  */
-| #if defined __stub_alloca || defined __stub___alloca
-| choke me
-| #endif
-| 
-| int
-| main ()
-| {
-| return alloca ();
-|   ;
-|   return 0;
-| }
-configure:29940: result: no
-configure:29855: checking for calloc
-configure:29911: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-conftest.c:81:6: warning: conflicting types for built-in function 'calloc' [enabled by default]
- char calloc ();
-      ^
-configure:29918: $? = 0
-configure:29940: result: yes
-configure:29855: checking for strcasecmp
-configure:29911: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-conftest.c:82:6: warning: conflicting types for built-in function 'strcasecmp' [enabled by default]
- char strcasecmp ();
-      ^
-configure:29918: $? = 0
-configure:29940: result: yes
-configure:29855: checking for stricmp
-configure:29911: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-/tmp/ccdtbwHC.o: In function `main':
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/conftest.c:94: undefined reference to `stricmp'
-collect2: error: ld returned 1 exit status
-configure:29918: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| /* end confdefs.h.  */
-| /* Define stricmp to an innocuous variant, in case <limits.h> declares stricmp.
-|    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-| #define stricmp innocuous_stricmp
-| 
-| /* System header to define __stub macros and hopefully few prototypes,
-|     which can conflict with char stricmp (); below.
-|     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-|     <limits.h> exists even on freestanding compilers.  */
-| 
-| #ifdef __STDC__
-| # include <limits.h>
-| #else
-| # include <assert.h>
-| #endif
-| 
-| #undef stricmp
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char stricmp ();
-| /* The GNU C library defines this for functions which it implements
-|     to always fail with ENOSYS.  Some functions are actually named
-|     something starting with __ and the normal name is an alias.  */
-| #if defined __stub_stricmp || defined __stub___stricmp
-| choke me
-| #endif
-| 
-| int
-| main ()
-| {
-| return stricmp ();
-|   ;
-|   return 0;
-| }
-configure:29940: result: no
-configure:29855: checking for setsid
-configure:29911: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:29918: $? = 0
-configure:29940: result: yes
-configure:29855: checking for isinf
-configure:29911: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-conftest.c:84:6: warning: conflicting types for built-in function 'isinf' [enabled by default]
- char isinf ();
-      ^
-configure:29918: $? = 0
-configure:29940: result: yes
-configure:29855: checking for isnan
-configure:29911: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-conftest.c:85:6: warning: conflicting types for built-in function 'isnan' [enabled by default]
- char isnan ();
-      ^
-configure:29918: $? = 0
-configure:29940: result: yes
-configure:29959: checking for getenv
-configure:30015: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:30022: $? = 0
-configure:30044: result: yes
-configure:29959: checking for putenv
-configure:30015: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:30022: $? = 0
-configure:30044: result: yes
-configure:29959: checking for setenv
-configure:30015: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:30022: $? = 0
-configure:30044: result: yes
-configure:29959: checking for unsetenv
-configure:30015: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:30022: $? = 0
-configure:30044: result: yes
-configure:30060: checking for setrlimit
-configure:30116: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:30123: $? = 0
-configure:30145: result: yes
-configure:30163: checking for getrlimit
-configure:30219: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:30226: $? = 0
-configure:30248: result: yes
-configure:30266: checking for writev
-configure:30322: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:30329: $? = 0
-configure:30351: result: yes
-configure:30365: checking for sendfilev in -lsendfile
-configure:30400: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lsendfile  -lrt -lm -lcrypt -lnsl  -lpthread >&5
-/usr/bin/ld: cannot find -lsendfile
-collect2: error: ld returned 1 exit status
-configure:30407: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| /* end confdefs.h.  */
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char sendfilev ();
-| int
-| main ()
-| {
-| return sendfilev ();
-|   ;
-|   return 0;
-| }
-configure:30428: result: no
-configure:30445: checking for sendfile
-configure:30501: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:30508: $? = 0
-configure:30530: result: yes
-configure:30445: checking for send_file
-configure:30501: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-/tmp/ccNZPzzj.o: In function `main':
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/conftest.c:105: undefined reference to `send_file'
-collect2: error: ld returned 1 exit status
-configure:30508: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| /* end confdefs.h.  */
-| /* Define send_file to an innocuous variant, in case <limits.h> declares send_file.
-|    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-| #define send_file innocuous_send_file
-| 
-| /* System header to define __stub macros and hopefully few prototypes,
-|     which can conflict with char send_file (); below.
-|     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-|     <limits.h> exists even on freestanding compilers.  */
-| 
-| #ifdef __STDC__
-| # include <limits.h>
-| #else
-| # include <assert.h>
-| #endif
-| 
-| #undef send_file
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char send_file ();
-| /* The GNU C library defines this for functions which it implements
-|     to always fail with ENOSYS.  Some functions are actually named
-|     something starting with __ and the normal name is an alias.  */
-| #if defined __stub_send_file || defined __stub___send_file
-| choke me
-| #endif
-| 
-| int
-| main ()
-| {
-| return send_file ();
-|   ;
-|   return 0;
-| }
-configure:30530: result: no
-configure:30445: checking for sendfilev
-configure:30501: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-/tmp/ccZjyf0k.o: In function `main':
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/conftest.c:105: undefined reference to `sendfilev'
-collect2: error: ld returned 1 exit status
-configure:30508: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| /* end confdefs.h.  */
-| /* Define sendfilev to an innocuous variant, in case <limits.h> declares sendfilev.
-|    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-| #define sendfilev innocuous_sendfilev
-| 
-| /* System header to define __stub macros and hopefully few prototypes,
-|     which can conflict with char sendfilev (); below.
-|     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-|     <limits.h> exists even on freestanding compilers.  */
-| 
-| #ifdef __STDC__
-| # include <limits.h>
-| #else
-| # include <assert.h>
-| #endif
-| 
-| #undef sendfilev
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char sendfilev ();
-| /* The GNU C library defines this for functions which it implements
-|     to always fail with ENOSYS.  Some functions are actually named
-|     something starting with __ and the normal name is an alias.  */
-| #if defined __stub_sendfilev || defined __stub___sendfilev
-| choke me
-| #endif
-| 
-| int
-| main ()
-| {
-| return sendfilev ();
-|   ;
-|   return 0;
-| }
-configure:30530: result: no
-configure:30547: checking for utime
-configure:30603: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:30610: $? = 0
-configure:30632: result: yes
-configure:30547: checking for utimes
-configure:30603: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:30610: $? = 0
-configure:30632: result: yes
-configure:31057: checking for sigaction
-configure:31113: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:31120: $? = 0
-configure:31142: result: yes
-configure:31156: checking whether sys_siglist is declared
-configure:31191: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:31198: $? = 0
-configure:31213: result: yes
-configure:31237: checking for fork
-configure:31293: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-conftest.c:98:6: warning: conflicting types for built-in function 'fork' [enabled by default]
- char fork ();
-      ^
-configure:31300: $? = 0
-configure:31322: result: yes
-configure:31337: checking for inet_addr
-configure:31373: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:31380: $? = 0
-configure:31400: result: yes
-configure:31410: checking for inet_network
-configure:31446: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:31453: $? = 0
-configure:31473: result: yes
-configure:31483: checking for _getch
-configure:31539: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-/tmp/ccERY85F.o: In function `main':
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/conftest.c:110: undefined reference to `_getch'
-collect2: error: ld returned 1 exit status
-configure:31546: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| /* end confdefs.h.  */
-| /* Define _getch to an innocuous variant, in case <limits.h> declares _getch.
-|    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-| #define _getch innocuous__getch
-| 
-| /* System header to define __stub macros and hopefully few prototypes,
-|     which can conflict with char _getch (); below.
-|     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-|     <limits.h> exists even on freestanding compilers.  */
-| 
-| #ifdef __STDC__
-| # include <limits.h>
-| #else
-| # include <assert.h>
-| #endif
-| 
-| #undef _getch
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char _getch ();
-| /* The GNU C library defines this for functions which it implements
-|     to always fail with ENOSYS.  Some functions are actually named
-|     something starting with __ and the normal name is an alias.  */
-| #if defined __stub__getch || defined __stub____getch
-| choke me
-| #endif
-| 
-| int
-| main ()
-| {
-| return _getch ();
-|   ;
-|   return 0;
-| }
-configure:31566: result: no
-configure:31573: checking for strerror_r
-configure:31629: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:31636: $? = 0
-configure:31658: result: yes
-configure:31674: checking for type of return code from strerror_r
-configure:31707: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-conftest.c: In function 'main':
-conftest.c:84:43: warning: comparison between pointer and integer [enabled by default]
-   if (strerror_r(ERANGE, buf, sizeof buf) < 1) {
-                                           ^
-conftest.c:85:5: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-     exit(0);
-     ^
-conftest.c:88:5: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-     exit(1);
-     ^
-configure:31711: $? = 0
-configure:31717: ./conftest
-configure:31721: $? = 1
-configure: program exited with status 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| /* end confdefs.h.  */
-| 
-| #include <errno.h>
-| #include <string.h>
-| #include <stdio.h>
-| main()
-| {
-|   char buf[1024];
-|   if (strerror_r(ERANGE, buf, sizeof buf) < 1) {
-|     exit(0);
-|   }
-|   else {
-|     exit(1);
-|   }
-| }
-configure:31749: result: pointer
-configure:31757: checking for crypt_r
-configure:31813: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:31820: $? = 0
-configure:31842: result: yes
-configure:31858: checking style of crypt_r
-configure:31891: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:85:1: error: unknown type name 'CRYPTD'
- CRYPTD buffer;
- ^
-conftest.c:86:1: warning: passing argument 3 of 'crypt_r' from incompatible pointer type [enabled by default]
- crypt_r("passwd", "hash", &buffer);
- ^
-In file included from conftest.c:79:0:
-/usr/include/crypt.h:60:14: note: expected 'struct crypt_data * __restrict__' but argument is of type 'int *'
- extern char *crypt_r (const char *__key, const char *__salt,
-              ^
-configure:31898: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| /* end confdefs.h.  */
-| 
-| #include <crypt.h>
-| 
-| int
-| main ()
-| {
-| 
-| CRYPTD buffer;
-| crypt_r("passwd", "hash", &buffer);
-| 
-|   ;
-|   return 0;
-| }
-configure:31939: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:31946: $? = 0
-configure:31963: result: struct_crypt_data
-configure:31987: checking for mmap
-configure:32072: result: yes
-configure:32093: checking for memmove
-configure:32149: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-conftest.c:103:6: warning: conflicting types for built-in function 'memmove' [enabled by default]
- char memmove ();
-      ^
-configure:32156: $? = 0
-configure:32178: result: yes
-configure:32201: checking for getpass
-configure:32257: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:32264: $? = 0
-configure:32286: result: yes
-configure:32201: checking for getpassphrase
-configure:32257: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-/tmp/ccL1vv5a.o: In function `main':
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/conftest.c:116: undefined reference to `getpassphrase'
-collect2: error: ld returned 1 exit status
-configure:32264: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| /* end confdefs.h.  */
-| /* Define getpassphrase to an innocuous variant, in case <limits.h> declares getpassphrase.
-|    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-| #define getpassphrase innocuous_getpassphrase
-| 
-| /* System header to define __stub macros and hopefully few prototypes,
-|     which can conflict with char getpassphrase (); below.
-|     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-|     <limits.h> exists even on freestanding compilers.  */
-| 
-| #ifdef __STDC__
-| # include <limits.h>
-| #else
-| # include <assert.h>
-| #endif
-| 
-| #undef getpassphrase
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char getpassphrase ();
-| /* The GNU C library defines this for functions which it implements
-|     to always fail with ENOSYS.  Some functions are actually named
-|     something starting with __ and the normal name is an alias.  */
-| #if defined __stub_getpassphrase || defined __stub___getpassphrase
-| choke me
-| #endif
-| 
-| int
-| main ()
-| {
-| return getpassphrase ();
-|   ;
-|   return 0;
-| }
-configure:32286: result: no
-configure:32201: checking for gmtime_r
-configure:32257: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:32264: $? = 0
-configure:32286: result: yes
-configure:32201: checking for localtime_r
-configure:32257: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:32264: $? = 0
-configure:32286: result: yes
-configure:32201: checking for hstrerror
-configure:32257: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:32264: $? = 0
-configure:32286: result: yes
-configure:32201: checking for mkstemp
-configure:32257: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:32264: $? = 0
-configure:32286: result: yes
-configure:32311: checking whether sigwait takes one argument
-configure:32352: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:103:3: error: too few arguments to function 'sigwait'
-   sigwait(&set);
-   ^
-In file included from conftest.c:95:0:
-/usr/include/signal.h:270:12: note: declared here
- extern int sigwait (const sigset_t *__restrict __set, int *__restrict __sig)
-            ^
-configure:32359: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| /* end confdefs.h.  */
-| 
-| #if defined(__NETBSD__) || defined(DARWIN)
-|     /* When using the unproven-pthreads package, we need to pull in this
-|      * header to get a prototype for sigwait().  Else things will fail later
-|      * on.  XXX Should probably be fixed in the unproven-pthreads package.
-|      * Darwin is declaring sigwait() in the wrong place as well.
-|      */
-| #include <pthread.h>
-| #endif
-| #include <signal.h>
-| 
-| int
-| main ()
-| {
-| 
-|   sigset_t set;
-| 
-|   sigwait(&set);
-| 
-|   ;
-|   return 0;
-| }
-configure:32378: result: no
-configure:32389: checking for inode member of struct dirent
-configure:32425: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32432: $? = 0
-configure:32500: result: d_fileno
-configure:32510: checking for file type member of struct dirent
-configure:32543: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32550: $? = 0
-configure:32566: result: d_type
-configure:32576: checking for ANSI C header files
-configure:32744: result: yes
-configure:32896: checking alloca.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking alloca.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for alloca.h
-configure:33011: result: yes
-configure:32896: checking ByteOrder.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:123:23: fatal error: ByteOrder.h: No such file or directory
- #include <ByteOrder.h>
-                       ^
-compilation terminated.
-configure:32920: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <ByteOrder.h>
-configure:32934: result: no
-configure:32938: checking ByteOrder.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:90:23: fatal error: ByteOrder.h: No such file or directory
- #include <ByteOrder.h>
-                       ^
-compilation terminated.
-configure:32960: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| /* end confdefs.h.  */
-| #include <ByteOrder.h>
-configure:32974: result: no
-configure:33002: checking for ByteOrder.h
-configure:33011: result: no
-configure:32896: checking conio.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:123:19: fatal error: conio.h: No such file or directory
- #include <conio.h>
-                   ^
-compilation terminated.
-configure:32920: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <conio.h>
-configure:32934: result: no
-configure:32938: checking conio.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:90:19: fatal error: conio.h: No such file or directory
- #include <conio.h>
-                   ^
-compilation terminated.
-configure:32960: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| /* end confdefs.h.  */
-| #include <conio.h>
-configure:32974: result: no
-configure:33002: checking for conio.h
-configure:33011: result: no
-configure:32896: checking crypt.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking crypt.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for crypt.h
-configure:33011: result: yes
-configure:32896: checking ctype.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking ctype.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for ctype.h
-configure:33011: result: yes
-configure:32896: checking dir.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:125:17: fatal error: dir.h: No such file or directory
- #include <dir.h>
-                 ^
-compilation terminated.
-configure:32920: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <dir.h>
-configure:32934: result: no
-configure:32938: checking dir.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:92:17: fatal error: dir.h: No such file or directory
- #include <dir.h>
-                 ^
-compilation terminated.
-configure:32960: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| /* end confdefs.h.  */
-| #include <dir.h>
-configure:32974: result: no
-configure:33002: checking for dir.h
-configure:33011: result: no
-configure:32896: checking dirent.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking dirent.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for dirent.h
-configure:33011: result: yes
-configure:32896: checking dl.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:126:16: fatal error: dl.h: No such file or directory
- #include <dl.h>
-                ^
-compilation terminated.
-configure:32920: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <dl.h>
-configure:32934: result: no
-configure:32938: checking dl.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:93:16: fatal error: dl.h: No such file or directory
- #include <dl.h>
-                ^
-compilation terminated.
-configure:32960: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| /* end confdefs.h.  */
-| #include <dl.h>
-configure:32974: result: no
-configure:33002: checking for dl.h
-configure:33011: result: no
-configure:32885: checking for dlfcn.h
-configure:32892: result: yes
-configure:32896: checking errno.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking errno.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for errno.h
-configure:33011: result: yes
-configure:32896: checking fcntl.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking fcntl.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for fcntl.h
-configure:33011: result: yes
-configure:32896: checking grp.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking grp.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for grp.h
-configure:33011: result: yes
-configure:32896: checking io.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:130:16: fatal error: io.h: No such file or directory
- #include <io.h>
-                ^
-compilation terminated.
-configure:32920: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <io.h>
-configure:32934: result: no
-configure:32938: checking io.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:97:16: fatal error: io.h: No such file or directory
- #include <io.h>
-                ^
-compilation terminated.
-configure:32960: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| /* end confdefs.h.  */
-| #include <io.h>
-configure:32974: result: no
-configure:33002: checking for io.h
-configure:33011: result: no
-configure:32896: checking limits.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking limits.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for limits.h
-configure:33011: result: yes
-configure:32896: checking mach-o/dyld.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:131:25: fatal error: mach-o/dyld.h: No such file or directory
- #include <mach-o/dyld.h>
-                         ^
-compilation terminated.
-configure:32920: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <mach-o/dyld.h>
-configure:32934: result: no
-configure:32938: checking mach-o/dyld.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:98:25: fatal error: mach-o/dyld.h: No such file or directory
- #include <mach-o/dyld.h>
-                         ^
-compilation terminated.
-configure:32960: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| /* end confdefs.h.  */
-| #include <mach-o/dyld.h>
-configure:32974: result: no
-configure:33002: checking for mach-o/dyld.h
-configure:33011: result: no
-configure:32896: checking malloc.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking malloc.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for malloc.h
-configure:33011: result: yes
-configure:32885: checking for memory.h
-configure:32892: result: yes
-configure:32896: checking netdb.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking netdb.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for netdb.h
-configure:33011: result: yes
-configure:32896: checking osreldate.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:134:23: fatal error: osreldate.h: No such file or directory
- #include <osreldate.h>
-                       ^
-compilation terminated.
-configure:32920: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <osreldate.h>
-configure:32934: result: no
-configure:32938: checking osreldate.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:101:23: fatal error: osreldate.h: No such file or directory
- #include <osreldate.h>
-                       ^
-compilation terminated.
-configure:32960: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| /* end confdefs.h.  */
-| #include <osreldate.h>
-configure:32974: result: no
-configure:33002: checking for osreldate.h
-configure:33011: result: no
-configure:32896: checking poll.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking poll.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for poll.h
-configure:33011: result: yes
-configure:32896: checking process.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:135:21: fatal error: process.h: No such file or directory
- #include <process.h>
-                     ^
-compilation terminated.
-configure:32920: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <process.h>
-configure:32934: result: no
-configure:32938: checking process.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:102:21: fatal error: process.h: No such file or directory
- #include <process.h>
-                     ^
-compilation terminated.
-configure:32960: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| /* end confdefs.h.  */
-| #include <process.h>
-configure:32974: result: no
-configure:33002: checking for process.h
-configure:33011: result: no
-configure:32896: checking pwd.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking pwd.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for pwd.h
-configure:33011: result: yes
-configure:32896: checking semaphore.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking semaphore.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for semaphore.h
-configure:33011: result: yes
-configure:32896: checking signal.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking signal.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for signal.h
-configure:33011: result: yes
-configure:32896: checking stdarg.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking stdarg.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for stdarg.h
-configure:33011: result: yes
-configure:32896: checking stddef.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking stddef.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for stddef.h
-configure:33011: result: yes
-configure:32896: checking stdio.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking stdio.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for stdio.h
-configure:33011: result: yes
-configure:32885: checking for stdlib.h
-configure:32892: result: yes
-configure:32885: checking for string.h
-configure:32892: result: yes
-configure:32885: checking for strings.h
-configure:32892: result: yes
-configure:32896: checking sysapi.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:144:20: fatal error: sysapi.h: No such file or directory
- #include <sysapi.h>
-                    ^
-compilation terminated.
-configure:32920: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <sysapi.h>
-configure:32934: result: no
-configure:32938: checking sysapi.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:111:20: fatal error: sysapi.h: No such file or directory
- #include <sysapi.h>
-                    ^
-compilation terminated.
-configure:32960: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| /* end confdefs.h.  */
-| #include <sysapi.h>
-configure:32974: result: no
-configure:33002: checking for sysapi.h
-configure:33011: result: no
-configure:32896: checking sysgtime.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:144:22: fatal error: sysgtime.h: No such file or directory
- #include <sysgtime.h>
-                      ^
-compilation terminated.
-configure:32920: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <sysgtime.h>
-configure:32934: result: no
-configure:32938: checking sysgtime.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:111:22: fatal error: sysgtime.h: No such file or directory
- #include <sysgtime.h>
-                      ^
-compilation terminated.
-configure:32960: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| /* end confdefs.h.  */
-| #include <sysgtime.h>
-configure:32974: result: no
-configure:33002: checking for sysgtime.h
-configure:33011: result: no
-configure:32896: checking termios.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking termios.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for termios.h
-configure:33011: result: yes
-configure:32896: checking time.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking time.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for time.h
-configure:33011: result: yes
-configure:32896: checking tpfeq.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:146:19: fatal error: tpfeq.h: No such file or directory
- #include <tpfeq.h>
-                   ^
-compilation terminated.
-configure:32920: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <tpfeq.h>
-configure:32934: result: no
-configure:32938: checking tpfeq.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:113:19: fatal error: tpfeq.h: No such file or directory
- #include <tpfeq.h>
-                   ^
-compilation terminated.
-configure:32960: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| /* end confdefs.h.  */
-| #include <tpfeq.h>
-configure:32974: result: no
-configure:33002: checking for tpfeq.h
-configure:33011: result: no
-configure:32896: checking tpfio.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:146:19: fatal error: tpfio.h: No such file or directory
- #include <tpfio.h>
-                   ^
-compilation terminated.
-configure:32920: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <tpfio.h>
-configure:32934: result: no
-configure:32938: checking tpfio.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:113:19: fatal error: tpfio.h: No such file or directory
- #include <tpfio.h>
-                   ^
-compilation terminated.
-configure:32960: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| /* end confdefs.h.  */
-| #include <tpfio.h>
-configure:32974: result: no
-configure:33002: checking for tpfio.h
-configure:33011: result: no
-configure:32885: checking for unistd.h
-configure:32892: result: yes
-configure:32896: checking unix.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:147:18: fatal error: unix.h: No such file or directory
- #include <unix.h>
-                  ^
-compilation terminated.
-configure:32920: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <unix.h>
-configure:32934: result: no
-configure:32938: checking unix.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:114:18: fatal error: unix.h: No such file or directory
- #include <unix.h>
-                  ^
-compilation terminated.
-configure:32960: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| /* end confdefs.h.  */
-| #include <unix.h>
-configure:32974: result: no
-configure:33002: checking for unix.h
-configure:33011: result: no
-configure:32896: checking arpa/inet.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking arpa/inet.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for arpa/inet.h
-configure:33011: result: yes
-configure:32885: checking for kernel/OS.h
-configure:32892: result: no
-configure:32896: checking net/errno.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:148:23: fatal error: net/errno.h: No such file or directory
- #include <net/errno.h>
-                       ^
-compilation terminated.
-configure:32920: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <net/errno.h>
-configure:32934: result: no
-configure:32938: checking net/errno.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:115:23: fatal error: net/errno.h: No such file or directory
- #include <net/errno.h>
-                       ^
-compilation terminated.
-configure:32960: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| /* end confdefs.h.  */
-| #include <net/errno.h>
-configure:32974: result: no
-configure:33002: checking for net/errno.h
-configure:33011: result: no
-configure:32896: checking netinet/in.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking netinet/in.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for netinet/in.h
-configure:33011: result: yes
-configure:32896: checking netinet/sctp.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:149:26: fatal error: netinet/sctp.h: No such file or directory
- #include <netinet/sctp.h>
-                          ^
-compilation terminated.
-configure:32920: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <netinet/sctp.h>
-configure:32934: result: no
-configure:32938: checking netinet/sctp.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:116:26: fatal error: netinet/sctp.h: No such file or directory
- #include <netinet/sctp.h>
-                          ^
-compilation terminated.
-configure:32960: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| /* end confdefs.h.  */
-| #include <netinet/sctp.h>
-configure:32974: result: no
-configure:33002: checking for netinet/sctp.h
-configure:33011: result: no
-configure:32896: checking netinet/sctp_uio.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:149:30: fatal error: netinet/sctp_uio.h: No such file or directory
- #include <netinet/sctp_uio.h>
-                              ^
-compilation terminated.
-configure:32920: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <netinet/sctp_uio.h>
-configure:32934: result: no
-configure:32938: checking netinet/sctp_uio.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:116:30: fatal error: netinet/sctp_uio.h: No such file or directory
- #include <netinet/sctp_uio.h>
-                              ^
-compilation terminated.
-configure:32960: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| /* end confdefs.h.  */
-| #include <netinet/sctp_uio.h>
-configure:32974: result: no
-configure:33002: checking for netinet/sctp_uio.h
-configure:33011: result: no
-configure:32885: checking for sys/file.h
-configure:32892: result: yes
-configure:32896: checking sys/ioctl.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking sys/ioctl.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for sys/ioctl.h
-configure:33011: result: yes
-configure:32885: checking for sys/mman.h
-configure:32892: result: yes
-configure:32896: checking sys/poll.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking sys/poll.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for sys/poll.h
-configure:33011: result: yes
-configure:32896: checking sys/resource.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking sys/resource.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for sys/resource.h
-configure:33011: result: yes
-configure:32896: checking sys/select.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking sys/select.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for sys/select.h
-configure:33011: result: yes
-configure:32896: checking sys/sem.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking sys/sem.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for sys/sem.h
-configure:33011: result: yes
-configure:32896: checking sys/sendfile.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking sys/sendfile.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for sys/sendfile.h
-configure:33011: result: yes
-configure:32896: checking sys/signal.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking sys/signal.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for sys/signal.h
-configure:33011: result: yes
-configure:32896: checking sys/socket.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking sys/socket.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for sys/socket.h
-configure:33011: result: yes
-configure:32896: checking sys/sockio.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:159:24: fatal error: sys/sockio.h: No such file or directory
- #include <sys/sockio.h>
-                        ^
-compilation terminated.
-configure:32920: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_RESOURCE_H 1
-| #define HAVE_SYS_SELECT_H 1
-| #define HAVE_SYS_SEM_H 1
-| #define HAVE_SYS_SENDFILE_H 1
-| #define HAVE_SYS_SIGNAL_H 1
-| #define HAVE_SYS_SOCKET_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <sys/sockio.h>
-configure:32934: result: no
-configure:32938: checking sys/sockio.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:126:24: fatal error: sys/sockio.h: No such file or directory
- #include <sys/sockio.h>
-                        ^
-compilation terminated.
-configure:32960: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_RESOURCE_H 1
-| #define HAVE_SYS_SELECT_H 1
-| #define HAVE_SYS_SEM_H 1
-| #define HAVE_SYS_SENDFILE_H 1
-| #define HAVE_SYS_SIGNAL_H 1
-| #define HAVE_SYS_SOCKET_H 1
-| /* end confdefs.h.  */
-| #include <sys/sockio.h>
-configure:32974: result: no
-configure:33002: checking for sys/sockio.h
-configure:33011: result: no
-configure:32885: checking for sys/stat.h
-configure:32892: result: yes
-configure:32896: checking sys/sysctl.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking sys/sysctl.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for sys/sysctl.h
-configure:33011: result: yes
-configure:32896: checking sys/syslimits.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c:161:27: fatal error: sys/syslimits.h: No such file or directory
- #include <sys/syslimits.h>
-                           ^
-compilation terminated.
-configure:32920: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_RESOURCE_H 1
-| #define HAVE_SYS_SELECT_H 1
-| #define HAVE_SYS_SEM_H 1
-| #define HAVE_SYS_SENDFILE_H 1
-| #define HAVE_SYS_SIGNAL_H 1
-| #define HAVE_SYS_SOCKET_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_SYS_SYSCTL_H 1
-| /* end confdefs.h.  */
-| #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
-| #include <sys/syslimits.h>
-configure:32934: result: no
-configure:32938: checking sys/syslimits.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-conftest.c:128:27: fatal error: sys/syslimits.h: No such file or directory
- #include <sys/syslimits.h>
-                           ^
-compilation terminated.
-configure:32960: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_RESOURCE_H 1
-| #define HAVE_SYS_SELECT_H 1
-| #define HAVE_SYS_SEM_H 1
-| #define HAVE_SYS_SENDFILE_H 1
-| #define HAVE_SYS_SIGNAL_H 1
-| #define HAVE_SYS_SOCKET_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_SYS_SYSCTL_H 1
-| /* end confdefs.h.  */
-| #include <sys/syslimits.h>
-configure:32974: result: no
-configure:33002: checking for sys/syslimits.h
-configure:33011: result: no
-configure:32896: checking sys/time.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking sys/time.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for sys/time.h
-configure:33011: result: yes
-configure:32885: checking for sys/types.h
-configure:32892: result: yes
-configure:32896: checking sys/uio.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking sys/uio.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for sys/uio.h
-configure:33011: result: yes
-configure:32896: checking sys/un.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking sys/un.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for sys/un.h
-configure:33011: result: yes
-configure:32896: checking sys/wait.h usability
-configure:32913: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:32920: $? = 0
-configure:32934: result: yes
-configure:32938: checking sys/wait.h presence
-configure:32953: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:32960: $? = 0
-configure:32974: result: yes
-configure:33002: checking for sys/wait.h
-configure:33011: result: yes
-configure:33103: checking for netinet/tcp.h
-configure:33125: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:33132: $? = 0
-configure:33147: result: yes
-configure:33199: checking for h_errno in netdb.h
-configure:33239: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:33246: $? = 0
-configure:33349: result: yes
-configure:33364: checking for off_t
-configure:33392: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:33399: $? = 0
-configure:33426: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:170:20: error: expected expression before ')' token
- if (sizeof ((off_t)))
-                    ^
-configure:33433: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_RESOURCE_H 1
-| #define HAVE_SYS_SELECT_H 1
-| #define HAVE_SYS_SEM_H 1
-| #define HAVE_SYS_SENDFILE_H 1
-| #define HAVE_SYS_SIGNAL_H 1
-| #define HAVE_SYS_SOCKET_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_SYS_SYSCTL_H 1
-| #define HAVE_SYS_TIME_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_SYS_UN_H 1
-| #define HAVE_SYS_WAIT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| /* end confdefs.h.  */
-| #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
-| int
-| main ()
-| {
-| if (sizeof ((off_t)))
-| 	  return 0;
-|   ;
-|   return 0;
-| }
-configure:33456: result: yes
-configure:33468: checking for pid_t
-configure:33496: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:33503: $? = 0
-configure:33530: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:170:20: error: expected expression before ')' token
- if (sizeof ((pid_t)))
-                    ^
-configure:33537: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_RESOURCE_H 1
-| #define HAVE_SYS_SELECT_H 1
-| #define HAVE_SYS_SEM_H 1
-| #define HAVE_SYS_SENDFILE_H 1
-| #define HAVE_SYS_SIGNAL_H 1
-| #define HAVE_SYS_SOCKET_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_SYS_SYSCTL_H 1
-| #define HAVE_SYS_TIME_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_SYS_UN_H 1
-| #define HAVE_SYS_WAIT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| /* end confdefs.h.  */
-| #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
-| int
-| main ()
-| {
-| if (sizeof ((pid_t)))
-| 	  return 0;
-|   ;
-|   return 0;
-| }
-configure:33560: result: yes
-configure:33572: checking for size_t
-configure:33600: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:33607: $? = 0
-configure:33634: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:170:21: error: expected expression before ')' token
- if (sizeof ((size_t)))
-                     ^
-configure:33641: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_RESOURCE_H 1
-| #define HAVE_SYS_SELECT_H 1
-| #define HAVE_SYS_SEM_H 1
-| #define HAVE_SYS_SENDFILE_H 1
-| #define HAVE_SYS_SIGNAL_H 1
-| #define HAVE_SYS_SOCKET_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_SYS_SYSCTL_H 1
-| #define HAVE_SYS_TIME_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_SYS_UN_H 1
-| #define HAVE_SYS_WAIT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| /* end confdefs.h.  */
-| #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
-| int
-| main ()
-| {
-| if (sizeof ((size_t)))
-| 	  return 0;
-|   ;
-|   return 0;
-| }
-configure:33664: result: yes
-configure:33676: checking for uid_t in sys/types.h
-configure:33699: result: yes
-configure:33714: checking for ssize_t
-configure:33742: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:33749: $? = 0
-configure:33776: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:170:22: error: expected expression before ')' token
- if (sizeof ((ssize_t)))
-                      ^
-configure:33783: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_RESOURCE_H 1
-| #define HAVE_SYS_SELECT_H 1
-| #define HAVE_SYS_SEM_H 1
-| #define HAVE_SYS_SENDFILE_H 1
-| #define HAVE_SYS_SIGNAL_H 1
-| #define HAVE_SYS_SOCKET_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_SYS_SYSCTL_H 1
-| #define HAVE_SYS_TIME_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_SYS_UN_H 1
-| #define HAVE_SYS_WAIT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| /* end confdefs.h.  */
-| #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
-| int
-| main ()
-| {
-| if (sizeof ((ssize_t)))
-| 	  return 0;
-|   ;
-|   return 0;
-| }
-configure:33806: result: yes
-configure:33818: checking for inline
-configure:33844: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:33851: $? = 0
-configure:33869: result: inline
-configure:33888: checking for an ANSI C-conforming const
-configure:33963: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:33970: $? = 0
-configure:33985: result: yes
-configure:33995: checking for size_t
-configure:34087: result: yes
-configure:34099: checking whether setpgrp takes no argument
-configure:34133: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-conftest.c: In function 'main':
-conftest.c:173:3: error: too many arguments to function 'setpgrp'
-   return setpgrp (1,1) != -1;
-   ^
-In file included from conftest.c:165:0:
-/usr/include/unistd.h:660:12: note: declared here
- extern int setpgrp (void) __THROW;
-            ^
-configure:34137: $? = 1
-configure: program exited with status 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_RESOURCE_H 1
-| #define HAVE_SYS_SELECT_H 1
-| #define HAVE_SYS_SEM_H 1
-| #define HAVE_SYS_SENDFILE_H 1
-| #define HAVE_SYS_SIGNAL_H 1
-| #define HAVE_SYS_SOCKET_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_SYS_SYSCTL_H 1
-| #define HAVE_SYS_TIME_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_SYS_UN_H 1
-| #define HAVE_SYS_WAIT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| /* end confdefs.h.  */
-| #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
-| int
-| main ()
-| {
-| /* If this system has a BSD-style setpgrp which takes arguments,
-|   setpgrp(1, 1) will fail with ESRCH and return -1, in that case
-|   exit successfully. */
-|   return setpgrp (1,1) != -1;
-|   ;
-|   return 0;
-| }
-configure:34164: result: yes
-configure:34176: checking for socklen_t
-configure:34212: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:34219: $? = 0
-configure:34239: result: yes
-configure:34252: checking whether system defines INADDR_NONE
-configure:34294: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:34301: $? = 0
-configure:34320: result: yes
-configure:34333: checking size of void*
-configure:34638: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:34642: $? = 0
-configure:34648: ./conftest
-configure:34652: $? = 0
-configure:34678: result: 8
-configure:34701: checking size of char
-configure:35006: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:35010: $? = 0
-configure:35016: ./conftest
-configure:35020: $? = 0
-configure:35046: result: 1
-configure:35060: checking size of int
-configure:35365: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:35369: $? = 0
-configure:35375: ./conftest
-configure:35379: $? = 0
-configure:35405: result: 4
-configure:35419: checking size of long
-configure:35724: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:35728: $? = 0
-configure:35734: ./conftest
-configure:35738: $? = 0
-configure:35764: result: 8
-configure:35778: checking size of short
-configure:36083: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:36087: $? = 0
-configure:36093: ./conftest
-configure:36097: $? = 0
-configure:36123: result: 2
-configure:36137: checking size of long double
-configure:36442: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:36446: $? = 0
-configure:36452: ./conftest
-configure:36456: $? = 0
-configure:36482: result: 16
-configure:36496: checking size of long long
-configure:36801: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:36805: $? = 0
-configure:36811: ./conftest
-configure:36815: $? = 0
-configure:36841: result: 8
-configure:36929: checking for INT64_C
-configure:36974: result: yes
-configure:37012: checking size of ssize_t
-configure:37042: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-conftest.c: In function 'main':
-conftest.c:148:11: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-   if (!f) exit(1);
-           ^
-conftest.c:149:3: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long unsigned int' [-Wformat=]
-   fprintf(f, "%d\n", sizeof(ssize_t));
-   ^
-configure:37046: $? = 0
-configure:37052: ./conftest
-configure:37056: $? = 0
-configure:37073: result: 8
-configure:37090: checking size of size_t
-configure:37120: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-conftest.c: In function 'main':
-conftest.c:149:11: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-   if (!f) exit(1);
-           ^
-conftest.c:150:3: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long unsigned int' [-Wformat=]
-   fprintf(f, "%d\n", sizeof(size_t));
-   ^
-configure:37124: $? = 0
-configure:37130: ./conftest
-configure:37134: $? = 0
-configure:37151: result: 8
-configure:37169: checking size of off_t
-configure:37199: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-conftest.c: In function 'main':
-conftest.c:150:11: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-   if (!f) exit(1);
-           ^
-conftest.c:151:3: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long unsigned int' [-Wformat=]
-   fprintf(f, "%d\n", sizeof(off_t));
-   ^
-configure:37203: $? = 0
-configure:37209: ./conftest
-configure:37213: $? = 0
-configure:37230: result: 8
-configure:37238: checking which type to use for apr_off_t
-configure:37263: result: off_t
-configure:37269: checking whether ino_t and unsigned long long are the same
-configure:37298: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:183:9: error: size of array 'foo' is negative
-     int foo[0 - !__builtin_types_compatible_p(ino_t, unsigned long long)];
-         ^
-configure:37305: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_RESOURCE_H 1
-| #define HAVE_SYS_SELECT_H 1
-| #define HAVE_SYS_SEM_H 1
-| #define HAVE_SYS_SENDFILE_H 1
-| #define HAVE_SYS_SIGNAL_H 1
-| #define HAVE_SYS_SOCKET_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_SYS_SYSCTL_H 1
-| #define HAVE_SYS_TIME_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_SYS_UN_H 1
-| #define HAVE_SYS_WAIT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| #define SETPGRP_VOID 1
-| #define HAVE_SOCKLEN_T 1
-| #define SIZEOF_VOIDP 8
-| #define SIZEOF_CHAR 1
-| #define SIZEOF_INT 4
-| #define SIZEOF_LONG 8
-| #define SIZEOF_SHORT 2
-| #define SIZEOF_LONG_DOUBLE 16
-| #define SIZEOF_LONG_LONG 8
-| #define SIZEOF_SSIZE_T 8
-| #define SIZEOF_SIZE_T 8
-| #define SIZEOF_OFF_T 8
-| /* end confdefs.h.  */
-| #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
-| int
-| main ()
-| {
-| 
-|     int foo[0 - !__builtin_types_compatible_p(ino_t, unsigned long long)];
-| 
-|   ;
-|   return 0;
-| }
-configure:37320: result: no
-configure:37325: checking whether ino_t and unsigned long are the same
-configure:37354: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:37361: $? = 0
-configure:37376: result: yes
-configure:37381: checking whether ino_t and unsigned int are the same
-configure:37410: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:183:9: error: size of array 'foo' is negative
-     int foo[0 - !__builtin_types_compatible_p(ino_t, unsigned int)];
-         ^
-configure:37417: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_RESOURCE_H 1
-| #define HAVE_SYS_SELECT_H 1
-| #define HAVE_SYS_SEM_H 1
-| #define HAVE_SYS_SENDFILE_H 1
-| #define HAVE_SYS_SIGNAL_H 1
-| #define HAVE_SYS_SOCKET_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_SYS_SYSCTL_H 1
-| #define HAVE_SYS_TIME_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_SYS_UN_H 1
-| #define HAVE_SYS_WAIT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| #define SETPGRP_VOID 1
-| #define HAVE_SOCKLEN_T 1
-| #define SIZEOF_VOIDP 8
-| #define SIZEOF_CHAR 1
-| #define SIZEOF_INT 4
-| #define SIZEOF_LONG 8
-| #define SIZEOF_SHORT 2
-| #define SIZEOF_LONG_DOUBLE 16
-| #define SIZEOF_LONG_LONG 8
-| #define SIZEOF_SSIZE_T 8
-| #define SIZEOF_SIZE_T 8
-| #define SIZEOF_OFF_T 8
-| /* end confdefs.h.  */
-| #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
-| int
-| main ()
-| {
-| 
-|     int foo[0 - !__builtin_types_compatible_p(ino_t, unsigned int)];
-| 
-|   ;
-|   return 0;
-| }
-configure:37432: result: no
-configure:37441: checking size of pid_t
-configure:37471: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-conftest.c: In function 'main':
-conftest.c:151:11: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-   if (!f) exit(1);
-           ^
-conftest.c:152:3: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long unsigned int' [-Wformat=]
-   fprintf(f, "%d\n", sizeof(pid_t));
-   ^
-configure:37475: $? = 0
-configure:37481: ./conftest
-configure:37485: $? = 0
-configure:37502: result: 4
-configure:37589: checking for strnicmp
-configure:37645: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-/tmp/ccjxStEC.o: In function `main':
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/conftest.c:181: undefined reference to `strnicmp'
-collect2: error: ld returned 1 exit status
-configure:37652: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_RESOURCE_H 1
-| #define HAVE_SYS_SELECT_H 1
-| #define HAVE_SYS_SEM_H 1
-| #define HAVE_SYS_SENDFILE_H 1
-| #define HAVE_SYS_SIGNAL_H 1
-| #define HAVE_SYS_SOCKET_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_SYS_SYSCTL_H 1
-| #define HAVE_SYS_TIME_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_SYS_UN_H 1
-| #define HAVE_SYS_WAIT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| #define SETPGRP_VOID 1
-| #define HAVE_SOCKLEN_T 1
-| #define SIZEOF_VOIDP 8
-| #define SIZEOF_CHAR 1
-| #define SIZEOF_INT 4
-| #define SIZEOF_LONG 8
-| #define SIZEOF_SHORT 2
-| #define SIZEOF_LONG_DOUBLE 16
-| #define SIZEOF_LONG_LONG 8
-| #define SIZEOF_SSIZE_T 8
-| #define SIZEOF_SIZE_T 8
-| #define SIZEOF_OFF_T 8
-| #define SIZEOF_PID_T 4
-| /* end confdefs.h.  */
-| /* Define strnicmp to an innocuous variant, in case <limits.h> declares strnicmp.
-|    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-| #define strnicmp innocuous_strnicmp
-| 
-| /* System header to define __stub macros and hopefully few prototypes,
-|     which can conflict with char strnicmp (); below.
-|     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-|     <limits.h> exists even on freestanding compilers.  */
-| 
-| #ifdef __STDC__
-| # include <limits.h>
-| #else
-| # include <assert.h>
-| #endif
-| 
-| #undef strnicmp
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char strnicmp ();
-| /* The GNU C library defines this for functions which it implements
-|     to always fail with ENOSYS.  Some functions are actually named
-|     something starting with __ and the normal name is an alias.  */
-| #if defined __stub_strnicmp || defined __stub___strnicmp
-| choke me
-| #endif
-| 
-| int
-| main ()
-| {
-| return strnicmp ();
-|   ;
-|   return 0;
-| }
-configure:37674: result: no
-configure:37692: checking for strncasecmp
-configure:37748: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-conftest.c:170:6: warning: conflicting types for built-in function 'strncasecmp' [enabled by default]
- char strncasecmp ();
-      ^
-configure:37755: $? = 0
-configure:37777: result: yes
-configure:37795: checking for stricmp
-configure:37880: result: no
-configure:37898: checking for strcasecmp
-configure:37983: result: yes
-configure:38001: checking for strdup
-configure:38057: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-conftest.c:172:6: warning: conflicting types for built-in function 'strdup' [enabled by default]
- char strdup ();
-      ^
-configure:38064: $? = 0
-configure:38086: result: yes
-configure:38104: checking for strstr
-configure:38160: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-conftest.c:173:6: warning: conflicting types for built-in function 'strstr' [enabled by default]
- char strstr ();
-      ^
-configure:38167: $? = 0
-configure:38189: result: yes
-configure:38207: checking for memchr
-configure:38263: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-conftest.c:174:6: warning: conflicting types for built-in function 'memchr' [enabled by default]
- char memchr ();
-      ^
-configure:38270: $? = 0
-configure:38292: result: yes
-configure:38310: checking for strtol
-configure:38366: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:38373: $? = 0
-configure:38395: result: yes
-configure:38537: checking for NSLinkModule
-configure:38593: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-/tmp/ccKVb5F5.o: In function `main':
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/conftest.c:187: undefined reference to `NSLinkModule'
-collect2: error: ld returned 1 exit status
-configure:38600: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_RESOURCE_H 1
-| #define HAVE_SYS_SELECT_H 1
-| #define HAVE_SYS_SEM_H 1
-| #define HAVE_SYS_SENDFILE_H 1
-| #define HAVE_SYS_SIGNAL_H 1
-| #define HAVE_SYS_SOCKET_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_SYS_SYSCTL_H 1
-| #define HAVE_SYS_TIME_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_SYS_UN_H 1
-| #define HAVE_SYS_WAIT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| #define SETPGRP_VOID 1
-| #define HAVE_SOCKLEN_T 1
-| #define SIZEOF_VOIDP 8
-| #define SIZEOF_CHAR 1
-| #define SIZEOF_INT 4
-| #define SIZEOF_LONG 8
-| #define SIZEOF_SHORT 2
-| #define SIZEOF_LONG_DOUBLE 16
-| #define SIZEOF_LONG_LONG 8
-| #define SIZEOF_SSIZE_T 8
-| #define SIZEOF_SIZE_T 8
-| #define SIZEOF_OFF_T 8
-| #define SIZEOF_PID_T 4
-| #define HAVE_STRNCASECMP 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_STRDUP 1
-| #define HAVE_STRSTR 1
-| #define HAVE_MEMCHR 1
-| #define HAVE_STRTOL 1
-| /* end confdefs.h.  */
-| /* Define NSLinkModule to an innocuous variant, in case <limits.h> declares NSLinkModule.
-|    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-| #define NSLinkModule innocuous_NSLinkModule
-| 
-| /* System header to define __stub macros and hopefully few prototypes,
-|     which can conflict with char NSLinkModule (); below.
-|     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-|     <limits.h> exists even on freestanding compilers.  */
-| 
-| #ifdef __STDC__
-| # include <limits.h>
-| #else
-| # include <assert.h>
-| #endif
-| 
-| #undef NSLinkModule
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char NSLinkModule ();
-| /* The GNU C library defines this for functions which it implements
-|     to always fail with ENOSYS.  Some functions are actually named
-|     something starting with __ and the normal name is an alias.  */
-| #if defined __stub_NSLinkModule || defined __stub___NSLinkModule
-| choke me
-| #endif
-| 
-| int
-| main ()
-| {
-| return NSLinkModule ();
-|   ;
-|   return 0;
-| }
-configure:38622: result: no
-configure:38637: checking for shl_load in -ldld
-configure:38672: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -ldld  -lrt -lm -lcrypt -lnsl  -lpthread >&5
-/usr/bin/ld: cannot find -ldld
-collect2: error: ld returned 1 exit status
-configure:38679: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_RESOURCE_H 1
-| #define HAVE_SYS_SELECT_H 1
-| #define HAVE_SYS_SEM_H 1
-| #define HAVE_SYS_SENDFILE_H 1
-| #define HAVE_SYS_SIGNAL_H 1
-| #define HAVE_SYS_SOCKET_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_SYS_SYSCTL_H 1
-| #define HAVE_SYS_TIME_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_SYS_UN_H 1
-| #define HAVE_SYS_WAIT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| #define SETPGRP_VOID 1
-| #define HAVE_SOCKLEN_T 1
-| #define SIZEOF_VOIDP 8
-| #define SIZEOF_CHAR 1
-| #define SIZEOF_INT 4
-| #define SIZEOF_LONG 8
-| #define SIZEOF_SHORT 2
-| #define SIZEOF_LONG_DOUBLE 16
-| #define SIZEOF_LONG_LONG 8
-| #define SIZEOF_SSIZE_T 8
-| #define SIZEOF_SIZE_T 8
-| #define SIZEOF_OFF_T 8
-| #define SIZEOF_PID_T 4
-| #define HAVE_STRNCASECMP 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_STRDUP 1
-| #define HAVE_STRSTR 1
-| #define HAVE_MEMCHR 1
-| #define HAVE_STRTOL 1
-| /* end confdefs.h.  */
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char shl_load ();
-| int
-| main ()
-| {
-| return shl_load ();
-|   ;
-|   return 0;
-| }
-configure:38700: result: no
-configure:38734: checking for dlopen
-configure:38790: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread >&5
-/tmp/ccYBIJVc.o: In function `main':
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/conftest.c:187: undefined reference to `dlopen'
-collect2: error: ld returned 1 exit status
-configure:38797: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_RESOURCE_H 1
-| #define HAVE_SYS_SELECT_H 1
-| #define HAVE_SYS_SEM_H 1
-| #define HAVE_SYS_SENDFILE_H 1
-| #define HAVE_SYS_SIGNAL_H 1
-| #define HAVE_SYS_SOCKET_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_SYS_SYSCTL_H 1
-| #define HAVE_SYS_TIME_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_SYS_UN_H 1
-| #define HAVE_SYS_WAIT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| #define SETPGRP_VOID 1
-| #define HAVE_SOCKLEN_T 1
-| #define SIZEOF_VOIDP 8
-| #define SIZEOF_CHAR 1
-| #define SIZEOF_INT 4
-| #define SIZEOF_LONG 8
-| #define SIZEOF_SHORT 2
-| #define SIZEOF_LONG_DOUBLE 16
-| #define SIZEOF_LONG_LONG 8
-| #define SIZEOF_SSIZE_T 8
-| #define SIZEOF_SIZE_T 8
-| #define SIZEOF_OFF_T 8
-| #define SIZEOF_PID_T 4
-| #define HAVE_STRNCASECMP 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_STRDUP 1
-| #define HAVE_STRSTR 1
-| #define HAVE_MEMCHR 1
-| #define HAVE_STRTOL 1
-| /* end confdefs.h.  */
-| /* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-|    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-| #define dlopen innocuous_dlopen
-| 
-| /* System header to define __stub macros and hopefully few prototypes,
-|     which can conflict with char dlopen (); below.
-|     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-|     <limits.h> exists even on freestanding compilers.  */
-| 
-| #ifdef __STDC__
-| # include <limits.h>
-| #else
-| # include <assert.h>
-| #endif
-| 
-| #undef dlopen
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char dlopen ();
-| /* The GNU C library defines this for functions which it implements
-|     to always fail with ENOSYS.  Some functions are actually named
-|     something starting with __ and the normal name is an alias.  */
-| #if defined __stub_dlopen || defined __stub___dlopen
-| choke me
-| #endif
-| 
-| int
-| main ()
-| {
-| return dlopen ();
-|   ;
-|   return 0;
-| }
-configure:38819: result: no
-configure:38835: checking for dlopen in -ldl
-configure:38870: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -ldl  -lrt -lm -lcrypt -lnsl  -lpthread >&5
-configure:38877: $? = 0
-configure:38898: result: yes
-configure:38933: checking for dlsym
-configure:38989: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-configure:38996: $? = 0
-configure:39018: result: yes
-configure:39245: checking for waitpid
-configure:39301: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-configure:39308: $? = 0
-configure:39330: result: yes
-configure:39357: checking for Variable Length Arrays
-configure:39390: result: yes
-configure:39400: checking struct rlimit
-configure:39434: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-conftest.c: In function 'main':
-conftest.c:166:5: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-     exit(0);
-     ^
-configure:39438: $? = 0
-configure:39444: ./conftest
-configure:39448: $? = 0
-configure:39467: result: yes
-configure:39481: checking for semget
-configure:39537: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-configure:39544: $? = 0
-configure:39566: result: yes
-configure:39481: checking for semctl
-configure:39537: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-configure:39544: $? = 0
-configure:39566: result: yes
-configure:39481: checking for flock
-configure:39537: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-configure:39544: $? = 0
-configure:39566: result: yes
-configure:39583: checking for semaphore.h
-configure:39590: result: yes
-configure:39731: checking for sem_close
-configure:39787: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-configure:39794: $? = 0
-configure:39816: result: yes
-configure:39731: checking for sem_unlink
-configure:39787: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-configure:39794: $? = 0
-configure:39816: result: yes
-configure:39731: checking for sem_post
-configure:39787: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-configure:39794: $? = 0
-configure:39816: result: yes
-configure:39731: checking for sem_wait
-configure:39787: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-configure:39794: $? = 0
-configure:39816: result: yes
-configure:39830: checking for working sem_open
-configure:39872: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-configure:39876: $? = 0
-configure:39882: ./conftest
-configure:39886: $? = 1
-configure: program exited with status 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_RESOURCE_H 1
-| #define HAVE_SYS_SELECT_H 1
-| #define HAVE_SYS_SEM_H 1
-| #define HAVE_SYS_SENDFILE_H 1
-| #define HAVE_SYS_SIGNAL_H 1
-| #define HAVE_SYS_SOCKET_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_SYS_SYSCTL_H 1
-| #define HAVE_SYS_TIME_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_SYS_UN_H 1
-| #define HAVE_SYS_WAIT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| #define SETPGRP_VOID 1
-| #define HAVE_SOCKLEN_T 1
-| #define SIZEOF_VOIDP 8
-| #define SIZEOF_CHAR 1
-| #define SIZEOF_INT 4
-| #define SIZEOF_LONG 8
-| #define SIZEOF_SHORT 2
-| #define SIZEOF_LONG_DOUBLE 16
-| #define SIZEOF_LONG_LONG 8
-| #define SIZEOF_SSIZE_T 8
-| #define SIZEOF_SIZE_T 8
-| #define SIZEOF_OFF_T 8
-| #define SIZEOF_PID_T 4
-| #define HAVE_STRNCASECMP 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_STRDUP 1
-| #define HAVE_STRSTR 1
-| #define HAVE_MEMCHR 1
-| #define HAVE_STRTOL 1
-| #define HAVE_DLSYM 1
-| #define DSO_USE_DLFCN 1
-| #define HAVE_WAITPID 1
-| #define HAVE_VLA 1
-| #define HAVE_SEMGET 1
-| #define HAVE_SEMCTL 1
-| #define HAVE_FLOCK 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SEM_CLOSE 1
-| #define HAVE_SEM_UNLINK 1
-| #define HAVE_SEM_POST 1
-| #define HAVE_SEM_WAIT 1
-| /* end confdefs.h.  */
-| 
-| #include <errno.h>
-| #include <stdlib.h>
-| #include <fcntl.h>
-| #include <semaphore.h>
-| main()
-| {
-|     sem_t *psem;
-|     const char *sem_name = "/apr_autoconf";
-| 
-|     if (sizeof(int) < sizeof(sem_t *))
-|         exit(1);
-|     psem = sem_open(sem_name, O_CREAT, 0644, 1);
-|     if (psem == (sem_t *)SEM_FAILED) {
-| 	exit(1);
-|     }
-|     sem_close(psem);
-|     sem_unlink(sem_name);
-|     exit(0);
-| }
-configure:39903: result: no
-configure:39907: checking for union semun in sys/sem.h
-configure:39937: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-conftest.c: In function 'main':
-conftest.c:174:13: error: storage size of 'arg' isn't known
- union semun arg;
-             ^
-configure:39944: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_RESOURCE_H 1
-| #define HAVE_SYS_SELECT_H 1
-| #define HAVE_SYS_SEM_H 1
-| #define HAVE_SYS_SENDFILE_H 1
-| #define HAVE_SYS_SIGNAL_H 1
-| #define HAVE_SYS_SOCKET_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_SYS_SYSCTL_H 1
-| #define HAVE_SYS_TIME_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_SYS_UN_H 1
-| #define HAVE_SYS_WAIT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| #define SETPGRP_VOID 1
-| #define HAVE_SOCKLEN_T 1
-| #define SIZEOF_VOIDP 8
-| #define SIZEOF_CHAR 1
-| #define SIZEOF_INT 4
-| #define SIZEOF_LONG 8
-| #define SIZEOF_SHORT 2
-| #define SIZEOF_LONG_DOUBLE 16
-| #define SIZEOF_LONG_LONG 8
-| #define SIZEOF_SSIZE_T 8
-| #define SIZEOF_SIZE_T 8
-| #define SIZEOF_OFF_T 8
-| #define SIZEOF_PID_T 4
-| #define HAVE_STRNCASECMP 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_STRDUP 1
-| #define HAVE_STRSTR 1
-| #define HAVE_MEMCHR 1
-| #define HAVE_STRTOL 1
-| #define HAVE_DLSYM 1
-| #define DSO_USE_DLFCN 1
-| #define HAVE_WAITPID 1
-| #define HAVE_VLA 1
-| #define HAVE_SEMGET 1
-| #define HAVE_SEMCTL 1
-| #define HAVE_FLOCK 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SEM_CLOSE 1
-| #define HAVE_SEM_UNLINK 1
-| #define HAVE_SEM_POST 1
-| #define HAVE_SEM_WAIT 1
-| /* end confdefs.h.  */
-| 
-| #include <sys/types.h>
-| #include <sys/ipc.h>
-| #include <sys/sem.h>
-| 
-| int
-| main ()
-| {
-| 
-| union semun arg;
-| semctl(0, 0, 0, arg);
-| 
-|   ;
-|   return 0;
-| }
-configure:39961: result: no
-configure:39966: checking for LOCK_EX in sys/file.h
-configure:39995: result: yes
-configure:40006: checking for F_SETLK in fcntl.h
-configure:40035: result: yes
-configure:40046: checking for SEM_UNDO in sys/sem.h
-configure:40075: result: yes
-configure:40089: checking for POLLIN in poll.h sys/poll.h
-configure:40120: result: yes
-configure:40133: checking for PTHREAD_PROCESS_SHARED in pthread.h
-configure:40162: result: yes
-configure:40176: checking for pthread_mutexattr_setpshared
-configure:40232: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-configure:40239: $? = 0
-configure:40261: result: yes
-configure:40304: checking for working PROCESS_SHARED locks
-configure:40351: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-conftest.c: In function 'main':
-conftest.c:179:17: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-                 exit(1);
-                 ^
-configure:40355: $? = 0
-configure:40361: ./conftest
-configure:40365: $? = 0
-configure:40382: result: yes
-configure:40394: checking for robust cross-process mutex support
-configure:40448: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-configure:40452: $? = 0
-configure:40458: ./conftest
-configure:40462: $? = 0
-configure:40479: result: yes
-configure:40823: result: decision on apr_lock implementation method... SysV IPC semget()
-configure:40868: checking if all interprocess locks affect threads
-configure:40876: result: no
-configure:40882: checking if POSIX sems affect threads in the same process
-configure:40893: result: no
-configure:40897: checking if SysV sems affect threads in the same process
-configure:40908: result: no
-configure:40912: checking if fcntl locks affect threads in the same process
-configure:40923: result: no
-configure:40927: checking if flock locks affect threads in the same process
-configure:40938: result: no
-configure:40942: checking for entropy source
-configure:41008: result: /dev/random
-configure:41044: checking for tm_gmtoff in struct tm
-configure:41071: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:41078: $? = 0
-configure:41093: result: yes
-configure:41105: checking for in_addr in netinet/in.h
-configure:41134: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:41141: $? = 0
-configure:41157: result: yes
-configure:41160: checking if fd == socket on this platform
-configure:41176: checking style of gethostbyname_r routine
-configure:41229: result: glibc2
-configure:41240: checking 3rd argument to the gethostbyname_r routines
-conftest.c: In function 'main':
-conftest.c:22:35: error: passing argument 3 of 'gethostbyname_r' from incompatible pointer type [-Werror]
-                           (struct hostent_data *) 0);
-                                   ^
-In file included from conftest.c:13:0:
-/usr/include/netdb.h:179:12: note: expected 'char * __restrict__' but argument is of type 'struct hostent_data *'
- extern int gethostbyname_r (const char *__restrict __name,
-            ^
-conftest.c:22:35: error: too few arguments to function 'gethostbyname_r'
-                           (struct hostent_data *) 0);
-                                   ^
-In file included from conftest.c:13:0:
-/usr/include/netdb.h:179:12: note: declared here
- extern int gethostbyname_r (const char *__restrict __name,
-            ^
-cc1: all warnings being treated as errors
-configure: failed or warning program:
-#include "confdefs.h"
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-int main(int argc, const char * const *argv) {
-
-int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0,
-                          (struct hostent_data *) 0);
-; return 0; }
-configure:41292: result: char
-configure:41306: checking if TCP_NODELAY setting is inherited from listening sockets
-configure:41426: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-conftest.c: In function 'main':
-conftest.c:205:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-conftest.c:211:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-conftest.c:213:5: warning: incompatible implicit declaration of built-in function 'memset' [enabled by default]
-     memset(&sa, 0, sizeof sa);
-     ^
-conftest.c:222:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-conftest.c:229:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-conftest.c:235:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-conftest.c:240:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-conftest.c:252:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-conftest.c:258:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-conftest.c:264:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-conftest.c:268:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-configure:41430: $? = 0
-configure:41436: ./conftest
-configure:41440: $? = 0
-configure:41461: result: yes
-configure:41470: checking if O_NONBLOCK setting is inherited from listening sockets
-configure:41589: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-conftest.c: In function 'main':
-conftest.c:206:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-conftest.c:208:5: warning: incompatible implicit declaration of built-in function 'memset' [enabled by default]
-     memset(&sa, 0, sizeof sa);
-     ^
-conftest.c:217:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-conftest.c:224:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-conftest.c:230:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-conftest.c:235:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-conftest.c:240:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-conftest.c:252:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-conftest.c:258:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-conftest.c:263:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-conftest.c:267:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-configure:41593: $? = 0
-configure:41599: ./conftest
-O_NONBLOCK is not set in the child.
-configure:41603: $? = 1
-configure: program exited with status 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_RESOURCE_H 1
-| #define HAVE_SYS_SELECT_H 1
-| #define HAVE_SYS_SEM_H 1
-| #define HAVE_SYS_SENDFILE_H 1
-| #define HAVE_SYS_SIGNAL_H 1
-| #define HAVE_SYS_SOCKET_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_SYS_SYSCTL_H 1
-| #define HAVE_SYS_TIME_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_SYS_UN_H 1
-| #define HAVE_SYS_WAIT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| #define SETPGRP_VOID 1
-| #define HAVE_SOCKLEN_T 1
-| #define SIZEOF_VOIDP 8
-| #define SIZEOF_CHAR 1
-| #define SIZEOF_INT 4
-| #define SIZEOF_LONG 8
-| #define SIZEOF_SHORT 2
-| #define SIZEOF_LONG_DOUBLE 16
-| #define SIZEOF_LONG_LONG 8
-| #define SIZEOF_SSIZE_T 8
-| #define SIZEOF_SIZE_T 8
-| #define SIZEOF_OFF_T 8
-| #define SIZEOF_PID_T 4
-| #define HAVE_STRNCASECMP 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_STRDUP 1
-| #define HAVE_STRSTR 1
-| #define HAVE_MEMCHR 1
-| #define HAVE_STRTOL 1
-| #define HAVE_DLSYM 1
-| #define DSO_USE_DLFCN 1
-| #define HAVE_WAITPID 1
-| #define HAVE_VLA 1
-| #define HAVE_SEMGET 1
-| #define HAVE_SEMCTL 1
-| #define HAVE_FLOCK 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SEM_CLOSE 1
-| #define HAVE_SEM_UNLINK 1
-| #define HAVE_SEM_POST 1
-| #define HAVE_SEM_WAIT 1
-| #define HAVE_LOCK_EX 1
-| #define HAVE_F_SETLK 1
-| #define HAVE_SEM_UNDO 1
-| #define HAVE_POLLIN 1
-| #define HAVE_PTHREAD_PROCESS_SHARED 1
-| #define HAVE_PTHREAD_MUTEXATTR_SETPSHARED 1
-| #define HAVE_PTHREAD_MUTEX_ROBUST 1
-| #define apr_lock implementation method 1
-| #define USE_SYSVSEM_SERIALIZE 1
-| #define DEV_RANDOM "/dev/random"
-| #define HAVE_GMTOFF 1
-| #define GETHOSTBYNAME_R_GLIBC2 1
-| /* end confdefs.h.  */
-| 
-| #include <stdio.h>
-| #ifdef HAVE_SYS_TYPES_H
-| #include <sys/types.h>
-| #endif
-| #ifdef HAVE_SYS_SOCKET_H
-| #include <sys/socket.h>
-| #endif
-| #ifdef HAVE_NETINET_IN_H
-| #include <netinet/in.h>
-| #endif
-| #ifdef HAVE_NETINET_TCP_H
-| #include <netinet/tcp.h>
-| #endif
-| #ifndef HAVE_SOCKLEN_T
-| typedef int socklen_t;
-| #endif
-| #ifdef HAVE_FCNTL_H
-| #include <fcntl.h>
-| #endif
-| int main(void) {
-|     int listen_s, connected_s, client_s;
-|     int listen_port, rc;
-|     struct sockaddr_in sa;
-|     socklen_t sa_len;
-| 
-|     listen_s = socket(AF_INET, SOCK_STREAM, 0);
-|     if (listen_s < 0) {
-|         perror("socket");
-|         exit(1);
-|     }
-|     memset(&sa, 0, sizeof sa);
-|     sa.sin_family = AF_INET;
-| #ifdef BEOS
-|     sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-| #endif
-|     /* leave port 0 to get ephemeral */
-|     rc = bind(listen_s, (struct sockaddr *)&sa, sizeof sa);
-|     if (rc < 0) {
-|         perror("bind for ephemeral port");
-|         exit(1);
-|     }
-|     /* find ephemeral port */
-|     sa_len = sizeof(sa);
-|     rc = getsockname(listen_s, (struct sockaddr *)&sa, &sa_len);
-|     if (rc < 0) {
-|         perror("getsockname");
-|         exit(1);
-|     }
-|     listen_port = sa.sin_port;
-|     rc = listen(listen_s, 5);
-|     if (rc < 0) {
-|         perror("listen");
-|         exit(1);
-|     }
-|     rc = fcntl(listen_s, F_SETFL, O_NONBLOCK);
-|     if (rc < 0) {
-|         perror("fcntl(F_SETFL)");
-|         exit(1);
-|     }
-|     client_s = socket(AF_INET, SOCK_STREAM, 0);
-|     if (client_s < 0) {
-|         perror("socket");
-|         exit(1);
-|     }
-|     memset(&sa, 0, sizeof sa);
-|     sa.sin_family = AF_INET;
-|     sa.sin_port   = listen_port;
-| #ifdef BEOS
-|     sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-| #endif
-|     /* leave sin_addr all zeros to use loopback */
-|     rc = connect(client_s, (struct sockaddr *)&sa, sizeof sa);
-|     if (rc < 0) {
-|         perror("connect");
-|         exit(1);
-|     }
-|     sa_len = sizeof sa;
-|     connected_s = accept(listen_s, (struct sockaddr *)&sa, &sa_len);
-|     if (connected_s < 0) {
-|         perror("accept");
-|         exit(1);
-|     }
-|     rc = fcntl(connected_s, F_GETFL, 0);
-|     if (rc < 0) {
-|         perror("fcntl(F_GETFL)");
-|         exit(1);
-|     }
-|     if (!(rc & O_NONBLOCK)) {
-|         fprintf(stderr, "O_NONBLOCK is not set in the child.\n");
-|         exit(1);
-|     }
-|     return 0;
-| }
-| 
-configure:41624: result: no
-configure:41635: checking for TCP_CORK in netinet/tcp.h
-configure:41664: result: yes
-configure:41675: checking for TCP_NOPUSH in netinet/tcp.h
-configure:41704: result: no
-configure:41755: checking for SO_ACCEPTFILTER in sys/socket.h
-configure:41784: result: no
-configure:41801: checking whether SCTP is supported
-configure:41848: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-conftest.c: In function 'main':
-conftest.c:199:37: error: 'SCTP_NODELAY' undeclared (first use in this function)
-     if (setsockopt(s, IPPROTO_SCTP, SCTP_NODELAY, &opt, sizeof(int)) < 0)
-                                     ^
-conftest.c:199:37: note: each undeclared identifier is reported only once for each function it appears in
-configure:41852: $? = 1
-configure: program exited with status 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_RESOURCE_H 1
-| #define HAVE_SYS_SELECT_H 1
-| #define HAVE_SYS_SEM_H 1
-| #define HAVE_SYS_SENDFILE_H 1
-| #define HAVE_SYS_SIGNAL_H 1
-| #define HAVE_SYS_SOCKET_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_SYS_SYSCTL_H 1
-| #define HAVE_SYS_TIME_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_SYS_UN_H 1
-| #define HAVE_SYS_WAIT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| #define SETPGRP_VOID 1
-| #define HAVE_SOCKLEN_T 1
-| #define SIZEOF_VOIDP 8
-| #define SIZEOF_CHAR 1
-| #define SIZEOF_INT 4
-| #define SIZEOF_LONG 8
-| #define SIZEOF_SHORT 2
-| #define SIZEOF_LONG_DOUBLE 16
-| #define SIZEOF_LONG_LONG 8
-| #define SIZEOF_SSIZE_T 8
-| #define SIZEOF_SIZE_T 8
-| #define SIZEOF_OFF_T 8
-| #define SIZEOF_PID_T 4
-| #define HAVE_STRNCASECMP 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_STRDUP 1
-| #define HAVE_STRSTR 1
-| #define HAVE_MEMCHR 1
-| #define HAVE_STRTOL 1
-| #define HAVE_DLSYM 1
-| #define DSO_USE_DLFCN 1
-| #define HAVE_WAITPID 1
-| #define HAVE_VLA 1
-| #define HAVE_SEMGET 1
-| #define HAVE_SEMCTL 1
-| #define HAVE_FLOCK 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SEM_CLOSE 1
-| #define HAVE_SEM_UNLINK 1
-| #define HAVE_SEM_POST 1
-| #define HAVE_SEM_WAIT 1
-| #define HAVE_LOCK_EX 1
-| #define HAVE_F_SETLK 1
-| #define HAVE_SEM_UNDO 1
-| #define HAVE_POLLIN 1
-| #define HAVE_PTHREAD_PROCESS_SHARED 1
-| #define HAVE_PTHREAD_MUTEXATTR_SETPSHARED 1
-| #define HAVE_PTHREAD_MUTEX_ROBUST 1
-| #define apr_lock implementation method 1
-| #define USE_SYSVSEM_SERIALIZE 1
-| #define DEV_RANDOM "/dev/random"
-| #define HAVE_GMTOFF 1
-| #define GETHOSTBYNAME_R_GLIBC2 1
-| #define HAVE_TCP_CORK 1
-| /* end confdefs.h.  */
-| 
-| #ifdef HAVE_SYS_TYPES_H
-| #include <sys/types.h>
-| #endif
-| #ifdef HAVE_SYS_SOCKET_H
-| #include <sys/socket.h>
-| #endif
-| #ifdef HAVE_NETINET_IN_H
-| #include <netinet/in.h>
-| #endif
-| #ifdef HAVE_NETINET_SCTP_H
-| #include <netinet/sctp.h>
-| #endif
-| #ifdef HAVE_NETINET_SCTP_UIO_H
-| #include <netinet/sctp_uio.h>
-| #endif
-| #include <stdlib.h>
-| int main(void) {
-|     int s, opt = 1;
-|     if ((s = socket(AF_INET, SOCK_STREAM, IPPROTO_SCTP)) < 0)
-|        exit(1);
-|     if (setsockopt(s, IPPROTO_SCTP, SCTP_NODELAY, &opt, sizeof(int)) < 0)
-|        exit(2);
-|     exit(0);
-| }
-configure:41879: result: no
-configure:41898: checking for set_h_errno
-configure:41954: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-/tmp/cc6cYjpL.o: In function `main':
-/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/conftest.c:212: undefined reference to `set_h_errno'
-collect2: error: ld returned 1 exit status
-configure:41961: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME ""
-| #define PACKAGE_TARNAME ""
-| #define PACKAGE_VERSION ""
-| #define PACKAGE_STRING ""
-| #define PACKAGE_BUGREPORT ""
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define __EXTENSIONS__ 1
-| #define _ALL_SOURCE 1
-| #define _GNU_SOURCE 1
-| #define _POSIX_PTHREAD_SEMANTICS 1
-| #define _TANDEM_SOURCE 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_LIBNSL 1
-| #define HAVE_PTHREAD_H 1
-| #define HAVE_PTHREAD_H 1
-| #define USE_THREADS 1
-| #define HAVE_PTHREAD_KEY_DELETE 1
-| #define HAVE_PTHREAD_RWLOCK_INIT 1
-| #define HAVE_PTHREAD_RWLOCKS 1
-| #define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-| #define HAVE_GETHOSTBYNAME_R 1
-| #define HAVE_GETHOSTBYADDR_R 1
-| #define HAVE_SIGSUSPEND 1
-| #define HAVE_SIGWAIT 1
-| #define HAVE_POLL 1
-| #define HAVE_GETPWNAM_R 1
-| #define HAVE_GETPWUID_R 1
-| #define HAVE_GETGRNAM_R 1
-| #define HAVE_GETGRGID_R 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_IPC_H 1
-| #define HAVE_SYS_SHM_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_MMAP 1
-| #define HAVE_MUNMAP 1
-| #define HAVE_SHM_OPEN 1
-| #define HAVE_SHM_UNLINK 1
-| #define HAVE_SHMGET 1
-| #define HAVE_SHMAT 1
-| #define HAVE_SHMDT 1
-| #define HAVE_SHMCTL 1
-| #define HAVE_MAP_ANON 1
-| #define anonymous shared memory allocation method 1
-| #define USE_SHMEM_MMAP_ANON 1
-| #define namebased memory allocation method 1
-| #define USE_SHMEM_SHMGET 1
-| #define HAVE_CALLOC 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_SETSID 1
-| #define HAVE_ISINF 1
-| #define HAVE_ISNAN 1
-| #define HAVE_GETENV 1
-| #define HAVE_PUTENV 1
-| #define HAVE_SETENV 1
-| #define HAVE_UNSETENV 1
-| #define HAVE_SETRLIMIT 1
-| #define HAVE_GETRLIMIT 1
-| #define HAVE_WRITEV 1
-| #define HAVE_SENDFILE 1
-| #define HAVE_UTIME 1
-| #define HAVE_UTIMES 1
-| #define HAVE_SIGACTION 1
-| #define HAVE_DECL_SYS_SIGLIST 1
-| #define HAVE_FORK 1
-| #define HAVE_STRERROR_R 1
-| #define HAVE_CRYPT_R 1
-| #define CRYPT_R_STRUCT_CRYPT_DATA 1
-| #define HAVE_MMAP 1
-| #define HAVE_MEMMOVE 1
-| #define HAVE_GETPASS 1
-| #define HAVE_GMTIME_R 1
-| #define HAVE_LOCALTIME_R 1
-| #define HAVE_HSTRERROR 1
-| #define HAVE_MKSTEMP 1
-| #define DIRENT_INODE d_fileno
-| #define DIRENT_TYPE d_type
-| #define STDC_HEADERS 1
-| #define HAVE_ALLOCA_H 1
-| #define HAVE_CRYPT_H 1
-| #define HAVE_CTYPE_H 1
-| #define HAVE_DIRENT_H 1
-| #define HAVE_DLFCN_H 1
-| #define HAVE_ERRNO_H 1
-| #define HAVE_FCNTL_H 1
-| #define HAVE_GRP_H 1
-| #define HAVE_LIMITS_H 1
-| #define HAVE_MALLOC_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_NETDB_H 1
-| #define HAVE_POLL_H 1
-| #define HAVE_PWD_H 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SIGNAL_H 1
-| #define HAVE_STDARG_H 1
-| #define HAVE_STDDEF_H 1
-| #define HAVE_STDIO_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_TERMIOS_H 1
-| #define HAVE_TIME_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_ARPA_INET_H 1
-| #define HAVE_NETINET_IN_H 1
-| #define HAVE_SYS_FILE_H 1
-| #define HAVE_SYS_IOCTL_H 1
-| #define HAVE_SYS_MMAN_H 1
-| #define HAVE_SYS_POLL_H 1
-| #define HAVE_SYS_RESOURCE_H 1
-| #define HAVE_SYS_SELECT_H 1
-| #define HAVE_SYS_SEM_H 1
-| #define HAVE_SYS_SENDFILE_H 1
-| #define HAVE_SYS_SIGNAL_H 1
-| #define HAVE_SYS_SOCKET_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_SYS_SYSCTL_H 1
-| #define HAVE_SYS_TIME_H 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_UIO_H 1
-| #define HAVE_SYS_UN_H 1
-| #define HAVE_SYS_WAIT_H 1
-| #define HAVE_NETINET_TCP_H 1
-| #define SETPGRP_VOID 1
-| #define HAVE_SOCKLEN_T 1
-| #define SIZEOF_VOIDP 8
-| #define SIZEOF_CHAR 1
-| #define SIZEOF_INT 4
-| #define SIZEOF_LONG 8
-| #define SIZEOF_SHORT 2
-| #define SIZEOF_LONG_DOUBLE 16
-| #define SIZEOF_LONG_LONG 8
-| #define SIZEOF_SSIZE_T 8
-| #define SIZEOF_SIZE_T 8
-| #define SIZEOF_OFF_T 8
-| #define SIZEOF_PID_T 4
-| #define HAVE_STRNCASECMP 1
-| #define HAVE_STRCASECMP 1
-| #define HAVE_STRDUP 1
-| #define HAVE_STRSTR 1
-| #define HAVE_MEMCHR 1
-| #define HAVE_STRTOL 1
-| #define HAVE_DLSYM 1
-| #define DSO_USE_DLFCN 1
-| #define HAVE_WAITPID 1
-| #define HAVE_VLA 1
-| #define HAVE_SEMGET 1
-| #define HAVE_SEMCTL 1
-| #define HAVE_FLOCK 1
-| #define HAVE_SEMAPHORE_H 1
-| #define HAVE_SEM_CLOSE 1
-| #define HAVE_SEM_UNLINK 1
-| #define HAVE_SEM_POST 1
-| #define HAVE_SEM_WAIT 1
-| #define HAVE_LOCK_EX 1
-| #define HAVE_F_SETLK 1
-| #define HAVE_SEM_UNDO 1
-| #define HAVE_POLLIN 1
-| #define HAVE_PTHREAD_PROCESS_SHARED 1
-| #define HAVE_PTHREAD_MUTEXATTR_SETPSHARED 1
-| #define HAVE_PTHREAD_MUTEX_ROBUST 1
-| #define apr_lock implementation method 1
-| #define USE_SYSVSEM_SERIALIZE 1
-| #define DEV_RANDOM "/dev/random"
-| #define HAVE_GMTOFF 1
-| #define GETHOSTBYNAME_R_GLIBC2 1
-| #define HAVE_TCP_CORK 1
-| /* end confdefs.h.  */
-| /* Define set_h_errno to an innocuous variant, in case <limits.h> declares set_h_errno.
-|    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-| #define set_h_errno innocuous_set_h_errno
-| 
-| /* System header to define __stub macros and hopefully few prototypes,
-|     which can conflict with char set_h_errno (); below.
-|     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-|     <limits.h> exists even on freestanding compilers.  */
-| 
-| #ifdef __STDC__
-| # include <limits.h>
-| #else
-| # include <assert.h>
-| #endif
-| 
-| #undef set_h_errno
-| 
-| /* Override any GCC internal prototype to avoid an error.
-|    Use char because int might match the return type of a GCC
-|    builtin and then its argument prototype would still apply.  */
-| #ifdef __cplusplus
-| extern "C"
-| #endif
-| char set_h_errno ();
-| /* The GNU C library defines this for functions which it implements
-|     to always fail with ENOSYS.  Some functions are actually named
-|     something starting with __ and the normal name is an alias.  */
-| #if defined __stub_set_h_errno || defined __stub___set_h_errno
-| choke me
-| #endif
-| 
-| int
-| main ()
-| {
-| return set_h_errno ();
-|   ;
-|   return 0;
-| }
-configure:41983: result: no
-configure:41996: checking for presence of retrans/retry fields in res_state/resolv.h 
-configure:42034: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-conftest.c: In function 'main':
-conftest.c:188:5: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-     exit(0);
-     ^
-configure:42038: $? = 0
-configure:42044: ./conftest
-configure:42048: $? = 0
-configure:42069: result: yes
-configure:42097: checking for library containing getaddrinfo
-configure:42138: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-configure:42145: $? = 0
-configure:42176: result: none required
-configure:42184: checking for library containing gai_strerror
-configure:42225: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-configure:42232: $? = 0
-configure:42263: result: none required
-configure:42271: checking for library containing getnameinfo
-configure:42312: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-configure:42319: $? = 0
-configure:42350: result: none required
-configure:42362: checking for gai_strerror
-configure:42418: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-configure:42425: $? = 0
-configure:42447: result: yes
-configure:42460: checking for working getaddrinfo
-configure:42515: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-conftest.c: In function 'main':
-conftest.c:203:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-conftest.c:206:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-conftest.c:208:5: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-     exit(0);
-     ^
-configure:42519: $? = 0
-configure:42525: ./conftest
-configure:42529: $? = 0
-configure:42550: result: yes
-configure:42565: checking for negative error codes for getaddrinfo
-configure:42601: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-conftest.c: In function 'main':
-conftest.c:188:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(0);
-         ^
-conftest.c:190:5: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-     exit(1);
-     ^
-configure:42605: $? = 0
-configure:42611: ./conftest
-configure:42615: $? = 0
-configure:42636: result: yes
-configure:42647: checking for working getnameinfo
-configure:42710: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-conftest.c: In function 'main':
-conftest.c:215:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(1);
-         ^
-conftest.c:217:9: warning: incompatible implicit declaration of built-in function 'exit' [enabled by default]
-         exit(0);
-         ^
-configure:42714: $? = 0
-configure:42720: ./conftest
-configure:42724: $? = 0
-configure:42745: result: yes
-configure:42756: checking for sockaddr_in6
-configure:42792: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:42799: $? = 0
-configure:42819: result: yes
-configure:42853: checking if APR supports IPv6
-configure:42855: result: yes
-configure:42877: checking langinfo.h usability
-configure:42894: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:42901: $? = 0
-configure:42915: result: yes
-configure:42919: checking langinfo.h presence
-configure:42934: gcc -E -D_REENTRANT -D_GNU_SOURCE conftest.c
-configure:42941: $? = 0
-configure:42955: result: yes
-configure:42983: checking for langinfo.h
-configure:42992: result: yes
-configure:43011: checking for nl_langinfo
-configure:43067: gcc -o conftest -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE  conftest.c -lrt -lm -lcrypt -lnsl  -lpthread -ldl >&5
-configure:43074: $? = 0
-configure:43096: result: yes
-configure:43114: checking for usable fstat64
-configure:43142: gcc -c -g -O2 -pthread -D_REENTRANT -D_GNU_SOURCE conftest.c >&5
-configure:43149: $? = 0
-configure:43164: result: yes
-configure:43427: creating ./config.status
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by config.status, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status 
-
-on ubuntu
-
-config.status:1101: creating Makefile
-config.status:1101: creating strings/Makefile
-config.status:1101: creating passwd/Makefile
-config.status:1101: creating tables/Makefile
-config.status:1101: creating build/Makefile
-config.status:1101: creating file_io/unix/Makefile
-config.status:1101: creating network_io/unix/Makefile
-config.status:1101: creating threadproc/unix/Makefile
-config.status:1101: creating misc/unix/Makefile
-config.status:1101: creating locks/unix/Makefile
-config.status:1101: creating time/unix/Makefile
-config.status:1101: creating mmap/unix/Makefile
-config.status:1101: creating shmem/unix/Makefile
-config.status:1101: creating user/unix/Makefile
-config.status:1101: creating memory/unix/Makefile
-config.status:1101: creating atomic/unix/Makefile
-config.status:1101: creating poll/unix/Makefile
-config.status:1101: creating support/unix/Makefile
-config.status:1101: creating dso/unix/Makefile
-config.status:1101: creating test/Makefile
-config.status:1101: creating test/internal/Makefile
-config.status:1101: creating include/apr.h
-config.status:1101: creating build/apr_rules.mk
-config.status:1101: creating build/pkg/pkginfo
-config.status:1101: creating apr-config
-config.status:1101: creating include/arch/unix/apr_private.h
-config.status:1335: executing default commands
-
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-
-ac_cv_build=x86_64-unknown-linux-gnu
-ac_cv_c_compiler_gnu=yes
-ac_cv_c_const=yes
-ac_cv_c_inline=inline
-ac_cv_crypt_r_style=struct_crypt_data
-ac_cv_cxx_compiler_gnu=yes
-ac_cv_define_F_SETLK=yes
-ac_cv_define_GETHOSTBYADDR_IS_THREAD_SAFE=no
-ac_cv_define_GETHOSTBYNAME_IS_THREAD_SAFE=no
-ac_cv_define_LOCK_EX=yes
-ac_cv_define_MAP_ANON=yes
-ac_cv_define_POLLIN=yes
-ac_cv_define_PTHREAD_PROCESS_SHARED=yes
-ac_cv_define_READDIR_IS_THREAD_SAFE=no
-ac_cv_define_SEM_UNDO=yes
-ac_cv_define_SO_ACCEPTFILTER=no
-ac_cv_define_TCP_CORK=yes
-ac_cv_define_TCP_NOPUSH=no
-ac_cv_define_sockaddr_in6=yes
-ac_cv_ebcdic=no
-ac_cv_env_CCC_set=
-ac_cv_env_CCC_value=
-ac_cv_env_CC_set=
-ac_cv_env_CC_value=
-ac_cv_env_CFLAGS_set=
-ac_cv_env_CFLAGS_value=
-ac_cv_env_CPPFLAGS_set=
-ac_cv_env_CPPFLAGS_value=
-ac_cv_env_CPP_set=
-ac_cv_env_CPP_value=
-ac_cv_env_CXXCPP_set=
-ac_cv_env_CXXCPP_value=
-ac_cv_env_CXXFLAGS_set=
-ac_cv_env_CXXFLAGS_value=
-ac_cv_env_CXX_set=
-ac_cv_env_CXX_value=
-ac_cv_env_F77_set=
-ac_cv_env_F77_value=
-ac_cv_env_FFLAGS_set=
-ac_cv_env_FFLAGS_value=
-ac_cv_env_LDFLAGS_set=
-ac_cv_env_LDFLAGS_value=
-ac_cv_env_LIBS_set=
-ac_cv_env_LIBS_value=
-ac_cv_env_build_alias_set=
-ac_cv_env_build_alias_value=
-ac_cv_env_host_alias_set=
-ac_cv_env_host_alias_value=
-ac_cv_env_target_alias_set=
-ac_cv_env_target_alias_value=
-ac_cv_f77_compiler_gnu=no
-ac_cv_file__dev_zero=yes
-ac_cv_func_NSLinkModule=no
-ac_cv_func__getch=no
-ac_cv_func_alloca=no
-ac_cv_func_calloc=yes
-ac_cv_func_create_area=no
-ac_cv_func_crypt_r=yes
-ac_cv_func_dlopen=no
-ac_cv_func_dlsym=yes
-ac_cv_func_flock=yes
-ac_cv_func_fork=yes
-ac_cv_func_gai_strerror=yes
-ac_cv_func_getenv=yes
-ac_cv_func_getgrgid_r=yes
-ac_cv_func_getgrnam_r=yes
-ac_cv_func_gethostbyaddr_r=yes
-ac_cv_func_gethostbyname_r=yes
-ac_cv_func_getpass=yes
-ac_cv_func_getpassphrase=no
-ac_cv_func_getpwnam_r=yes
-ac_cv_func_getpwuid_r=yes
-ac_cv_func_getrlimit=yes
-ac_cv_func_gmtime_r=yes
-ac_cv_func_hstrerror=yes
-ac_cv_func_inet_addr=yes
-ac_cv_func_inet_network=yes
-ac_cv_func_isinf=yes
-ac_cv_func_isnan=yes
-ac_cv_func_localtime_r=yes
-ac_cv_func_memchr=yes
-ac_cv_func_memmove=yes
-ac_cv_func_mkstemp=yes
-ac_cv_func_mmap=yes
-ac_cv_func_munmap=yes
-ac_cv_func_nl_langinfo=yes
-ac_cv_func_poll=yes
-ac_cv_func_pthread_key_delete=yes
-ac_cv_func_pthread_mutexattr_setpshared=yes
-ac_cv_func_pthread_rwlock_init=yes
-ac_cv_func_putenv=yes
-ac_cv_func_sem_close=yes
-ac_cv_func_sem_open=no
-ac_cv_func_sem_post=yes
-ac_cv_func_sem_unlink=yes
-ac_cv_func_sem_wait=yes
-ac_cv_func_semctl=yes
-ac_cv_func_semget=yes
-ac_cv_func_send_file=no
-ac_cv_func_sendfile=yes
-ac_cv_func_sendfilev=no
-ac_cv_func_set_h_errno=no
-ac_cv_func_setenv=yes
-ac_cv_func_setpgrp_void=yes
-ac_cv_func_setrlimit=yes
-ac_cv_func_setsid=yes
-ac_cv_func_shm_open=yes
-ac_cv_func_shm_unlink=yes
-ac_cv_func_shmat=yes
-ac_cv_func_shmctl=yes
-ac_cv_func_shmdt=yes
-ac_cv_func_shmget=yes
-ac_cv_func_sigaction=yes
-ac_cv_func_sigsuspend=yes
-ac_cv_func_sigwait=yes
-ac_cv_func_strcasecmp=yes
-ac_cv_func_strdup=yes
-ac_cv_func_strerror_r=yes
-ac_cv_func_stricmp=no
-ac_cv_func_strncasecmp=yes
-ac_cv_func_strnicmp=no
-ac_cv_func_strstr=yes
-ac_cv_func_strtol=yes
-ac_cv_func_unsetenv=yes
-ac_cv_func_utime=yes
-ac_cv_func_utimes=yes
-ac_cv_func_waitpid=yes
-ac_cv_func_writev=yes
-ac_cv_gethostbyname_r_arg=char
-ac_cv_gethostbyname_r_style=glibc2
-ac_cv_h_errno_cppflags=yes
-ac_cv_have_decl_sys_siglist=yes
-ac_cv_header_ByteOrder_h=no
-ac_cv_header_alloca_h=yes
-ac_cv_header_arpa_inet_h=yes
-ac_cv_header_conio_h=no
-ac_cv_header_crypt_h=yes
-ac_cv_header_ctype_h=yes
-ac_cv_header_dir_h=no
-ac_cv_header_dirent_h=yes
-ac_cv_header_dl_h=no
-ac_cv_header_dlfcn_h=yes
-ac_cv_header_errno_h=yes
-ac_cv_header_fcntl_h=yes
-ac_cv_header_grp_h=yes
-ac_cv_header_inttypes_h=yes
-ac_cv_header_io_h=no
-ac_cv_header_kernel_OS_h=no
-ac_cv_header_langinfo_h=yes
-ac_cv_header_limits_h=yes
-ac_cv_header_mach_o_dyld_h=no
-ac_cv_header_malloc_h=yes
-ac_cv_header_memory_h=yes
-ac_cv_header_minix_config_h=no
-ac_cv_header_net_errno_h=no
-ac_cv_header_netdb_h=yes
-ac_cv_header_netinet_in_h=yes
-ac_cv_header_netinet_sctp_h=no
-ac_cv_header_netinet_sctp_uio_h=no
-ac_cv_header_os2_h=no
-ac_cv_header_osreldate_h=no
-ac_cv_header_poll_h=yes
-ac_cv_header_process_h=no
-ac_cv_header_pthread_h=yes
-ac_cv_header_pwd_h=yes
-ac_cv_header_semaphore_h=yes
-ac_cv_header_signal_h=yes
-ac_cv_header_stdarg_h=yes
-ac_cv_header_stdc=yes
-ac_cv_header_stddef_h=yes
-ac_cv_header_stdint_h=yes
-ac_cv_header_stdio_h=yes
-ac_cv_header_stdlib_h=yes
-ac_cv_header_string_h=yes
-ac_cv_header_strings_h=yes
-ac_cv_header_sys_file_h=yes
-ac_cv_header_sys_ioctl_h=yes
-ac_cv_header_sys_ipc_h=yes
-ac_cv_header_sys_mman_h=yes
-ac_cv_header_sys_mutex_h=no
-ac_cv_header_sys_poll_h=yes
-ac_cv_header_sys_resource_h=yes
-ac_cv_header_sys_select_h=yes
-ac_cv_header_sys_sem_h=yes
-ac_cv_header_sys_sendfile_h=yes
-ac_cv_header_sys_shm_h=yes
-ac_cv_header_sys_signal_h=yes
-ac_cv_header_sys_socket_h=yes
-ac_cv_header_sys_sockio_h=no
-ac_cv_header_sys_stat_h=yes
-ac_cv_header_sys_sysctl_h=yes
-ac_cv_header_sys_syslimits_h=no
-ac_cv_header_sys_time_h=yes
-ac_cv_header_sys_types_h=yes
-ac_cv_header_sys_uio_h=yes
-ac_cv_header_sys_un_h=yes
-ac_cv_header_sys_wait_h=yes
-ac_cv_header_sysapi_h=no
-ac_cv_header_sysgtime_h=no
-ac_cv_header_termios_h=yes
-ac_cv_header_time_h=yes
-ac_cv_header_tpfeq_h=no
-ac_cv_header_tpfio_h=no
-ac_cv_header_unistd_h=yes
-ac_cv_header_unix_h=no
-ac_cv_host=x86_64-unknown-linux-gnu
-ac_cv_inaddr_none=yes
-ac_cv_lib_c_r_gethostbyaddr=no
-ac_cv_lib_c_r_gethostbyname=no
-ac_cv_lib_c_r_readdir=no
-ac_cv_lib_dl_dlopen=yes
-ac_cv_lib_dld_shl_load=no
-ac_cv_lib_nsl_gethostbyname=yes
-ac_cv_lib_resolv_res_init=no
-ac_cv_lib_sendfile_sendfilev=no
-ac_cv_lib_socket_socket=no
-ac_cv_lib_truerand_main=no
-ac_cv_mkdir_p=yes
-ac_cv_negative_eai=yes
-ac_cv_o_nonblock_inherited=no
-ac_cv_objext=o
-ac_cv_path_EGREP='/bin/grep -E'
-ac_cv_path_GREP=/bin/grep
-ac_cv_path_install='/usr/bin/install -c'
-ac_cv_prog_AS=as
-ac_cv_prog_ASCPP=cpp
-ac_cv_prog_AWK=gawk
-ac_cv_prog_CPP='gcc -E'
-ac_cv_prog_CXXCPP='g++ -E'
-ac_cv_prog_RM=rm
-ac_cv_prog_ac_ct_AR=ar
-ac_cv_prog_ac_ct_CC=gcc
-ac_cv_prog_ac_ct_CXX=g++
-ac_cv_prog_ac_ct_RANLIB=ranlib
-ac_cv_prog_ac_ct_STRIP=strip
-ac_cv_prog_cc_c89=
-ac_cv_prog_cc_g=yes
-ac_cv_prog_cxx_g=yes
-ac_cv_prog_f77_g=no
-ac_cv_prog_make_make_set=yes
-ac_cv_pthread_attr_getdetachstate_one_arg=no
-ac_cv_pthread_getspecific_two_args=no
-ac_cv_retransretry=yes
-ac_cv_safe_to_define___extensions__=yes
-ac_cv_search_crypt=-lcrypt
-ac_cv_search_gai_strerror='none required'
-ac_cv_search_getaddrinfo='none required'
-ac_cv_search_gethostname='none required'
-ac_cv_search_getnameinfo='none required'
-ac_cv_search_modf='none required'
-ac_cv_search_shm_open=-lrt
-ac_cv_search_sqrt=-lm
-ac_cv_search_strerror='none required'
-ac_cv_sigwait_one_arg=no
-ac_cv_sizeof_char=1
-ac_cv_sizeof_int=4
-ac_cv_sizeof_long=8
-ac_cv_sizeof_long_double=16
-ac_cv_sizeof_long_long=8
-ac_cv_sizeof_off_t=8
-ac_cv_sizeof_pid_t=4
-ac_cv_sizeof_short=2
-ac_cv_sizeof_size_t=8
-ac_cv_sizeof_ssize_t=8
-ac_cv_sizeof_voidp=8
-ac_cv_socklen_t=yes
-ac_cv_strerror_r_rc_int=no
-ac_cv_struct_rlimit=yes
-ac_cv_struct_tm_gmtoff=yes
-ac_cv_target=x86_64-unknown-linux-gnu
-ac_cv_tcp_nodelay_inherited=yes
-ac_cv_type_off_t=yes
-ac_cv_type_pid_t=yes
-ac_cv_type_size_t=yes
-ac_cv_type_ssize_t=yes
-ac_cv_type_uid_t=yes
-ac_cv_working_getaddrinfo=yes
-ac_cv_working_getnameinfo=yes
-apr_cv_define_INT64_C=yes
-apr_cv_dirent_inode=d_fileno
-apr_cv_dirent_type=d_type
-apr_cv_func_fstat64=yes
-apr_cv_hdr_netinet_tcp_h=yes
-apr_cv_mutex_recursive=yes
-apr_cv_mutex_robust_shared=yes
-apr_cv_process_shared_works=yes
-apr_cv_pthreads_cflags=-pthread
-apr_cv_pthreads_lib=-lpthread
-apr_cv_sctp=no
-apr_cv_type_rwlock_t=yes
-apr_cv_typematch_ino_t_unsigned_int=no
-apr_cv_typematch_ino_t_unsigned_long=yes
-apr_cv_typematch_ino_t_unsigned_long_long=no
-lt_cv_deplibs_check_method=pass_all
-lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_ld_reload_flag=-r
-lt_cv_objdir=.libs
-lt_cv_path_LD=/usr/bin/ld
-lt_cv_path_LDCXX='/usr/bin/ld -m elf_x86_64'
-lt_cv_path_NM='/usr/bin/nm -B'
-lt_cv_path_SED=/bin/sed
-lt_cv_prog_compiler_c_o=yes
-lt_cv_prog_compiler_c_o_CXX=yes
-lt_cv_prog_compiler_pic_works=yes
-lt_cv_prog_compiler_pic_works_CXX=yes
-lt_cv_prog_compiler_rtti_exceptions=no
-lt_cv_prog_compiler_static_works=yes
-lt_cv_prog_compiler_static_works_CXX=yes
-lt_cv_prog_gnu_ld=yes
-lt_cv_prog_gnu_ldcxx=yes
-lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[ 	]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ 	][ 	]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\'''
-lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \([^ ]*\) $/  {\"\1\", (lt_ptr) 0},/p'\'' -e '\''s/^[BCDEGRST] \([^ ]*\) \([^ ]*\)$/  {"\2", (lt_ptr) \&\2},/p'\'''
-lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^. .* \(.*\)$/extern int \1;/p'\'''
-lt_cv_sys_lib_dlsearch_path_spec='/usr/lib64 /lib64 /usr/lib/x86_64-linux-gnu/libfakeroot /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu '
-lt_cv_sys_lib_search_path_spec='/usr/lib64 /lib64 /usr/local/lib64'
-lt_cv_sys_max_cmd_len=1572864
-lt_lt_cv_prog_compiler_c_o='"yes"'
-lt_lt_cv_prog_compiler_c_o_CXX='"yes"'
-lt_lt_cv_sys_global_symbol_pipe='"sed -n -e '\''s/^.*[ 	]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ 	][ 	]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'\''"'
-lt_lt_cv_sys_global_symbol_to_c_name_address='"sed -n -e '\''s/^: \\([^ ]*\\) \$/  {\\\"\\1\\\", (lt_ptr) 0},/p'\'' -e '\''s/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/  {\"\\2\", (lt_ptr) \\&\\2},/p'\''"'
-lt_lt_cv_sys_global_symbol_to_cdecl='"sed -n -e '\''s/^. .* \\(.*\\)\$/extern int \\1;/p'\''"'
-
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-
-APR_CONFIG_LOCATION='source'
-APR_DOTTED_VERSION='0.9.19'
-APR_LIBNAME='apr-${APR_MAJOR_VERSION}'
-APR_MAJOR_VERSION='0'
-AR='ar'
-AS='as'
-ASCPP='cpp'
-AWK='gawk'
-CC='gcc'
-CFLAGS=''
-CPP='gcc -E'
-CPPFLAGS=''
-CXX='g++'
-CXXCPP='g++ -E'
-CXXFLAGS='-g -O2'
-DEFAULT_OSDIR='unix'
-DEFS='-DHAVE_CONFIG_H'
-DSYMUTIL=''
-ECHO='echo'
-ECHO_C=''
-ECHO_N='-n'
-ECHO_T=''
-EGREP='/bin/grep -E'
-EXEEXT=''
-EXTRA_CFLAGS='-g -O2 -pthread'
-EXTRA_CPPFLAGS='-D_REENTRANT -D_GNU_SOURCE'
-EXTRA_INCLUDES=''
-EXTRA_LDFLAGS=''
-EXTRA_LIBS='-lrt -lm -lcrypt -lnsl  -lpthread -ldl'
-F77=''
-FFLAGS=''
-GREP='/bin/grep'
-INCLUDE_RULES='include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk'
-INSTALL_DATA='${INSTALL} -m 644'
-INSTALL_PROGRAM='${INSTALL}'
-INSTALL_SCRIPT='${INSTALL}'
-INSTALL_SUBDIRS='none'
-LDFLAGS=''
-LDLIBS=''
-LIBOBJS=''
-LIBS=''
-LIBTOOL='$(SHELL) $(apr_builddir)/libtool'
-LIBTOOL_LIBS=''
-LN_S='ln -s'
-LTFLAGS='--silent'
-LTLIBOBJS=''
-LT_LDFLAGS=''
-MKDEP='$(CC) -MM'
-NMEDIT=''
-NOTEST_CFLAGS=''
-NOTEST_CPPFLAGS=''
-NOTEST_INCLUDES=''
-NOTEST_LDFLAGS=''
-NOTEST_LIBS=''
-OBJEXT='o'
-OSDIR='unix'
-PACKAGE_BUGREPORT=''
-PACKAGE_NAME=''
-PACKAGE_STRING=''
-PACKAGE_TARNAME=''
-PACKAGE_VERSION=''
-PATH_SEPARATOR=':'
-RANLIB='ranlib'
-RM='rm'
-SED='/bin/sed'
-SET_MAKE=''
-SHELL='/bin/bash'
-STRIP='strip'
-SUBDIRS='strings passwd tables  file_io/unix  network_io/unix  threadproc/unix  misc/unix  locks/unix  time/unix  mmap/unix  shmem/unix  user/unix  memory/unix  atomic/unix  poll/unix  support/unix  dso/unix '
-ac_ct_CC='gcc'
-ac_ct_CXX='g++'
-ac_ct_F77=''
-acceptfilter='0'
-apr_builddir='/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr'
-apr_builders='/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build'
-apr_charset_ebcdic='0'
-apr_force_atomic_generic='1'
-apr_inaddr_none='INADDR_NONE'
-apr_srcdir='/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr'
-apr_tcp_nopush_flag='TCP_CORK'
-aprdso='1'
-arpa_ineth='1'
-bindir='${prefix}/bin'
-build='x86_64-unknown-linux-gnu'
-build_alias=''
-build_cpu='x86_64'
-build_os='linux-gnu'
-build_vendor='unknown'
-conioh='0'
-crypth='1'
-ctypeh='1'
-datadir='/bottlenecks/rubbos/app/apache2'
-datarootdir='${prefix}/share'
-direnth='1'
-docdir='${datarootdir}/doc/${PACKAGE}'
-dvidir='${docdir}'
-eolstr='\n'
-errnoh='1'
-exec_prefix='/bottlenecks/rubbos/app/apache2'
-export_lib_target='-rpath \$(libdir) \$\$objects'
-fcntlh='1'
-fcntlser='0'
-file_as_socket='1'
-flockser='0'
-fork='1'
-hasfcntlser='1'
-hasflockser='1'
-hasposixser='0'
-hasprocpthreadser='1'
-hasrwlockser='0'
-hassysvser='1'
-have_corkable_tcp='1'
-have_getrlimit='1'
-have_in_addr='1'
-have_inet_addr='1'
-have_inet_network='1'
-have_int64_strfn='1'
-have_ipv6='1'
-have_memchr='1'
-have_memmove='1'
-have_sctp='0'
-have_setrlimit='1'
-have_sigaction='1'
-have_sigsuspend='1'
-have_sigwait='1'
-have_strcasecmp='1'
-have_strdup='1'
-have_stricmp='0'
-have_strncasecmp='1'
-have_strnicmp='0'
-have_strstr='1'
-have_union_semun='0'
-havebeosarea='0'
-havemmapanon='1'
-havemmapshm='1'
-havemmaptmp='1'
-havemmapzero='1'
-haveos2shm='0'
-haveshmget='1'
-haveshmgetanon='1'
-host='x86_64-unknown-linux-gnu'
-host_alias=''
-host_cpu='x86_64'
-host_os='linux-gnu'
-host_vendor='unknown'
-htmldir='${docdir}'
-includedir='/bottlenecks/rubbos/app/apache2/include'
-infodir='${datarootdir}/info'
-ino_t_value='unsigned long'
-installbuilddir='${prefix}/build'
-int64_literal='#define APR_INT64_C(val) INT64_C(val)'
-int64_strfn='strtol'
-int64_t_fmt='#define APR_INT64_T_FMT "ld"'
-int64_t_fmt_len='#define APR_INT64_T_FMT_LEN 2'
-int64_value='long'
-int_value='int'
-ioh='0'
-lib_target='-rpath $(libdir) $$objects'
-libdir='${prefix}/lib'
-libexecdir='${exec_prefix}/modules'
-limitsh='1'
-link='$(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) -version-info 9:19:9 $(ALL_LDFLAGS) -o $@'
-localedir='${datarootdir}/locale'
-localstatedir='${prefix}'
-long_value='long'
-lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -c $< && touch $@'
-mandir='${prefix}/man'
-mmap='1'
-netdbh='1'
-netinet_inh='1'
-netinet_sctp_uioh='0'
-netinet_sctph='0'
-netinet_tcph='1'
-o_nonblock_inherited='0'
-oc='1'
-off_t_fmt='#define APR_OFF_T_FMT "ld"'
-off_t_value='off_t'
-oldincludedir='/usr/include'
-pdfdir='${docdir}'
-pid_t_fmt='#define APR_PID_T_FMT "d"'
-posixser='0'
-prefix='/bottlenecks/rubbos/app/apache2'
-proc_mutex_is_global='0'
-proclockglobal='0'
-procpthreadser='0'
-program_transform_name='s,x,x,'
-psdir='${docdir}'
-pthreadh='1'
-pthreadser='1'
-rand='1'
-sbindir='${exec_prefix}/bin'
-semaphoreh='1'
-sendfile='1'
-sharedmem='1'
-sharedstatedir='${prefix}/com'
-shlibpath_var='LD_LIBRARY_PATH'
-short_value='short'
-signalh='1'
-size_t_fmt='#define APR_SIZE_T_FMT "ld"'
-size_t_value='size_t'
-so_ext='lo'
-socklen_t_value='socklen_t'
-ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
-ssize_t_value='ssize_t'
-stdargh='1'
-stdint='1'
-stdioh='1'
-stdlibh='1'
-stringh='1'
-stringsh='1'
-struct_rlimit='1'
-sys_ioctlh='1'
-sys_sendfileh='1'
-sys_signalh='1'
-sys_socketh='1'
-sys_sockioh='0'
-sys_syslimitsh='0'
-sys_timeh='1'
-sys_typesh='1'
-sys_uioh='1'
-sys_unh='1'
-sys_waith='1'
-sysconfdir='${prefix}/conf'
-sysvser='1'
-target='x86_64-unknown-linux-gnu'
-target_alias=''
-target_cpu='x86_64'
-target_os='linux-gnu'
-target_vendor='unknown'
-tcp_nodelay_inherited='1'
-threads='1'
-timeh='1'
-top_builddir='/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr'
-uint64_t_fmt='#define APR_UINT64_T_FMT "lu"'
-uint64_t_fmt_len='#define APR_UINT64_T_FMT_LEN 2'
-uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "lx"'
-unistdh='1'
-usebeosarea='0'
-usemmapanon='1'
-usemmapshm='0'
-usemmaptmp='0'
-usemmapzero='0'
-useos2shm='0'
-useshmget='1'
-useshmgetanon='0'
-voidp_size='8'
-
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-
-#define PACKAGE_NAME ""
-#define PACKAGE_TARNAME ""
-#define PACKAGE_VERSION ""
-#define PACKAGE_STRING ""
-#define PACKAGE_BUGREPORT ""
-#define STDC_HEADERS 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_UNISTD_H 1
-#define __EXTENSIONS__ 1
-#define _ALL_SOURCE 1
-#define _GNU_SOURCE 1
-#define _POSIX_PTHREAD_SEMANTICS 1
-#define _TANDEM_SOURCE 1
-#define HAVE_DLFCN_H 1
-#define HAVE_LIBNSL 1
-#define HAVE_PTHREAD_H 1
-#define HAVE_PTHREAD_H 1
-#define USE_THREADS 1
-#define HAVE_PTHREAD_KEY_DELETE 1
-#define HAVE_PTHREAD_RWLOCK_INIT 1
-#define HAVE_PTHREAD_RWLOCKS 1
-#define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-#define HAVE_GETHOSTBYNAME_R 1
-#define HAVE_GETHOSTBYADDR_R 1
-#define HAVE_SIGSUSPEND 1
-#define HAVE_SIGWAIT 1
-#define HAVE_POLL 1
-#define HAVE_GETPWNAM_R 1
-#define HAVE_GETPWUID_R 1
-#define HAVE_GETGRNAM_R 1
-#define HAVE_GETGRGID_R 1
-#define HAVE_SYS_MMAN_H 1
-#define HAVE_SYS_IPC_H 1
-#define HAVE_SYS_SHM_H 1
-#define HAVE_SYS_FILE_H 1
-#define HAVE_MMAP 1
-#define HAVE_MUNMAP 1
-#define HAVE_SHM_OPEN 1
-#define HAVE_SHM_UNLINK 1
-#define HAVE_SHMGET 1
-#define HAVE_SHMAT 1
-#define HAVE_SHMDT 1
-#define HAVE_SHMCTL 1
-#define HAVE_MAP_ANON 1
-#define anonymous shared memory allocation method 1
-#define USE_SHMEM_MMAP_ANON 1
-#define namebased memory allocation method 1
-#define USE_SHMEM_SHMGET 1
-#define HAVE_CALLOC 1
-#define HAVE_STRCASECMP 1
-#define HAVE_SETSID 1
-#define HAVE_ISINF 1
-#define HAVE_ISNAN 1
-#define HAVE_GETENV 1
-#define HAVE_PUTENV 1
-#define HAVE_SETENV 1
-#define HAVE_UNSETENV 1
-#define HAVE_SETRLIMIT 1
-#define HAVE_GETRLIMIT 1
-#define HAVE_WRITEV 1
-#define HAVE_SENDFILE 1
-#define HAVE_UTIME 1
-#define HAVE_UTIMES 1
-#define HAVE_SIGACTION 1
-#define HAVE_DECL_SYS_SIGLIST 1
-#define HAVE_FORK 1
-#define HAVE_STRERROR_R 1
-#define HAVE_CRYPT_R 1
-#define CRYPT_R_STRUCT_CRYPT_DATA 1
-#define HAVE_MMAP 1
-#define HAVE_MEMMOVE 1
-#define HAVE_GETPASS 1
-#define HAVE_GMTIME_R 1
-#define HAVE_LOCALTIME_R 1
-#define HAVE_HSTRERROR 1
-#define HAVE_MKSTEMP 1
-#define DIRENT_INODE d_fileno
-#define DIRENT_TYPE d_type
-#define STDC_HEADERS 1
-#define HAVE_ALLOCA_H 1
-#define HAVE_CRYPT_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_DIRENT_H 1
-#define HAVE_DLFCN_H 1
-#define HAVE_ERRNO_H 1
-#define HAVE_FCNTL_H 1
-#define HAVE_GRP_H 1
-#define HAVE_LIMITS_H 1
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_NETDB_H 1
-#define HAVE_POLL_H 1
-#define HAVE_PWD_H 1
-#define HAVE_SEMAPHORE_H 1
-#define HAVE_SIGNAL_H 1
-#define HAVE_STDARG_H 1
-#define HAVE_STDDEF_H 1
-#define HAVE_STDIO_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_TERMIOS_H 1
-#define HAVE_TIME_H 1
-#define HAVE_UNISTD_H 1
-#define HAVE_ARPA_INET_H 1
-#define HAVE_NETINET_IN_H 1
-#define HAVE_SYS_FILE_H 1
-#define HAVE_SYS_IOCTL_H 1
-#define HAVE_SYS_MMAN_H 1
-#define HAVE_SYS_POLL_H 1
-#define HAVE_SYS_RESOURCE_H 1
-#define HAVE_SYS_SELECT_H 1
-#define HAVE_SYS_SEM_H 1
-#define HAVE_SYS_SENDFILE_H 1
-#define HAVE_SYS_SIGNAL_H 1
-#define HAVE_SYS_SOCKET_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_SYSCTL_H 1
-#define HAVE_SYS_TIME_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_UIO_H 1
-#define HAVE_SYS_UN_H 1
-#define HAVE_SYS_WAIT_H 1
-#define HAVE_NETINET_TCP_H 1
-#define SETPGRP_VOID 1
-#define HAVE_SOCKLEN_T 1
-#define SIZEOF_VOIDP 8
-#define SIZEOF_CHAR 1
-#define SIZEOF_INT 4
-#define SIZEOF_LONG 8
-#define SIZEOF_SHORT 2
-#define SIZEOF_LONG_DOUBLE 16
-#define SIZEOF_LONG_LONG 8
-#define SIZEOF_SSIZE_T 8
-#define SIZEOF_SIZE_T 8
-#define SIZEOF_OFF_T 8
-#define SIZEOF_PID_T 4
-#define HAVE_STRNCASECMP 1
-#define HAVE_STRCASECMP 1
-#define HAVE_STRDUP 1
-#define HAVE_STRSTR 1
-#define HAVE_MEMCHR 1
-#define HAVE_STRTOL 1
-#define HAVE_DLSYM 1
-#define DSO_USE_DLFCN 1
-#define HAVE_WAITPID 1
-#define HAVE_VLA 1
-#define HAVE_SEMGET 1
-#define HAVE_SEMCTL 1
-#define HAVE_FLOCK 1
-#define HAVE_SEMAPHORE_H 1
-#define HAVE_SEM_CLOSE 1
-#define HAVE_SEM_UNLINK 1
-#define HAVE_SEM_POST 1
-#define HAVE_SEM_WAIT 1
-#define HAVE_LOCK_EX 1
-#define HAVE_F_SETLK 1
-#define HAVE_SEM_UNDO 1
-#define HAVE_POLLIN 1
-#define HAVE_PTHREAD_PROCESS_SHARED 1
-#define HAVE_PTHREAD_MUTEXATTR_SETPSHARED 1
-#define HAVE_PTHREAD_MUTEX_ROBUST 1
-#define apr_lock implementation method 1
-#define USE_SYSVSEM_SERIALIZE 1
-#define DEV_RANDOM "/dev/random"
-#define HAVE_GMTOFF 1
-#define GETHOSTBYNAME_R_GLIBC2 1
-#define HAVE_TCP_CORK 1
-#define RESOLV_RETRANSRETRY 1
-#define HAVE_GAI_STRERROR 1
-#define HAVE_GETADDRINFO 1
-#define NEGATIVE_EAI 1
-#define HAVE_GETNAMEINFO 1
-#define HAVE_LANGINFO_H 1
-#define HAVE_NL_LANGINFO 1
-#define HAVE_FSTAT64 1
-
-configure: exit 0
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/config.nice b/rubbos/app/httpd-2.0.64/srclib/apr/config.nice
deleted file mode 100755
index 0f57ab55..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/config.nice
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh
-#
-# Created by configure
-
-"/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/configure" \
-"--disable-option-checking" \
-"--enable-module=so" \
-"--enable-so" \
-"--with-mpm=worker" \
-"--cache-file=/dev/null" \
-"--srcdir=/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr" \
-"--prefix=/bottlenecks/rubbos/app/apache2" \
-"--exec-prefix=/bottlenecks/rubbos/app/apache2" \
-"--libdir=/bottlenecks/rubbos/app/apache2/lib" \
-"--includedir=/bottlenecks/rubbos/app/apache2/include" \
-"--bindir=/bottlenecks/rubbos/app/apache2/bin" \
-"--datadir=/bottlenecks/rubbos/app/apache2" \
-"--with-installbuilddir=/bottlenecks/rubbos/app/apache2/build" \
-"$@"
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/config.status b/rubbos/app/httpd-2.0.64/srclib/apr/config.status
deleted file mode 100755
index e5a5a822..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/config.status
+++ /dev/null
@@ -1,1357 +0,0 @@
-#! /bin/bash
-# Generated by configure.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=${CONFIG_SHELL-/bin/bash}
-## --------------------- ##
-## 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
-
-
-
-
-# PATH needs CR
-# 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_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-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); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# Required to use basename.
-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
-
-
-# Name of the executable.
-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'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  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
-   { (exit 1); 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
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-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=:
-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 6>&1
-
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-# Files that config.status was made for.
-config_files=" Makefile strings/Makefile passwd/Makefile tables/Makefile build/Makefile  file_io/unix/Makefile  network_io/unix/Makefile  threadproc/unix/Makefile  misc/unix/Makefile  locks/unix/Makefile  time/unix/Makefile  mmap/unix/Makefile  shmem/unix/Makefile  user/unix/Makefile  memory/unix/Makefile  atomic/unix/Makefile  poll/unix/Makefile  support/unix/Makefile  dso/unix/Makefile  test/Makefile test/internal/Makefile include/apr.h build/apr_rules.mk build/pkg/pkginfo apr-config"
-config_headers=" include/arch/unix/apr_private.h"
-config_commands=" default"
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTION]... [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-
-ac_cs_version="\
-config.status
-configured by /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/configure, generated by GNU Autoconf 2.63,
-  with options \"'--disable-option-checking' '--enable-module=so' '--enable-so' '--with-mpm=worker' '--cache-file=/dev/null' '--srcdir=/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr' '--prefix=/bottlenecks/rubbos/app/apache2' '--exec-prefix=/bottlenecks/rubbos/app/apache2' '--libdir=\${prefix}/lib' '--includedir=/bottlenecks/rubbos/app/apache2/include' '--bindir=\${prefix}/bin' '--datadir=/bottlenecks/rubbos/app/apache2' '--with-installbuilddir=\${prefix}/build'\"
-
-Copyright (C) 2008 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr'
-srcdir='.'
-INSTALL='/usr/bin/install -c'
-AWK='gawk'
-test -n "$AWK" || AWK=awk
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    { $as_echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-if $ac_cs_recheck; then
-  set X '/bin/bash' '/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/configure'  '--disable-option-checking' '--enable-module=so' '--enable-so' '--with-mpm=worker' '--cache-file=/dev/null' '--srcdir=/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr' '--prefix=/bottlenecks/rubbos/app/apache2' '--exec-prefix=/bottlenecks/rubbos/app/apache2' '--libdir=${prefix}/lib' '--includedir=/bottlenecks/rubbos/app/apache2/include' '--bindir=${prefix}/bin' '--datadir=/bottlenecks/rubbos/app/apache2' '--with-installbuilddir=${prefix}/build' $ac_configure_extra_args --no-create --no-recursion
-  shift
-  $as_echo "running CONFIG_SHELL=/bin/bash $*" >&6
-  CONFIG_SHELL='/bin/bash'
-  export CONFIG_SHELL
-  exec "$@"
-fi
-
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "include/arch/unix/apr_private.h") CONFIG_HEADERS="$CONFIG_HEADERS include/arch/unix/apr_private.h" ;;
-    "$MAKEFILE1") CONFIG_FILES="$CONFIG_FILES $MAKEFILE1" ;;
-    "$MAKEFILE2") CONFIG_FILES="$CONFIG_FILES $MAKEFILE2" ;;
-    "$MAKEFILE3") CONFIG_FILES="$CONFIG_FILES $MAKEFILE3" ;;
-    "include/apr.h") CONFIG_FILES="$CONFIG_FILES include/apr.h" ;;
-    "build/apr_rules.mk") CONFIG_FILES="$CONFIG_FILES build/apr_rules.mk" ;;
-    "build/pkg/pkginfo") CONFIG_FILES="$CONFIG_FILES build/pkg/pkginfo" ;;
-    "apr-config") CONFIG_FILES="$CONFIG_FILES apr-config" ;;
-    "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} ||
-{
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr='
'
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
-cat >>"$tmp/subs1.awk" <<\_ACAWK &&
-S["LTLIBOBJS"]=""
-S["LIBOBJS"]=""
-S["INCLUDE_RULES"]="include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk"
-S["SUBDIRS"]="strings passwd tables  file_io/unix  network_io/unix  threadproc/unix  misc/unix  locks/unix  time/unix  mmap/unix  shmem/unix  user/unix  memory/un"\
-"ix  atomic/unix  poll/unix  support/unix  dso/unix "
-S["LIBTOOL_LIBS"]=""
-S["DEFAULT_OSDIR"]="unix"
-S["OSDIR"]="unix"
-S["LDLIBS"]=""
-S["NOTEST_INCLUDES"]=""
-S["NOTEST_LIBS"]=""
-S["NOTEST_LDFLAGS"]=""
-S["NOTEST_CFLAGS"]=""
-S["NOTEST_CPPFLAGS"]=""
-S["EXTRA_INCLUDES"]=""
-S["EXTRA_LIBS"]="-lrt -lm -lcrypt -lnsl  -lpthread -ldl"
-S["EXTRA_LDFLAGS"]=""
-S["EXTRA_CFLAGS"]="-g -O2 -pthread"
-S["EXTRA_CPPFLAGS"]="-D_REENTRANT -D_GNU_SOURCE"
-S["have_ipv6"]="1"
-S["have_sctp"]="0"
-S["acceptfilter"]="0"
-S["have_corkable_tcp"]="1"
-S["apr_tcp_nopush_flag"]="TCP_CORK"
-S["file_as_socket"]="1"
-S["have_in_addr"]="1"
-S["rand"]="1"
-S["proclockglobal"]="0"
-S["pthreadser"]="1"
-S["procpthreadser"]="0"
-S["fcntlser"]="0"
-S["posixser"]="0"
-S["sysvser"]="1"
-S["flockser"]="0"
-S["hasrwlockser"]="0"
-S["hasprocpthreadser"]="1"
-S["hasfcntlser"]="1"
-S["hasposixser"]="0"
-S["hassysvser"]="1"
-S["hasflockser"]="1"
-S["have_union_semun"]="0"
-S["struct_rlimit"]="1"
-S["oc"]="1"
-S["aprdso"]="1"
-S["int64_strfn"]="strtol"
-S["have_int64_strfn"]="1"
-S["have_memchr"]="1"
-S["have_strstr"]="1"
-S["have_strdup"]="1"
-S["have_strcasecmp"]="1"
-S["have_stricmp"]="0"
-S["have_strncasecmp"]="1"
-S["have_strnicmp"]="0"
-S["ino_t_value"]="unsigned long"
-S["stdint"]="1"
-S["int64_literal"]="#define APR_INT64_C(val) INT64_C(val)"
-S["pid_t_fmt"]="#define APR_PID_T_FMT \"d\""
-S["off_t_fmt"]="#define APR_OFF_T_FMT \"ld\""
-S["size_t_fmt"]="#define APR_SIZE_T_FMT \"ld\""
-S["ssize_t_fmt"]="#define APR_SSIZE_T_FMT \"ld\""
-S["uint64_t_hex_fmt"]="#define APR_UINT64_T_HEX_FMT \"lx\""
-S["uint64_t_fmt_len"]="#define APR_UINT64_T_FMT_LEN 2"
-S["uint64_t_fmt"]="#define APR_UINT64_T_FMT \"lu\""
-S["int64_t_fmt_len"]="#define APR_INT64_T_FMT_LEN 2"
-S["int64_t_fmt"]="#define APR_INT64_T_FMT \"ld\""
-S["socklen_t_value"]="socklen_t"
-S["ssize_t_value"]="ssize_t"
-S["size_t_value"]="size_t"
-S["off_t_value"]="off_t"
-S["int64_value"]="long"
-S["long_value"]="long"
-S["int_value"]="int"
-S["short_value"]="short"
-S["voidp_size"]="8"
-S["semaphoreh"]="1"
-S["pthreadh"]="1"
-S["sys_waith"]="1"
-S["signalh"]="1"
-S["unistdh"]="1"
-S["timeh"]="1"
-S["sys_unh"]="1"
-S["sys_uioh"]="1"
-S["sys_timeh"]="1"
-S["sys_typesh"]="1"
-S["sys_sockioh"]="0"
-S["sys_socketh"]="1"
-S["sys_signalh"]="1"
-S["sys_sendfileh"]="1"
-S["sys_ioctlh"]="1"
-S["stringsh"]="1"
-S["stringh"]="1"
-S["stdlibh"]="1"
-S["stdioh"]="1"
-S["stdargh"]="1"
-S["netinet_tcph"]="1"
-S["netinet_sctp_uioh"]="0"
-S["netinet_sctph"]="0"
-S["netinet_inh"]="1"
-S["sys_syslimitsh"]="0"
-S["netdbh"]="1"
-S["limitsh"]="1"
-S["ioh"]="0"
-S["fcntlh"]="1"
-S["direnth"]="1"
-S["errnoh"]="1"
-S["crypth"]="1"
-S["ctypeh"]="1"
-S["conioh"]="0"
-S["arpa_ineth"]="1"
-S["have_memmove"]="1"
-S["mmap"]="1"
-S["have_getrlimit"]="1"
-S["have_setrlimit"]="1"
-S["have_sigaction"]="1"
-S["have_inet_network"]="1"
-S["o_nonblock_inherited"]="0"
-S["tcp_nodelay_inherited"]="1"
-S["have_inet_addr"]="1"
-S["fork"]="1"
-S["apr_inaddr_none"]="INADDR_NONE"
-S["sendfile"]="1"
-S["sharedmem"]="1"
-S["haveos2shm"]="0"
-S["havebeosarea"]="0"
-S["haveshmget"]="1"
-S["havemmapshm"]="1"
-S["havemmaptmp"]="1"
-S["useos2shm"]="0"
-S["usebeosarea"]="0"
-S["useshmget"]="1"
-S["usemmapshm"]="0"
-S["usemmaptmp"]="0"
-S["havemmapanon"]="1"
-S["havemmapzero"]="1"
-S["haveshmgetanon"]="1"
-S["usemmapanon"]="1"
-S["usemmapzero"]="0"
-S["useshmgetanon"]="0"
-S["have_sigwait"]="1"
-S["have_sigsuspend"]="1"
-S["threads"]="1"
-S["INSTALL_SUBDIRS"]="none"
-S["eolstr"]="\\n"
-S["proc_mutex_is_global"]="0"
-S["apr_force_atomic_generic"]="1"
-S["MKDEP"]="$(CC) -MM"
-S["LT_LDFLAGS"]=""
-S["LTFLAGS"]="--silent"
-S["shlibpath_var"]="LD_LIBRARY_PATH"
-S["export_lib_target"]="-rpath \\$(libdir) \\$\\$objects"
-S["lib_target"]="-rpath $(libdir) $$objects"
-S["so_ext"]="lo"
-S["link"]="$(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) -version-info 9:19:9 $(ALL_LDFLAGS) -o $@"
-S["lt_compile"]="$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -c $< && touch $@"
-S["installbuilddir"]="${prefix}/build"
-S["LIBTOOL"]="$(SHELL) $(apr_builddir)/libtool"
-S["ac_ct_F77"]=""
-S["FFLAGS"]=""
-S["F77"]=""
-S["CXXCPP"]="g++ -E"
-S["ac_ct_CXX"]="g++"
-S["CXXFLAGS"]="-g -O2"
-S["CXX"]="g++"
-S["NMEDIT"]=""
-S["DSYMUTIL"]=""
-S["STRIP"]="strip"
-S["ECHO"]="echo"
-S["SED"]="/bin/sed"
-S["APR_LIBNAME"]="apr-${APR_MAJOR_VERSION}"
-S["apr_charset_ebcdic"]="0"
-S["EGREP"]="/bin/grep -E"
-S["GREP"]="/bin/grep"
-S["AR"]="ar"
-S["ASCPP"]="cpp"
-S["AS"]="as"
-S["RM"]="rm"
-S["INSTALL_DATA"]="${INSTALL} -m 644"
-S["INSTALL_SCRIPT"]="${INSTALL}"
-S["INSTALL_PROGRAM"]="${INSTALL}"
-S["RANLIB"]="ranlib"
-S["LN_S"]="ln -s"
-S["AWK"]="gawk"
-S["CPP"]="gcc -E"
-S["SET_MAKE"]=""
-S["OBJEXT"]="o"
-S["EXEEXT"]=""
-S["ac_ct_CC"]="gcc"
-S["CPPFLAGS"]=""
-S["LDFLAGS"]=""
-S["CFLAGS"]=""
-S["CC"]="gcc"
-S["APR_MAJOR_VERSION"]="0"
-S["APR_DOTTED_VERSION"]="0.9.19"
-S["apr_builders"]="/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build"
-S["top_builddir"]="/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr"
-S["APR_CONFIG_LOCATION"]="source"
-S["apr_builddir"]="/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr"
-S["apr_srcdir"]="/bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr"
-S["target_os"]="linux-gnu"
-S["target_vendor"]="unknown"
-S["target_cpu"]="x86_64"
-S["target"]="x86_64-unknown-linux-gnu"
-S["host_os"]="linux-gnu"
-S["host_vendor"]="unknown"
-S["host_cpu"]="x86_64"
-S["host"]="x86_64-unknown-linux-gnu"
-S["build_os"]="linux-gnu"
-S["build_vendor"]="unknown"
-S["build_cpu"]="x86_64"
-S["build"]="x86_64-unknown-linux-gnu"
-S["target_alias"]=""
-S["host_alias"]=""
-S["build_alias"]=""
-S["LIBS"]=""
-S["ECHO_T"]=""
-S["ECHO_N"]="-n"
-S["ECHO_C"]=""
-S["DEFS"]="-DHAVE_CONFIG_H"
-S["mandir"]="${prefix}/man"
-S["localedir"]="${datarootdir}/locale"
-S["libdir"]="${prefix}/lib"
-S["psdir"]="${docdir}"
-S["pdfdir"]="${docdir}"
-S["dvidir"]="${docdir}"
-S["htmldir"]="${docdir}"
-S["infodir"]="${datarootdir}/info"
-S["docdir"]="${datarootdir}/doc/${PACKAGE}"
-S["oldincludedir"]="/usr/include"
-S["includedir"]="/bottlenecks/rubbos/app/apache2/include"
-S["localstatedir"]="${prefix}"
-S["sharedstatedir"]="${prefix}/com"
-S["sysconfdir"]="${prefix}/conf"
-S["datadir"]="/bottlenecks/rubbos/app/apache2"
-S["datarootdir"]="${prefix}/share"
-S["libexecdir"]="${exec_prefix}/modules"
-S["sbindir"]="${exec_prefix}/bin"
-S["bindir"]="${prefix}/bin"
-S["program_transform_name"]="s,x,x,"
-S["prefix"]="/bottlenecks/rubbos/app/apache2"
-S["exec_prefix"]="/bottlenecks/rubbos/app/apache2"
-S["PACKAGE_BUGREPORT"]=""
-S["PACKAGE_STRING"]=""
-S["PACKAGE_VERSION"]=""
-S["PACKAGE_TARNAME"]=""
-S["PACKAGE_NAME"]=""
-S["PATH_SEPARATOR"]=":"
-S["SHELL"]="/bin/bash"
-_ACAWK
-cat >>"$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-   { (exit 1); exit 1; }; }
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-D["PACKAGE_NAME"]=" \"\""
-D["PACKAGE_TARNAME"]=" \"\""
-D["PACKAGE_VERSION"]=" \"\""
-D["PACKAGE_STRING"]=" \"\""
-D["PACKAGE_BUGREPORT"]=" \"\""
-D["STDC_HEADERS"]=" 1"
-D["HAVE_SYS_TYPES_H"]=" 1"
-D["HAVE_SYS_STAT_H"]=" 1"
-D["HAVE_STDLIB_H"]=" 1"
-D["HAVE_STRING_H"]=" 1"
-D["HAVE_MEMORY_H"]=" 1"
-D["HAVE_STRINGS_H"]=" 1"
-D["HAVE_INTTYPES_H"]=" 1"
-D["HAVE_STDINT_H"]=" 1"
-D["HAVE_UNISTD_H"]=" 1"
-D["__EXTENSIONS__"]=" 1"
-D["_ALL_SOURCE"]=" 1"
-D["_GNU_SOURCE"]=" 1"
-D["_POSIX_PTHREAD_SEMANTICS"]=" 1"
-D["_TANDEM_SOURCE"]=" 1"
-D["HAVE_DLFCN_H"]=" 1"
-D["HAVE_LIBNSL"]=" 1"
-D["HAVE_PTHREAD_H"]=" 1"
-D["HAVE_PTHREAD_H"]=" 1"
-D["USE_THREADS"]=" 1"
-D["HAVE_PTHREAD_KEY_DELETE"]=" 1"
-D["HAVE_PTHREAD_RWLOCK_INIT"]=" 1"
-D["HAVE_PTHREAD_RWLOCKS"]=" 1"
-D["HAVE_PTHREAD_MUTEX_RECURSIVE"]=" 1"
-D["HAVE_GETHOSTBYNAME_R"]=" 1"
-D["HAVE_GETHOSTBYADDR_R"]=" 1"
-D["HAVE_SIGSUSPEND"]=" 1"
-D["HAVE_SIGWAIT"]=" 1"
-D["HAVE_POLL"]=" 1"
-D["HAVE_GETPWNAM_R"]=" 1"
-D["HAVE_GETPWUID_R"]=" 1"
-D["HAVE_GETGRNAM_R"]=" 1"
-D["HAVE_GETGRGID_R"]=" 1"
-D["HAVE_SYS_MMAN_H"]=" 1"
-D["HAVE_SYS_IPC_H"]=" 1"
-D["HAVE_SYS_SHM_H"]=" 1"
-D["HAVE_SYS_FILE_H"]=" 1"
-D["HAVE_MMAP"]=" 1"
-D["HAVE_MUNMAP"]=" 1"
-D["HAVE_SHM_OPEN"]=" 1"
-D["HAVE_SHM_UNLINK"]=" 1"
-D["HAVE_SHMGET"]=" 1"
-D["HAVE_SHMAT"]=" 1"
-D["HAVE_SHMDT"]=" 1"
-D["HAVE_SHMCTL"]=" 1"
-D["HAVE_MAP_ANON"]=" 1"
-D["anonymous"]=" shared memory allocation method 1"
-D["USE_SHMEM_MMAP_ANON"]=" 1"
-D["namebased"]=" memory allocation method 1"
-D["USE_SHMEM_SHMGET"]=" 1"
-D["HAVE_CALLOC"]=" 1"
-D["HAVE_STRCASECMP"]=" 1"
-D["HAVE_SETSID"]=" 1"
-D["HAVE_ISINF"]=" 1"
-D["HAVE_ISNAN"]=" 1"
-D["HAVE_GETENV"]=" 1"
-D["HAVE_PUTENV"]=" 1"
-D["HAVE_SETENV"]=" 1"
-D["HAVE_UNSETENV"]=" 1"
-D["HAVE_SETRLIMIT"]=" 1"
-D["HAVE_GETRLIMIT"]=" 1"
-D["HAVE_WRITEV"]=" 1"
-D["HAVE_SENDFILE"]=" 1"
-D["HAVE_UTIME"]=" 1"
-D["HAVE_UTIMES"]=" 1"
-D["HAVE_SIGACTION"]=" 1"
-D["HAVE_DECL_SYS_SIGLIST"]=" 1"
-D["HAVE_FORK"]=" 1"
-D["HAVE_STRERROR_R"]=" 1"
-D["HAVE_CRYPT_R"]=" 1"
-D["CRYPT_R_STRUCT_CRYPT_DATA"]=" 1"
-D["HAVE_MMAP"]=" 1"
-D["HAVE_MEMMOVE"]=" 1"
-D["HAVE_GETPASS"]=" 1"
-D["HAVE_GMTIME_R"]=" 1"
-D["HAVE_LOCALTIME_R"]=" 1"
-D["HAVE_HSTRERROR"]=" 1"
-D["HAVE_MKSTEMP"]=" 1"
-D["DIRENT_INODE"]=" d_fileno"
-D["DIRENT_TYPE"]=" d_type"
-D["STDC_HEADERS"]=" 1"
-D["HAVE_ALLOCA_H"]=" 1"
-D["HAVE_CRYPT_H"]=" 1"
-D["HAVE_CTYPE_H"]=" 1"
-D["HAVE_DIRENT_H"]=" 1"
-D["HAVE_DLFCN_H"]=" 1"
-D["HAVE_ERRNO_H"]=" 1"
-D["HAVE_FCNTL_H"]=" 1"
-D["HAVE_GRP_H"]=" 1"
-D["HAVE_LIMITS_H"]=" 1"
-D["HAVE_MALLOC_H"]=" 1"
-D["HAVE_MEMORY_H"]=" 1"
-D["HAVE_NETDB_H"]=" 1"
-D["HAVE_POLL_H"]=" 1"
-D["HAVE_PWD_H"]=" 1"
-D["HAVE_SEMAPHORE_H"]=" 1"
-D["HAVE_SIGNAL_H"]=" 1"
-D["HAVE_STDARG_H"]=" 1"
-D["HAVE_STDDEF_H"]=" 1"
-D["HAVE_STDIO_H"]=" 1"
-D["HAVE_STDLIB_H"]=" 1"
-D["HAVE_STRING_H"]=" 1"
-D["HAVE_STRINGS_H"]=" 1"
-D["HAVE_TERMIOS_H"]=" 1"
-D["HAVE_TIME_H"]=" 1"
-D["HAVE_UNISTD_H"]=" 1"
-D["HAVE_ARPA_INET_H"]=" 1"
-D["HAVE_NETINET_IN_H"]=" 1"
-D["HAVE_SYS_FILE_H"]=" 1"
-D["HAVE_SYS_IOCTL_H"]=" 1"
-D["HAVE_SYS_MMAN_H"]=" 1"
-D["HAVE_SYS_POLL_H"]=" 1"
-D["HAVE_SYS_RESOURCE_H"]=" 1"
-D["HAVE_SYS_SELECT_H"]=" 1"
-D["HAVE_SYS_SEM_H"]=" 1"
-D["HAVE_SYS_SENDFILE_H"]=" 1"
-D["HAVE_SYS_SIGNAL_H"]=" 1"
-D["HAVE_SYS_SOCKET_H"]=" 1"
-D["HAVE_SYS_STAT_H"]=" 1"
-D["HAVE_SYS_SYSCTL_H"]=" 1"
-D["HAVE_SYS_TIME_H"]=" 1"
-D["HAVE_SYS_TYPES_H"]=" 1"
-D["HAVE_SYS_UIO_H"]=" 1"
-D["HAVE_SYS_UN_H"]=" 1"
-D["HAVE_SYS_WAIT_H"]=" 1"
-D["HAVE_NETINET_TCP_H"]=" 1"
-D["SETPGRP_VOID"]=" 1"
-D["HAVE_SOCKLEN_T"]=" 1"
-D["SIZEOF_VOIDP"]=" 8"
-D["SIZEOF_CHAR"]=" 1"
-D["SIZEOF_INT"]=" 4"
-D["SIZEOF_LONG"]=" 8"
-D["SIZEOF_SHORT"]=" 2"
-D["SIZEOF_LONG_DOUBLE"]=" 16"
-D["SIZEOF_LONG_LONG"]=" 8"
-D["SIZEOF_SSIZE_T"]=" 8"
-D["SIZEOF_SIZE_T"]=" 8"
-D["SIZEOF_OFF_T"]=" 8"
-D["SIZEOF_PID_T"]=" 4"
-D["HAVE_STRNCASECMP"]=" 1"
-D["HAVE_STRCASECMP"]=" 1"
-D["HAVE_STRDUP"]=" 1"
-D["HAVE_STRSTR"]=" 1"
-D["HAVE_MEMCHR"]=" 1"
-D["HAVE_STRTOL"]=" 1"
-D["HAVE_DLSYM"]=" 1"
-D["DSO_USE_DLFCN"]=" 1"
-D["HAVE_WAITPID"]=" 1"
-D["HAVE_VLA"]=" 1"
-D["HAVE_SEMGET"]=" 1"
-D["HAVE_SEMCTL"]=" 1"
-D["HAVE_FLOCK"]=" 1"
-D["HAVE_SEMAPHORE_H"]=" 1"
-D["HAVE_SEM_CLOSE"]=" 1"
-D["HAVE_SEM_UNLINK"]=" 1"
-D["HAVE_SEM_POST"]=" 1"
-D["HAVE_SEM_WAIT"]=" 1"
-D["HAVE_LOCK_EX"]=" 1"
-D["HAVE_F_SETLK"]=" 1"
-D["HAVE_SEM_UNDO"]=" 1"
-D["HAVE_POLLIN"]=" 1"
-D["HAVE_PTHREAD_PROCESS_SHARED"]=" 1"
-D["HAVE_PTHREAD_MUTEXATTR_SETPSHARED"]=" 1"
-D["HAVE_PTHREAD_MUTEX_ROBUST"]=" 1"
-D["apr_lock"]=" implementation method 1"
-D["USE_SYSVSEM_SERIALIZE"]=" 1"
-D["DEV_RANDOM"]=" \"/dev/random\""
-D["HAVE_GMTOFF"]=" 1"
-D["GETHOSTBYNAME_R_GLIBC2"]=" 1"
-D["HAVE_TCP_CORK"]=" 1"
-D["RESOLV_RETRANSRETRY"]=" 1"
-D["HAVE_GAI_STRERROR"]=" 1"
-D["HAVE_GETADDRINFO"]=" 1"
-D["NEGATIVE_EAI"]=" 1"
-D["HAVE_GETNAMEINFO"]=" 1"
-D["HAVE_LANGINFO_H"]=" 1"
-D["HAVE_NL_LANGINFO"]=" 1"
-D["HAVE_FSTAT64"]=" 1"
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+[_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ][_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]*([\t (]|$)/ {
-  line = $ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-   { (exit 1); exit 1; }; }
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    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_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-  ac_datarootdir_hack='
-  s&@datadir@&/bottlenecks/rubbos/app/apache2&g
-  s&@docdir@&${datarootdir}/doc/${PACKAGE}&g
-  s&@infodir@&${datarootdir}/info&g
-  s&@localedir@&${datarootdir}/locale&g
-  s&@mandir@&${prefix}/man&g
-    s&\${datarootdir}&${prefix}/share&g' ;;
-esac
-ac_sed_extra="/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}
-
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
- ;;
-
-  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "default":C)
-for i in $SAVE_FILES; do
-  if cmp -s $i $i.save 2>/dev/null; then
-    mv $i.save $i
-    echo "$i is unchanged"
-  fi
-  rm -f $i.save
-done
-chmod +x apr-config
- ;;
-
-  esac
-done # for ac_tag
-
-
-{ (exit 0); exit 0; }
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/configure b/rubbos/app/httpd-2.0.64/srclib/apr/configure
deleted file mode 100755
index 98751c30..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/configure
+++ /dev/null
@@ -1,44615 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be 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
-
-
-
-
-# PATH needs CR
-# 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_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-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); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# Required to use basename.
-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
-
-
-# Name of the executable.
-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'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-
-  if test $as_have_required = yes &&	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
-else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  case $as_dir in
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-	   done;;
-       esac
-done
-IFS=$as_save_IFS
-
-
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-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
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-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_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-	done
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell bug-autoconf@gnu.org about your system,
-  echo including any error possibly output before this message.
-  echo This can help us improve future autoconf versions.
-  echo Configuration will now proceed without shell functions.
-}
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  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
-   { (exit 1); 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
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-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=:
-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'"
-
-
-
-
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-echo=${ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "$0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
-
-tagnames=${tagnames+${tagnames},}CXX
-
-tagnames=${tagnames+${tagnames},}F77
-
-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=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="build/apr_common.m4"
-# 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
-INCLUDE_RULES
-SUBDIRS
-LIBTOOL_LIBS
-DEFAULT_OSDIR
-OSDIR
-LDLIBS
-NOTEST_INCLUDES
-NOTEST_LIBS
-NOTEST_LDFLAGS
-NOTEST_CFLAGS
-NOTEST_CPPFLAGS
-EXTRA_INCLUDES
-EXTRA_LIBS
-EXTRA_LDFLAGS
-EXTRA_CFLAGS
-EXTRA_CPPFLAGS
-have_ipv6
-have_sctp
-acceptfilter
-have_corkable_tcp
-apr_tcp_nopush_flag
-file_as_socket
-have_in_addr
-rand
-proclockglobal
-pthreadser
-procpthreadser
-fcntlser
-posixser
-sysvser
-flockser
-hasrwlockser
-hasprocpthreadser
-hasfcntlser
-hasposixser
-hassysvser
-hasflockser
-have_union_semun
-struct_rlimit
-oc
-aprdso
-int64_strfn
-have_int64_strfn
-have_memchr
-have_strstr
-have_strdup
-have_strcasecmp
-have_stricmp
-have_strncasecmp
-have_strnicmp
-ino_t_value
-stdint
-int64_literal
-pid_t_fmt
-off_t_fmt
-size_t_fmt
-ssize_t_fmt
-uint64_t_hex_fmt
-uint64_t_fmt_len
-uint64_t_fmt
-int64_t_fmt_len
-int64_t_fmt
-socklen_t_value
-ssize_t_value
-size_t_value
-off_t_value
-int64_value
-long_value
-int_value
-short_value
-voidp_size
-semaphoreh
-pthreadh
-sys_waith
-signalh
-unistdh
-timeh
-sys_unh
-sys_uioh
-sys_timeh
-sys_typesh
-sys_sockioh
-sys_socketh
-sys_signalh
-sys_sendfileh
-sys_ioctlh
-stringsh
-stringh
-stdlibh
-stdioh
-stdargh
-netinet_tcph
-netinet_sctp_uioh
-netinet_sctph
-netinet_inh
-sys_syslimitsh
-netdbh
-limitsh
-ioh
-fcntlh
-direnth
-errnoh
-crypth
-ctypeh
-conioh
-arpa_ineth
-have_memmove
-mmap
-have_getrlimit
-have_setrlimit
-have_sigaction
-have_inet_network
-o_nonblock_inherited
-tcp_nodelay_inherited
-have_inet_addr
-fork
-apr_inaddr_none
-sendfile
-sharedmem
-haveos2shm
-havebeosarea
-haveshmget
-havemmapshm
-havemmaptmp
-useos2shm
-usebeosarea
-useshmget
-usemmapshm
-usemmaptmp
-havemmapanon
-havemmapzero
-haveshmgetanon
-usemmapanon
-usemmapzero
-useshmgetanon
-have_sigwait
-have_sigsuspend
-threads
-INSTALL_SUBDIRS
-eolstr
-proc_mutex_is_global
-apr_force_atomic_generic
-MKDEP
-LT_LDFLAGS
-LTFLAGS
-shlibpath_var
-export_lib_target
-lib_target
-so_ext
-link
-lt_compile
-installbuilddir
-LIBTOOL
-ac_ct_F77
-FFLAGS
-F77
-CXXCPP
-ac_ct_CXX
-CXXFLAGS
-CXX
-NMEDIT
-DSYMUTIL
-STRIP
-ECHO
-SED
-APR_LIBNAME
-apr_charset_ebcdic
-EGREP
-GREP
-AR
-ASCPP
-AS
-RM
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-RANLIB
-LN_S
-AWK
-CPP
-SET_MAKE
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-APR_MAJOR_VERSION
-APR_DOTTED_VERSION
-apr_builders
-top_builddir
-APR_CONFIG_LOCATION
-apr_builddir
-apr_srcdir
-target_os
-target_vendor
-target_cpu
-target
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-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_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_layout
-enable_experimental_libtool
-enable_shared
-enable_static
-enable_fast_install
-with_gnu_ld
-enable_libtool_lock
-with_pic
-with_tags
-with_installbuilddir
-with_libtool
-enable_debug
-enable_maintainer_mode
-enable_profile
-enable_pool_debug
-with_efence
-enable_malloc_debug
-enable_nonportable_atomics
-enable_threads
-with_sendfile
-enable_dso
-enable_other_child
-with_egd
-with_devrandom
-enable_ipv6
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-CXX
-CXXFLAGS
-CCC
-CXXCPP
-F77
-FFLAGS'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-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_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
-    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_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
-    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_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
-    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_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
-    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_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $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_echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
-   { (exit 1); exit 1; }; } ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
-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_echo "$as_me: error: working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
-
-
-# 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_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
-	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
-  --experimental-libtool Use experimental custom libtool (not included in source distribution)
-  --enable-shared[=PKGS]  build shared libraries [default=yes]
-  --enable-static[=PKGS]  build static libraries [default=yes]
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-debug          Turn on debugging and compile time warnings
-  --enable-maintainer-mode  Turn on debugging and compile time warnings
-  --enable-profile        Turn on profiling for the build (GCC)
-  --enable-pool-debug[=yes|no|verbose|verbose-alloc|lifetime|owner|all]    Turn on pools debugging
-  --enable-malloc-debug   Switch on malloc_debug for BeOS
-  --enable-nonportable-atomics  Turn on optimized atomic code which may produce nonportable binaries
-  --enable-threads        Enable threading support in APR.
-  --disable-dso           Disable DSO support
-  --enable-other-child    Enable reliable child processes
-  --disable-ipv6          Disable IPv6 support in APR.
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-pic              try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-tags[=TAGS]      include additional configurations [automatic]
-  --with-installbuilddir=DIR location to store APR build files (defaults to '${datadir}/build')
-  --without-libtool       avoid using libtool to link the library
-  --with-efence[=DIR]     path to Electric Fence installation
-  --with-sendfile         Override decision to use sendfile
-  --with-egd[=DIR]        use EGD-compatible socket
-  --with-devrandom[=DEV]  use /dev/random or compatible [searches by default]
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  CXXCPP      C++ preprocessor
-  F77         Fortran 77 compiler command
-  FFLAGS      Fortran 77 compiler flags
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.63
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  $as_echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
-    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-ac_config_headers="$ac_config_headers include/arch/unix/apr_private.h"
-
-ac_aux_dir=
-for ac_dir in build "$srcdir"/build; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in build \"$srcdir\"/build" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in build \"$srcdir\"/build" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007,
-## 2008  Free Software Foundation, Inc.
-## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-##
-## This file is free software; the Free Software Foundation gives
-## unlimited permission to copy and/or distribute it, with or without
-## modifications, as long as this notice is preserved.
-
-# serial 52 AC_PROG_LIBTOOL
-
-
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-
-
-
-# AC_PROG_LIBTOOL
-# ---------------
-# AC_PROG_LIBTOOL
-
-
-# _AC_PROG_LIBTOOL
-# ----------------
-# _AC_PROG_LIBTOOL
-
-
-# AC_LIBTOOL_SETUP
-# ----------------
-# AC_LIBTOOL_SETUP
-
-
-# _LT_AC_SYS_COMPILER
-# -------------------
-# _LT_AC_SYS_COMPILER
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# --------------------------
-# Check for some things on darwin
-
-
-# _LT_AC_SYS_LIBPATH_AIX
-# ----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-# _LT_AC_SYS_LIBPATH_AIX
-
-
-# _LT_AC_SHELL_INIT(ARG)
-# ----------------------
-# _LT_AC_SHELL_INIT
-
-
-# _LT_AC_PROG_ECHO_BACKSLASH
-# --------------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-# _LT_AC_PROG_ECHO_BACKSLASH
-
-
-# _LT_AC_LOCK
-# -----------
-# _LT_AC_LOCK
-
-
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-# AC_LIBTOOL_COMPILER_OPTION
-
-
-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                          [ACTION-SUCCESS], [ACTION-FAILURE])
-# ------------------------------------------------------------
-# Check whether the given compiler option works
-# AC_LIBTOOL_LINKER_OPTION
-
-
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
-# --------------------------
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
-
-
-# _LT_AC_CHECK_DLFCN
-# ------------------
-# _LT_AC_CHECK_DLFCN
-
-
-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ---------------------------------------------------------------------
-# _LT_AC_TRY_DLOPEN_SELF
-
-
-# AC_LIBTOOL_DLOPEN_SELF
-# ----------------------
-# AC_LIBTOOL_DLOPEN_SELF
-
-
-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-# ---------------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler
-# AC_LIBTOOL_PROG_CC_C_O
-
-
-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-# -----------------------------------------
-# Check to see if we can do hard links to lock some files if needed
-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-
-
-# AC_LIBTOOL_OBJDIR
-# -----------------
-# AC_LIBTOOL_OBJDIR
-
-
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-# ----------------------------------------------
-# Check hardcoding attributes.
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-
-
-# AC_LIBTOOL_SYS_LIB_STRIP
-# ------------------------
-# AC_LIBTOOL_SYS_LIB_STRIP
-
-
-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
-
-# _LT_AC_TAGCONFIG
-# ----------------
-# _LT_AC_TAGCONFIG
-
-
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-# AC_LIBTOOL_DLOPEN
-
-
-# AC_LIBTOOL_WIN32_DLL
-# --------------------
-# declare package support for building win32 DLLs
-# AC_LIBTOOL_WIN32_DLL
-
-
-# AC_ENABLE_SHARED([DEFAULT])
-# ---------------------------
-# implement the --enable-shared flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-# AC_ENABLE_SHARED
-
-
-# AC_DISABLE_SHARED
-# -----------------
-# set the default shared flag to --disable-shared
-# AC_DISABLE_SHARED
-
-
-# AC_ENABLE_STATIC([DEFAULT])
-# ---------------------------
-# implement the --enable-static flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-# AC_ENABLE_STATIC
-
-
-# AC_DISABLE_STATIC
-# -----------------
-# set the default static flag to --disable-static
-# AC_DISABLE_STATIC
-
-
-# AC_ENABLE_FAST_INSTALL([DEFAULT])
-# ---------------------------------
-# implement the --enable-fast-install flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-# AC_ENABLE_FAST_INSTALL
-
-
-# AC_DISABLE_FAST_INSTALL
-# -----------------------
-# set the default to --disable-fast-install
-# AC_DISABLE_FAST_INSTALL
-
-
-# AC_LIBTOOL_PICMODE([MODE])
-# --------------------------
-# implement the --with-pic flag
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-# AC_LIBTOOL_PICMODE
-
-
-# AC_PROG_EGREP
-# -------------
-# This is predefined starting with Autoconf 2.54, so this conditional
-# definition can be removed once we require Autoconf 2.54 or later.
-
-
-
-# AC_PATH_TOOL_PREFIX
-# -------------------
-# find a file program which can recognize shared library
-# AC_PATH_TOOL_PREFIX
-
-
-# AC_PATH_MAGIC
-# -------------
-# find a file program which can recognize a shared library
-# AC_PATH_MAGIC
-
-
-# AC_PROG_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-# AC_PROG_LD
-
-
-# AC_PROG_LD_GNU
-# --------------
-# AC_PROG_LD_GNU
-
-
-# AC_PROG_LD_RELOAD_FLAG
-# ----------------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-# AC_PROG_LD_RELOAD_FLAG
-
-
-# AC_DEPLIBS_CHECK_METHOD
-# -----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-# AC_DEPLIBS_CHECK_METHOD
-
-
-# AC_PROG_NM
-# ----------
-# find the pathname to a BSD-compatible name lister
-# AC_PROG_NM
-
-
-# AC_CHECK_LIBM
-# -------------
-# check for math library
-# AC_CHECK_LIBM
-
-
-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl convenience library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
-# (note the single quotes!).  If your package is not flat and you're not
-# using automake, define top_builddir and top_srcdir appropriately in
-# the Makefiles.
-# AC_LIBLTDL_CONVENIENCE
-
-
-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl installable library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# and an installed libltdl is not found, it is assumed to be `libltdl'.
-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and top_srcdir
-# appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-# AC_LIBLTDL_INSTALLABLE
-
-
-# AC_LIBTOOL_CXX
-# --------------
-# enable support for C++ libraries
-# AC_LIBTOOL_CXX
-
-
-# _LT_AC_LANG_CXX
-# ---------------
-# _LT_AC_LANG_CXX
-
-# _LT_AC_PROG_CXXCPP
-# ------------------
-# _LT_AC_PROG_CXXCPP
-
-# AC_LIBTOOL_F77
-# --------------
-# enable support for Fortran 77 libraries
-# AC_LIBTOOL_F77
-
-
-# _LT_AC_LANG_F77
-# ---------------
-# _LT_AC_LANG_F77
-
-
-# AC_LIBTOOL_GCJ
-# --------------
-# enable support for GCJ libraries
-# AC_LIBTOOL_GCJ
-
-
-# _LT_AC_LANG_GCJ
-# ---------------
-# _LT_AC_LANG_GCJ
-
-
-# AC_LIBTOOL_RC
-# -------------
-# enable support for Windows resource files
-# AC_LIBTOOL_RC
-
-
-# AC_LIBTOOL_LANG_C_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-
-# AC_LIBTOOL_LANG_C_CONFIG
-
-
-# AC_LIBTOOL_LANG_CXX_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-
-# AC_LIBTOOL_LANG_CXX_CONFIG
-
-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-# AC_LIBTOOL_POSTDEP_PREDEP
-
-# AC_LIBTOOL_LANG_F77_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-
-# AC_LIBTOOL_LANG_F77_CONFIG
-
-
-# AC_LIBTOOL_LANG_GCJ_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-
-# AC_LIBTOOL_LANG_GCJ_CONFIG
-
-
-# AC_LIBTOOL_LANG_RC_CONFIG
-# -------------------------
-# Ensure that the configuration vars for the Windows resource compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-
-# AC_LIBTOOL_LANG_RC_CONFIG
-
-
-# AC_LIBTOOL_CONFIG([TAGNAME])
-# ----------------------------
-# If TAGNAME is not passed, then create an initial libtool script
-# with a default configuration from the untagged config vars.  Otherwise
-# add code to config.status for appending the configuration named by
-# TAGNAME from the matching tagged config vars.
-# AC_LIBTOOL_CONFIG
-
-
-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------------------
-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
-
-
-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-# ---------------------------------
- # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-
-
-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-# ---------------------------------------
-
-
-
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
-# See if the linker supports building shared libraries.
-# AC_LIBTOOL_PROG_LD_SHLIBS
-
-
-# _LT_AC_FILE_LTDLL_C
-# -------------------
-# Be careful that the start marker always follows a newline.
-# _LT_AC_FILE_LTDLL_C
-
-
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-# ---------------------------------
-
-
-
-# old names
-
-
-
-
-
-
-
-
-# This is just to silence aclocal about the macro not being used
-
-
-
-
-
-
-
-# Cheap backport of AS_EXECUTABLE_P and required macros
-# from Autoconf 2.59; we should not use $as_executable_p directly.
-
-# _AS_TEST_PREPARE
-# ----------------
-# _AS_TEST_PREPARE
-
-# AS_EXECUTABLE_P
-# ---------------
-# Check whether a file is executable.
-# AS_EXECUTABLE_P
-
-############################################################
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-############################################################
-# LT_AC_PROG_SED
-# --------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-
-
-
-
-  apr_ste_save_CPPFLAGS="$CPPFLAGS"
-
-
-  apr_ste_save_CFLAGS="$CFLAGS"
-
-
-  apr_ste_save_LDFLAGS="$LDFLAGS"
-
-
-  apr_ste_save_LIBS="$LIBS"
-
-
-  apr_ste_save_INCLUDES="$INCLUDES"
-
-
-
-  rm -f config.nice
-  cat >config.nice<<EOF
-#! /bin/sh
-#
-# Created by configure
-
-EOF
-  if test -n "$CC"; then
-    echo "CC=\"$CC\"; export CC" >> config.nice
-  fi
-  if test -n "$CFLAGS"; then
-    echo "CFLAGS=\"$CFLAGS\"; export CFLAGS" >> config.nice
-  fi
-  if test -n "$CPPFLAGS"; then
-    echo "CPPFLAGS=\"$CPPFLAGS\"; export CPPFLAGS" >> config.nice
-  fi
-  if test -n "$LDFLAGS"; then
-    echo "LDFLAGS=\"$LDFLAGS\"; export LDFLAGS" >> config.nice
-  fi
-  if test -n "$LIBS"; then
-    echo "LIBS=\"$LIBS\"; export LIBS" >> config.nice
-  fi
-  if test -n "$INCLUDES"; then
-    echo "INCLUDES=\"$INCLUDES\"; export INCLUDES" >> config.nice
-  fi
-  if test -n "$NOTEST_CFLAGS"; then
-    echo "NOTEST_CFLAGS=\"$NOTEST_CFLAGS\"; export NOTEST_CFLAGS" >> config.nice
-  fi
-  if test -n "$NOTEST_CPPFLAGS"; then
-    echo "NOTEST_CPPFLAGS=\"$NOTEST_CPPFLAGS\"; export NOTEST_CPPFLAGS" >> config.nice
-  fi
-  if test -n "$NOTEST_LDFLAGS"; then
-    echo "NOTEST_LDFLAGS=\"$NOTEST_LDFLAGS\"; export NOTEST_LDFLAGS" >> config.nice
-  fi
-  if test -n "$NOTEST_LIBS"; then
-    echo "NOTEST_LIBS=\"$NOTEST_LIBS\"; export NOTEST_LIBS" >> config.nice
-  fi
-
-  # Retrieve command-line arguments.
-  eval "set x $0 $ac_configure_args"
-  shift
-
-  for arg
-  do
-
-ap_last=
-ap_cur="$arg"
-while test "x${ap_cur}" != "x${ap_last}";
-do
-  ap_last="${ap_cur}"
-  ap_cur=`eval "echo ${ap_cur}"`
-done
-arg="${ap_cur}"
-
-    echo "\"$arg\" \\" >> config.nice
-  done
-  echo '"$@"' >> config.nice
-  chmod +x config.nice
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:$LINENO: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
-if test "${ac_cv_target+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$target_alias" = x; then
-  ac_cv_target=$ac_cv_host
-else
-  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-$as_echo "$as_me: error: invalid value of canonical target" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-target=$ac_cv_target
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-echo "Configuring APR library"
-echo "Platform: $host"
-
-
-
-# Absolute source/build directory
-apr_srcdir=`(cd $srcdir && pwd)`
-apr_builddir=`pwd`
-
-
-
-if test "$apr_builddir" != "$apr_srcdir"; then
-  USE_VPATH=1
-  APR_CONFIG_LOCATION=build
-else
-  APR_CONFIG_LOCATION=source
-fi
-
-
-
-# Libtool might need this symbol -- it must point to the location of
-# the generated libtool script (not necessarily the "top" build dir).
-#
-top_builddir="$apr_builddir"
-
-
-# Directory containing apr build macros, helpers, and make rules
-# NOTE: make rules (apr_rules.mk) will be in the builddir for vpath
-#
-apr_buildout=$apr_builddir/build
-apr_builders=$apr_srcdir/build
-
-
-MKDIR=$apr_builders/mkdir.sh
-
-
-  { $as_echo "$as_me:$LINENO: checking for working mkdir -p" >&5
-$as_echo_n "checking for working mkdir -p... " >&6; }
-if test "${ac_cv_mkdir_p+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-    test -d conftestdir && rm -rf conftestdir
-    mkdir -p conftestdir/somedir >/dev/null 2>&1
-    if test -d conftestdir/somedir; then
-      ac_cv_mkdir_p=yes
-    else
-      ac_cv_mkdir_p=no
-    fi
-    rm -rf conftestdir
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_mkdir_p" >&5
-$as_echo "$ac_cv_mkdir_p" >&6; }
-  if test "$ac_cv_mkdir_p" = "yes"; then
-      mkdir_p="mkdir -p"
-  else
-      mkdir_p="$apr_builders/mkdir.sh"
-  fi
-
-
-# get our version information
-get_version="$apr_builders/get-version.sh"
-version_hdr="$apr_srcdir/include/apr_version.h"
-APR_MAJOR_VERSION="`$get_version major $version_hdr APR`"
-APR_DOTTED_VERSION="`$get_version all $version_hdr APR`"
-
-
-
-
-echo "APR Version: ${APR_DOTTED_VERSION}"
-
-
-# Check whether --enable-layout was given.
-if test "${enable_layout+set}" = set; then
-  enableval=$enable_layout;
-  LAYOUT=$enableval
-
-fi
-
-
-if test -z "$LAYOUT"; then
-  LAYOUT="apr"
-fi
-
-  if test ! -f $srcdir/config.layout; then
-    echo "** Error: Layout file $srcdir/config.layout not found"
-    echo "** Error: Cannot use undefined layout '$LAYOUT'"
-    exit 1
-  fi
-  pldconf=./config.pld
-
-  sed -e "1s/[ 	]*<[lL]ayout[ 	]*$LAYOUT[ 	]*>[ 	]*//;1t" \
-      -e "1,/[ 	]*<[lL]ayout[ 	]*$LAYOUT[ 	]*>[ 	]*/d" \
-      -e '/[ 	]*<\/Layout>[ 	]*/,$d' \
-      -e "s/^[ 	]*//g" \
-      -e "s/:[ 	]*/=\'/g" \
-      -e "s/[ 	]*$/'/g" \
-      $srcdir/config.layout > $pldconf
-  layout_name=$LAYOUT
-  if test ! -s $pldconf; then
-    echo "** Error: unable to find layout $layout_name"
-    exit 1
-  fi
-  . $pldconf
-  rm $pldconf
-  for var in prefix exec_prefix bindir sbindir libexecdir mandir \
-             sysconfdir datadir includedir localstatedir runtimedir \
-             logfiledir libdir installbuilddir libsuffix ; do
-    eval "val=\"\$$var\""
-    case $val in
-      *+)
-        val=`echo $val | sed -e 's;\+$;;'`
-        eval "$var=\"\$val\""
-        autosuffix=yes
-        ;;
-      *)
-        autosuffix=no
-        ;;
-    esac
-    val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
-    val=`echo $val | sed -e 's:[\$]\([a-z_]*\):$\1:g'`
-    if test "$autosuffix" = "yes"; then
-      if echo $val | grep apache >/dev/null; then
-        addtarget=no
-      else
-        addtarget=yes
-      fi
-      if test "$addtarget" = "yes"; then
-        val="$val/apache2"
-      fi
-    fi
-    eval "$var='$val'"
-  done
-
-
-
-{ $as_echo "$as_me:$LINENO: checking for chosen layout" >&5
-$as_echo_n "checking for chosen layout... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $layout_name" >&5
-$as_echo "$layout_name" >&6; }
-
-
-ac_prev=
-# Retrieve the command-line arguments.  The eval is needed because
-# the arguments are quoted to preserve accuracy.
-eval "set x $ac_configure_args"
-shift
-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
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  case $ac_option in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$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" ;;
-
-  -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" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -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" ;;
-
-  -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" ;;
-
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { { $as_echo "$as_me:$LINENO: error: expected an absolute path for --$ac_var: $ac_val" >&5
-$as_echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-
-
-
-case "$host" in
-  *-apple-aux3*)
-
-  if test -z "$CC"; then
-    echo "  setting CC to \"gcc\""
-    CC="gcc"
-  fi
-
-      ;;
-  bs2000*-siemens-sysv*)
-
-  if test -z "$CC"; then
-    echo "  setting CC to \"c89 -XLLML -XLLMK -XL -Kno_integer_overflow\""
-    CC="c89 -XLLML -XLLMK -XL -Kno_integer_overflow"
-  fi
-
-      ;;
-  *convex-v11*)
-
-  if test -z "$CC"; then
-    echo "  setting CC to \"cc\""
-    CC="cc"
-  fi
-
-      ;;
-  *-ibm-os390)
-
-  if test -z "$CC"; then
-    echo "  setting CC to \"cc\""
-    CC="cc"
-  fi
-
-      ;;
-  *-ibm-as400)
-
-  if test -z "$CC"; then
-    echo "  setting CC to \"icc\""
-    CC="icc"
-  fi
-
-      ;;
-  *-isc4*)
-
-  if test -z "$CC"; then
-    echo "  setting CC to \"gcc\""
-    CC="gcc"
-  fi
-
-      ;;
-  m88k-*-CX/SX|CYBER)
-
-  if test -z "$CC"; then
-    echo "  setting CC to \"cc\""
-    CC="cc"
-  fi
-
-      ;;
-  *-next-openstep*)
-
-  if test -z "$CC"; then
-    echo "  setting CC to \"cc\""
-    CC="cc"
-  fi
-
-      ;;
-  *-qnx32)
-
-  if test -z "$CC"; then
-    echo "  setting CC to \"cc -F\""
-    CC="cc -F"
-  fi
-
-      ;;
-  *-tandem-oss)
-
-  if test -z "$CC"; then
-    echo "  setting CC to \"c89\""
-    CC="c89"
-  fi
-
-      ;;
-  TPF)
-
-  if test -z "$CC"; then
-    echo "  setting CC to \"c89\""
-    CC="c89"
-  fi
-
-      ;;
-esac
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_c89=$ac_arg
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-if test "x$apr_preload_done" != "xyes" ; then
-
-  apr_preload_done="yes"
-
-  echo "Applying APR hints file rules for $host"
-
-  case "$host" in
-    *mint)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DMINT\""
-    CPPFLAGS="-DMINT"
-  else
-    apr_addto_bugger="-DMINT"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lportlib\""
-    LIBS="-lportlib"
-  else
-    apr_addto_bugger="-lportlib"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    *MPE/iX*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE\""
-    CPPFLAGS="-DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE"
-  else
-    apr_addto_bugger="-DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lsvipc -lcurses\""
-    LIBS="-lsvipc -lcurses"
-  else
-    apr_addto_bugger="-lsvipc -lcurses"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LDFLAGS" = "x"; then
-    echo "  setting LDFLAGS to \"-Xlinker \"-WL,cap=ia,ba,ph;nmstack=1024000\"\""
-    LDFLAGS="-Xlinker \"-WL,cap=ia,ba,ph;nmstack=1024000\""
-  else
-    apr_addto_bugger="-Xlinker \"-WL,cap=ia,ba,ph;nmstack=1024000\""
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LDFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LDFLAGS"
-        LDFLAGS="$LDFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-apple-aux3*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DAUX3 -D_POSIX_SOURCE\""
-    CPPFLAGS="-DAUX3 -D_POSIX_SOURCE"
-  else
-    apr_addto_bugger="-DAUX3 -D_POSIX_SOURCE"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lposix -lbsd\""
-    LIBS="-lposix -lbsd"
-  else
-    apr_addto_bugger="-lposix -lbsd"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LDFLAGS" = "x"; then
-    echo "  setting LDFLAGS to \"-s\""
-    LDFLAGS="-s"
-  else
-    apr_addto_bugger="-s"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LDFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LDFLAGS"
-        LDFLAGS="$LDFLAGS $i"
-      fi
-    done
-  fi
-
-
-  echo "  forcing SHELL to \"/bin/ksh\""
-  SHELL="/bin/ksh"
-
-	;;
-    *-ibm-aix*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-U__STR__ -D_THREAD_SAFE\""
-    CPPFLAGS="-U__STR__ -D_THREAD_SAFE"
-  else
-    apr_addto_bugger="-U__STR__ -D_THREAD_SAFE"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-                case $host in
-            *-ibm-aix4.3)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-D_USE_IRS\""
-    CPPFLAGS="-D_USE_IRS"
-  else
-    apr_addto_bugger="-D_USE_IRS"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	        ;;
-            *-ibm-aix5*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-D_USE_IRS\""
-    CPPFLAGS="-D_USE_IRS"
-  else
-    apr_addto_bugger="-D_USE_IRS"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	        ;;
-            *-ibm-aix4.3.*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-D_USE_IRS\""
-    CPPFLAGS="-D_USE_IRS"
-  else
-    apr_addto_bugger="-D_USE_IRS"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-                ;;
-        esac
-                if $CC 2>&1 | grep 'xlc' > /dev/null; then
-
-  if test -z "$AIX_XLC"; then
-    echo "  setting AIX_XLC to \"yes\""
-    AIX_XLC="yes"
-  fi
-
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-qHALT=E\""
-    CFLAGS="-qHALT=E"
-  else
-    apr_addto_bugger="-qHALT=E"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-        fi
-
-  if test -z "$apr_sysvsem_is_global"; then
-    echo "  setting apr_sysvsem_is_global to \"yes\""
-    apr_sysvsem_is_global="yes"
-  fi
-
-
-  if test -z "$apr_lock_method"; then
-    echo "  setting apr_lock_method to \"USE_SYSVSEM_SERIALIZE\""
-    apr_lock_method="USE_SYSVSEM_SERIALIZE"
-  fi
-
-        case $host in
-            *-ibm-aix3* | *-ibm-aix4.1.*)
-                ;;
-            *)
-
-  if test "x$LDFLAGS" = "x"; then
-    echo "  setting LDFLAGS to \"-Wl,-brtl\""
-    LDFLAGS="-Wl,-brtl"
-  else
-    apr_addto_bugger="-Wl,-brtl"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LDFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LDFLAGS"
-        LDFLAGS="$LDFLAGS $i"
-      fi
-    done
-  fi
-
-                ;;
-	esac
-        ;;
-    *-apollo-*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DAPOLLO\""
-    CPPFLAGS="-DAPOLLO"
-  else
-    apr_addto_bugger="-DAPOLLO"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-dg-dgux*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DDGUX\""
-    CPPFLAGS="-DDGUX"
-  else
-    apr_addto_bugger="-DDGUX"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *os2_emx*)
-
-  echo "  forcing SHELL to \"sh\""
-  SHELL="sh"
-
-
-  if test -z "$apr_gethostbyname_is_thread_safe"; then
-    echo "  setting apr_gethostbyname_is_thread_safe to \"yes\""
-    apr_gethostbyname_is_thread_safe="yes"
-  fi
-
-
-  if test -z "$apr_gethostbyaddr_is_thread_safe"; then
-    echo "  setting apr_gethostbyaddr_is_thread_safe to \"yes\""
-    apr_gethostbyaddr_is_thread_safe="yes"
-  fi
-
-	;;
-    *-hi-hiux)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DHIUX\""
-    CPPFLAGS="-DHIUX"
-  else
-    apr_addto_bugger="-DHIUX"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-hp-hpux11.*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DHPUX11 -D_REENTRANT -D_XOPEN_SOURCE_EXTENDED\""
-    CPPFLAGS="-DHPUX11 -D_REENTRANT -D_XOPEN_SOURCE_EXTENDED"
-  else
-    apr_addto_bugger="-DHPUX11 -D_REENTRANT -D_XOPEN_SOURCE_EXTENDED"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-hp-hpux10.*)
- 	case $host in
- 	  *-hp-hpux10.01)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSELECT_NEEDS_CAST\""
-    CPPFLAGS="-DSELECT_NEEDS_CAST"
-  else
-    apr_addto_bugger="-DSELECT_NEEDS_CAST"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	       ;;
- 	esac
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-D_REENTRANT\""
-    CPPFLAGS="-D_REENTRANT"
-  else
-    apr_addto_bugger="-D_REENTRANT"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-hp-hpux*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DHPUX -D_REENTRANT\""
-    CPPFLAGS="-DHPUX -D_REENTRANT"
-  else
-    apr_addto_bugger="-DHPUX -D_REENTRANT"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-linux*)
-        case `uname -r` in
-	    2.* )
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DLINUX=2\""
-    CPPFLAGS="-DLINUX=2"
-  else
-    apr_addto_bugger="-DLINUX=2"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	           ;;
-	    1.* )
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DLINUX=1\""
-    CPPFLAGS="-DLINUX=1"
-  else
-    apr_addto_bugger="-DLINUX=1"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	           ;;
-	    * )
-	           ;;
-        esac
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-D_REENTRANT -D_GNU_SOURCE\""
-    CPPFLAGS="-D_REENTRANT -D_GNU_SOURCE"
-  else
-    apr_addto_bugger="-D_REENTRANT -D_GNU_SOURCE"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-GNU*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DHURD -D_GNU_SOURCE\""
-    CPPFLAGS="-DHURD -D_GNU_SOURCE"
-  else
-    apr_addto_bugger="-DHURD -D_GNU_SOURCE"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-lynx-lynxos)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-D__NO_INCLUDE_WARN__ -DLYNXOS\""
-    CPPFLAGS="-D__NO_INCLUDE_WARN__ -DLYNXOS"
-  else
-    apr_addto_bugger="-D__NO_INCLUDE_WARN__ -DLYNXOS"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lbsd\""
-    LIBS="-lbsd"
-  else
-    apr_addto_bugger="-lbsd"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    *486-*-bsdi*)
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-m486\""
-    CFLAGS="-m486"
-  else
-    apr_addto_bugger="-m486"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-*-bsdi*)
-        case $host in
-            *bsdi4.1)
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-D_REENTRANT\""
-    CFLAGS="-D_REENTRANT"
-  else
-    apr_addto_bugger="-D_REENTRANT"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-                ;;
-        esac
-        ;;
-    *-openbsd*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-D_POSIX_THREADS\""
-    CPPFLAGS="-D_POSIX_THREADS"
-  else
-    apr_addto_bugger="-D_POSIX_THREADS"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-        # getsockname() reports the wrong address on a socket
-        # bound to an ephmeral port so the test fails.
-
-  if test -z "$ac_cv_o_nonblock_inherited"; then
-    echo "  setting ac_cv_o_nonblock_inherited to \"yes\""
-    ac_cv_o_nonblock_inherited="yes"
-  fi
-
-	;;
-    *-netbsd*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DNETBSD\""
-    CPPFLAGS="-DNETBSD"
-  else
-    apr_addto_bugger="-DNETBSD"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-        # fcntl() lies about O_NONBLOCK on an accept()ed socket (PR kern/26950)
-
-  if test -z "$ac_cv_o_nonblock_inherited"; then
-    echo "  setting ac_cv_o_nonblock_inherited to \"yes\""
-    ac_cv_o_nonblock_inherited="yes"
-  fi
-
-	;;
-    *-freebsd*)
-	case $host in
-	    *freebsd2345*)
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-funsigned-char\""
-    CFLAGS="-funsigned-char"
-  else
-    apr_addto_bugger="-funsigned-char"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-		;;
-	esac
-
-  if test -z "$enable_threads"; then
-    echo "  setting enable_threads to \"no\""
-    enable_threads="no"
-  fi
-
-
-  if test -z "$apr_lock_method"; then
-    echo "  setting apr_lock_method to \"USE_FLOCK_SERIALIZE\""
-    apr_lock_method="USE_FLOCK_SERIALIZE"
-  fi
-
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-D_REENTRANT -D_THREAD_SAFE\""
-    CPPFLAGS="-D_REENTRANT -D_THREAD_SAFE"
-  else
-    apr_addto_bugger="-D_REENTRANT -D_THREAD_SAFE"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-next-nextstep*)
-
-  if test -z "$CFLAGS"; then
-    echo "  setting CFLAGS to \"-O\""
-    CFLAGS="-O"
-  fi
-
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DNEXT\""
-    CPPFLAGS="-DNEXT"
-  else
-    apr_addto_bugger="-DNEXT"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-next-openstep*)
-
-  if test -z "$CFLAGS"; then
-    echo "  setting CFLAGS to \"-O\""
-    CFLAGS="-O"
-  fi
-
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DNEXT\""
-    CPPFLAGS="-DNEXT"
-  else
-    apr_addto_bugger="-DNEXT"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-apple-rhapsody*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DRHAPSODY\""
-    CPPFLAGS="-DRHAPSODY"
-  else
-    apr_addto_bugger="-DRHAPSODY"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-apple-darwin*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp\""
-    CPPFLAGS="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp"
-  else
-    apr_addto_bugger="-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test -z "$apr_posixsem_is_global"; then
-    echo "  setting apr_posixsem_is_global to \"yes\""
-    apr_posixsem_is_global="yes"
-  fi
-
-
-  if test -z "$ac_cv_func_poll"; then
-    echo "  setting ac_cv_func_poll to \"no\""
-    ac_cv_func_poll="no"
-  fi
- # See issue 34332
-	;;
-    *-dec-osf*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DOSF1\""
-    CPPFLAGS="-DOSF1"
-  else
-    apr_addto_bugger="-DOSF1"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-        # process-shared mutexes don't seem to work in Tru64 5.0
-
-  if test -z "$apr_cv_process_shared_works"; then
-    echo "  setting apr_cv_process_shared_works to \"no\""
-    apr_cv_process_shared_works="no"
-  fi
-
-	;;
-    *-nto-qnx*)
-	;;
-    *-qnx)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DQNX\""
-    CPPFLAGS="-DQNX"
-  else
-    apr_addto_bugger="-DQNX"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-N128k -lunix\""
-    LIBS="-N128k -lunix"
-  else
-    apr_addto_bugger="-N128k -lunix"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-qnx32)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DQNX\""
-    CPPFLAGS="-DQNX"
-  else
-    apr_addto_bugger="-DQNX"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-mf -3\""
-    CFLAGS="-mf -3"
-  else
-    apr_addto_bugger="-mf -3"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-N128k -lunix\""
-    LIBS="-N128k -lunix"
-  else
-    apr_addto_bugger="-N128k -lunix"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-isc4*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-posix -DISC\""
-    CPPFLAGS="-posix -DISC"
-  else
-    apr_addto_bugger="-posix -DISC"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LDFLAGS" = "x"; then
-    echo "  setting LDFLAGS to \"-posix\""
-    LDFLAGS="-posix"
-  else
-    apr_addto_bugger="-posix"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LDFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LDFLAGS"
-        LDFLAGS="$LDFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-linet\""
-    LIBS="-linet"
-  else
-    apr_addto_bugger="-linet"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-sco3.2v[234]*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSCO -D_REENTRANT\""
-    CPPFLAGS="-DSCO -D_REENTRANT"
-  else
-    apr_addto_bugger="-DSCO -D_REENTRANT"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	if test "$GCC" = "no"; then
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-Oacgiltz\""
-    CFLAGS="-Oacgiltz"
-  else
-    apr_addto_bugger="-Oacgiltz"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-	fi
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lPW -lmalloc\""
-    LIBS="-lPW -lmalloc"
-  else
-    apr_addto_bugger="-lPW -lmalloc"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-sco3.2v5*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSCO5 -D_REENTRANT\""
-    CPPFLAGS="-DSCO5 -D_REENTRANT"
-  else
-    apr_addto_bugger="-DSCO5 -D_REENTRANT"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-sco_sv*|*-SCO_SV*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSCO -D_REENTRANT\""
-    CPPFLAGS="-DSCO -D_REENTRANT"
-  else
-    apr_addto_bugger="-DSCO -D_REENTRANT"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lPW -lmalloc\""
-    LIBS="-lPW -lmalloc"
-  else
-    apr_addto_bugger="-lPW -lmalloc"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-solaris2*)
-    	PLATOSVERS=`echo $host | sed 's/^.*solaris2.//'`
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSOLARIS2=$PLATOSVERS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT\""
-    CPPFLAGS="-DSOLARIS2=$PLATOSVERS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT"
-  else
-    apr_addto_bugger="-DSOLARIS2=$PLATOSVERS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test -z "$apr_lock_method"; then
-    echo "  setting apr_lock_method to \"USE_FCNTL_SERIALIZE\""
-    apr_lock_method="USE_FCNTL_SERIALIZE"
-  fi
-
-	;;
-    *-sunos4*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSUNOS4\""
-    CPPFLAGS="-DSUNOS4"
-  else
-    apr_addto_bugger="-DSUNOS4"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-unixware1)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DUW=100\""
-    CPPFLAGS="-DUW=100"
-  else
-    apr_addto_bugger="-DUW=100"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-unixware2)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DUW=200\""
-    CPPFLAGS="-DUW=200"
-  else
-    apr_addto_bugger="-DUW=200"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lgen\""
-    LIBS="-lgen"
-  else
-    apr_addto_bugger="-lgen"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-unixware211)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DUW=211\""
-    CPPFLAGS="-DUW=211"
-  else
-    apr_addto_bugger="-DUW=211"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lgen\""
-    LIBS="-lgen"
-  else
-    apr_addto_bugger="-lgen"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-unixware212)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DUW=212\""
-    CPPFLAGS="-DUW=212"
-  else
-    apr_addto_bugger="-DUW=212"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lgen\""
-    LIBS="-lgen"
-  else
-    apr_addto_bugger="-lgen"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-unixware7)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DUW=700\""
-    CPPFLAGS="-DUW=700"
-  else
-    apr_addto_bugger="-DUW=700"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lgen\""
-    LIBS="-lgen"
-  else
-    apr_addto_bugger="-lgen"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    maxion-*-sysv4*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSVR4\""
-    CPPFLAGS="-DSVR4"
-  else
-    apr_addto_bugger="-DSVR4"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lc -lgen\""
-    LIBS="-lc -lgen"
-  else
-    apr_addto_bugger="-lc -lgen"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-*-powermax*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSVR4\""
-    CPPFLAGS="-DSVR4"
-  else
-    apr_addto_bugger="-DSVR4"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lgen\""
-    LIBS="-lgen"
-  else
-    apr_addto_bugger="-lgen"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    TPF)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DTPF -D_POSIX_SOURCE\""
-    CPPFLAGS="-DTPF -D_POSIX_SOURCE"
-  else
-    apr_addto_bugger="-DTPF -D_POSIX_SOURCE"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-       ;;
-    bs2000*-siemens-sysv*)
-
-  if test -z "$CFLAGS"; then
-    echo "  setting CFLAGS to \"-O\""
-    CFLAGS="-O"
-  fi
-
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSVR4 -D_XPG_IV -D_KMEMUSER\""
-    CPPFLAGS="-DSVR4 -D_XPG_IV -D_KMEMUSER"
-  else
-    apr_addto_bugger="-DSVR4 -D_XPG_IV -D_KMEMUSER"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lsocket\""
-    LIBS="-lsocket"
-  else
-    apr_addto_bugger="-lsocket"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-
-  if test -z "$enable_threads"; then
-    echo "  setting enable_threads to \"no\""
-    enable_threads="no"
-  fi
-
-	;;
-    *-siemens-sysv4*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSVR4 -D_XPG_IV -DHAS_DLFCN -DUSE_MMAP_FILES -DUSE_SYSVSEM_SERIALIZED_ACCEPT\""
-    CPPFLAGS="-DSVR4 -D_XPG_IV -DHAS_DLFCN -DUSE_MMAP_FILES -DUSE_SYSVSEM_SERIALIZED_ACCEPT"
-  else
-    apr_addto_bugger="-DSVR4 -D_XPG_IV -DHAS_DLFCN -DUSE_MMAP_FILES -DUSE_SYSVSEM_SERIALIZED_ACCEPT"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lc\""
-    LIBS="-lc"
-  else
-    apr_addto_bugger="-lc"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    pyramid-pyramid-svr4)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSVR4 -DNO_LONG_DOUBLE\""
-    CPPFLAGS="-DSVR4 -DNO_LONG_DOUBLE"
-  else
-    apr_addto_bugger="-DSVR4 -DNO_LONG_DOUBLE"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lc\""
-    LIBS="-lc"
-  else
-    apr_addto_bugger="-lc"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    DS/90\ 7000-*-sysv4*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DUXPDS\""
-    CPPFLAGS="-DUXPDS"
-  else
-    apr_addto_bugger="-DUXPDS"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-tandem-sysv4*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSVR4\""
-    CPPFLAGS="-DSVR4"
-  else
-    apr_addto_bugger="-DSVR4"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-ncr-sysv4)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSVR4 -DMPRAS\""
-    CPPFLAGS="-DSVR4 -DMPRAS"
-  else
-    apr_addto_bugger="-DSVR4 -DMPRAS"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lc -L/usr/ucblib -lucb\""
-    LIBS="-lc -L/usr/ucblib -lucb"
-  else
-    apr_addto_bugger="-lc -L/usr/ucblib -lucb"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-sysv4*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSVR4\""
-    CPPFLAGS="-DSVR4"
-  else
-    apr_addto_bugger="-DSVR4"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lc\""
-    LIBS="-lc"
-  else
-    apr_addto_bugger="-lc"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    88k-encore-sysv4)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSVR4 -DENCORE\""
-    CPPFLAGS="-DSVR4 -DENCORE"
-  else
-    apr_addto_bugger="-DSVR4 -DENCORE"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lPW\""
-    LIBS="-lPW"
-  else
-    apr_addto_bugger="-lPW"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-uts*)
-	PLATOSVERS=`echo $host | sed 's/^.*,//'`
-	case $PLATOSVERS in
-	    2*)
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DUTS21\""
-    CPPFLAGS="-DUTS21"
-  else
-    apr_addto_bugger="-DUTS21"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-Xa -eft\""
-    CFLAGS="-Xa -eft"
-  else
-    apr_addto_bugger="-Xa -eft"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lbsd -la\""
-    LIBS="-lbsd -la"
-  else
-    apr_addto_bugger="-lbsd -la"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	        ;;
-	    *)
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSVR4\""
-    CPPFLAGS="-DSVR4"
-  else
-    apr_addto_bugger="-DSVR4"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-Xa\""
-    CFLAGS="-Xa"
-  else
-    apr_addto_bugger="-Xa"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-	        ;;
-	esac
-	;;
-    *-ultrix)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DULTRIX\""
-    CPPFLAGS="-DULTRIX"
-  else
-    apr_addto_bugger="-DULTRIX"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  echo "  forcing SHELL to \"/bin/sh5\""
-  SHELL="/bin/sh5"
-
-	;;
-    *powerpc-tenon-machten*)
-
-  if test "x$LDFLAGS" = "x"; then
-    echo "  setting LDFLAGS to \"-Xlstack=0x14000 -Xldelcsect\""
-    LDFLAGS="-Xlstack=0x14000 -Xldelcsect"
-  else
-    apr_addto_bugger="-Xlstack=0x14000 -Xldelcsect"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LDFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LDFLAGS"
-        LDFLAGS="$LDFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-machten*)
-
-  if test "x$LDFLAGS" = "x"; then
-    echo "  setting LDFLAGS to \"-stack 0x14000\""
-    LDFLAGS="-stack 0x14000"
-  else
-    apr_addto_bugger="-stack 0x14000"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LDFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LDFLAGS"
-        LDFLAGS="$LDFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *convex-v11*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DCONVEXOS11\""
-    CPPFLAGS="-DCONVEXOS11"
-  else
-    apr_addto_bugger="-DCONVEXOS11"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test -z "$CFLAGS"; then
-    echo "  setting CFLAGS to \"-O1\""
-    CFLAGS="-O1"
-  fi
-
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-ext\""
-    CFLAGS="-ext"
-  else
-    apr_addto_bugger="-ext"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    i860-intel-osf1)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DPARAGON\""
-    CPPFLAGS="-DPARAGON"
-  else
-    apr_addto_bugger="-DPARAGON"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-sequent-ptx2.*.*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSEQUENT=20\""
-    CPPFLAGS="-DSEQUENT=20"
-  else
-    apr_addto_bugger="-DSEQUENT=20"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-Wc,-pw\""
-    CFLAGS="-Wc,-pw"
-  else
-    apr_addto_bugger="-Wc,-pw"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-linet -lc -lseq\""
-    LIBS="-linet -lc -lseq"
-  else
-    apr_addto_bugger="-linet -lc -lseq"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-sequent-ptx4.0.*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSEQUENT=40\""
-    CPPFLAGS="-DSEQUENT=40"
-  else
-    apr_addto_bugger="-DSEQUENT=40"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-Wc,-pw\""
-    CFLAGS="-Wc,-pw"
-  else
-    apr_addto_bugger="-Wc,-pw"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-linet -lc\""
-    LIBS="-linet -lc"
-  else
-    apr_addto_bugger="-linet -lc"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-sequent-ptx4.[123].*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSEQUENT=41\""
-    CPPFLAGS="-DSEQUENT=41"
-  else
-    apr_addto_bugger="-DSEQUENT=41"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-Wc,-pw\""
-    CFLAGS="-Wc,-pw"
-  else
-    apr_addto_bugger="-Wc,-pw"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lc\""
-    LIBS="-lc"
-  else
-    apr_addto_bugger="-lc"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-sequent-ptx4.4.*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSEQUENT=44\""
-    CPPFLAGS="-DSEQUENT=44"
-  else
-    apr_addto_bugger="-DSEQUENT=44"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-Wc,-pw\""
-    CFLAGS="-Wc,-pw"
-  else
-    apr_addto_bugger="-Wc,-pw"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lc\""
-    LIBS="-lc"
-  else
-    apr_addto_bugger="-lc"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-sequent-ptx4.5.*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSEQUENT=45\""
-    CPPFLAGS="-DSEQUENT=45"
-  else
-    apr_addto_bugger="-DSEQUENT=45"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-Wc,-pw\""
-    CFLAGS="-Wc,-pw"
-  else
-    apr_addto_bugger="-Wc,-pw"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lc\""
-    LIBS="-lc"
-  else
-    apr_addto_bugger="-lc"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-sequent-ptx5.0.*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSEQUENT=50\""
-    CPPFLAGS="-DSEQUENT=50"
-  else
-    apr_addto_bugger="-DSEQUENT=50"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-Wc,-pw\""
-    CFLAGS="-Wc,-pw"
-  else
-    apr_addto_bugger="-Wc,-pw"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lc\""
-    LIBS="-lc"
-  else
-    apr_addto_bugger="-lc"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    *NEWS-OS*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DNEWSOS\""
-    CPPFLAGS="-DNEWSOS"
-  else
-    apr_addto_bugger="-DNEWSOS"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-riscix)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DRISCIX\""
-    CPPFLAGS="-DRISCIX"
-  else
-    apr_addto_bugger="-DRISCIX"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test -z "$CFLAGS"; then
-    echo "  setting CFLAGS to \"-O\""
-    CFLAGS="-O"
-  fi
-
-	;;
-    *-irix*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-D_POSIX_THREAD_SAFE_FUNCTIONS\""
-    CPPFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS"
-  else
-    apr_addto_bugger="-D_POSIX_THREAD_SAFE_FUNCTIONS"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *beos*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DBEOS\""
-    CPPFLAGS="-DBEOS"
-  else
-    apr_addto_bugger="-DBEOS"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-        PLATOSVERS=`uname -r`
-
-  if test -z "$apr_process_lock_is_global"; then
-    echo "  setting apr_process_lock_is_global to \"yes\""
-    apr_process_lock_is_global="yes"
-  fi
-
-        case $PLATOSVERS in
-            5.0.4)
-
-  if test "x$LDFLAGS" = "x"; then
-    echo "  setting LDFLAGS to \"-L/boot/beos/system/lib\""
-    LDFLAGS="-L/boot/beos/system/lib"
-  else
-    apr_addto_bugger="-L/boot/beos/system/lib"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LDFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LDFLAGS"
-        LDFLAGS="$LDFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lbind -lsocket\""
-    LIBS="-lbind -lsocket"
-  else
-    apr_addto_bugger="-lbind -lsocket"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DBONE7\""
-    CPPFLAGS="-DBONE7"
-  else
-    apr_addto_bugger="-DBONE7"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-                ;;
-            5.1)
-
-  if test "x$LDFLAGS" = "x"; then
-    echo "  setting LDFLAGS to \"-L/boot/beos/system/lib\""
-    LDFLAGS="-L/boot/beos/system/lib"
-  else
-    apr_addto_bugger="-L/boot/beos/system/lib"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LDFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LDFLAGS"
-        LDFLAGS="$LDFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lbind -lsocket\""
-    LIBS="-lbind -lsocket"
-  else
-    apr_addto_bugger="-lbind -lsocket"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-                ;;
-	esac
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSIGPROCMASK_SETS_THREAD_MASK -DAP_AUTH_DBM_USE_APR\""
-    CPPFLAGS="-DSIGPROCMASK_SETS_THREAD_MASK -DAP_AUTH_DBM_USE_APR"
-  else
-    apr_addto_bugger="-DSIGPROCMASK_SETS_THREAD_MASK -DAP_AUTH_DBM_USE_APR"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-        ;;
-    4850-*.*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSVR4 -DMPRAS\""
-    CPPFLAGS="-DSVR4 -DMPRAS"
-  else
-    apr_addto_bugger="-DSVR4 -DMPRAS"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lc -L/usr/ucblib -lucb\""
-    LIBS="-lc -L/usr/ucblib -lucb"
-  else
-    apr_addto_bugger="-lc -L/usr/ucblib -lucb"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    drs6000*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DSVR4\""
-    CPPFLAGS="-DSVR4"
-  else
-    apr_addto_bugger="-DSVR4"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lc -L/usr/ucblib -lucb\""
-    LIBS="-lc -L/usr/ucblib -lucb"
-  else
-    apr_addto_bugger="-lc -L/usr/ucblib -lucb"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-    m88k-*-CX/SX|CYBER)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-D_CX_SX\""
-    CPPFLAGS="-D_CX_SX"
-  else
-    apr_addto_bugger="-D_CX_SX"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-Xa\""
-    CFLAGS="-Xa"
-  else
-    apr_addto_bugger="-Xa"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-tandem-oss)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-D_TANDEM_SOURCE -D_XOPEN_SOURCE_EXTENDED=1\""
-    CPPFLAGS="-D_TANDEM_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
-  else
-    apr_addto_bugger="-D_TANDEM_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-	;;
-    *-ibm-os390)
-
-  if test -z "$apr_lock_method"; then
-    echo "  setting apr_lock_method to \"USE_SYSVSEM_SERIALIZE\""
-    apr_lock_method="USE_SYSVSEM_SERIALIZE"
-  fi
-
-
-  if test -z "$apr_sysvsem_is_global"; then
-    echo "  setting apr_sysvsem_is_global to \"yes\""
-    apr_sysvsem_is_global="yes"
-  fi
-
-
-  if test -z "$apr_gethostbyname_is_thread_safe"; then
-    echo "  setting apr_gethostbyname_is_thread_safe to \"yes\""
-    apr_gethostbyname_is_thread_safe="yes"
-  fi
-
-
-  if test -z "$apr_gethostbyaddr_is_thread_safe"; then
-    echo "  setting apr_gethostbyaddr_is_thread_safe to \"yes\""
-    apr_gethostbyaddr_is_thread_safe="yes"
-  fi
-
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-U_NO_PROTO -DPTHREAD_ATTR_SETDETACHSTATE_ARG2_ADDR -DPTHREAD_SETS_ERRNO -DPTHREAD_DETACH_ARG1_ADDR -DSIGPROCMASK_SETS_THREAD_MASK -DTCP_NODELAY=1\""
-    CPPFLAGS="-U_NO_PROTO -DPTHREAD_ATTR_SETDETACHSTATE_ARG2_ADDR -DPTHREAD_SETS_ERRNO -DPTHREAD_DETACH_ARG1_ADDR -DSIGPROCMASK_SETS_THREAD_MASK -DTCP_NODELAY=1"
-  else
-    apr_addto_bugger="-U_NO_PROTO -DPTHREAD_ATTR_SETDETACHSTATE_ARG2_ADDR -DPTHREAD_SETS_ERRNO -DPTHREAD_DETACH_ARG1_ADDR -DSIGPROCMASK_SETS_THREAD_MASK -DTCP_NODELAY=1"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-       ;;
-    *-ibm-as400)
-
-  if test -z "$apr_lock_method"; then
-    echo "  setting apr_lock_method to \"USE_SYSVSEM_SERIALIZE\""
-    apr_lock_method="USE_SYSVSEM_SERIALIZE"
-  fi
-
-
-  if test -z "$apr_process_lock_is_global"; then
-    echo "  setting apr_process_lock_is_global to \"yes\""
-    apr_process_lock_is_global="yes"
-  fi
-
-
-  if test -z "$apr_gethostbyname_is_thread_safe"; then
-    echo "  setting apr_gethostbyname_is_thread_safe to \"yes\""
-    apr_gethostbyname_is_thread_safe="yes"
-  fi
-
-
-  if test -z "$apr_gethostbyaddr_is_thread_safe"; then
-    echo "  setting apr_gethostbyaddr_is_thread_safe to \"yes\""
-    apr_gethostbyaddr_is_thread_safe="yes"
-  fi
-
-       ;;
-    *cygwin*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DCYGWIN\""
-    CPPFLAGS="-DCYGWIN"
-  else
-    apr_addto_bugger="-DCYGWIN"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lcrypt\""
-    LIBS="-lcrypt"
-  else
-    apr_addto_bugger="-lcrypt"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-	;;
-  esac
-
-fi
-
-
-DEFAULT_OSDIR="unix"
-echo "(Default will be ${DEFAULT_OSDIR})"
-
-apr_modules="file_io network_io threadproc misc locks time mmap shmem user memory atomic poll support"
-
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-# Extract the first word of "rm", so it can be a program name with args.
-set dummy rm; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RM+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RM"; then
-  ac_cv_prog_RM="$RM" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RM="rm"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RM=$ac_cv_prog_RM
-if test -n "$RM"; then
-  { $as_echo "$as_me:$LINENO: result: $RM" >&5
-$as_echo "$RM" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AS+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AS="as"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AS=$ac_cv_prog_AS
-if test -n "$AS"; then
-  { $as_echo "$as_me:$LINENO: result: $AS" >&5
-$as_echo "$AS" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "cpp", so it can be a program name with args.
-set dummy cpp; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ASCPP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ASCPP"; then
-  ac_cv_prog_ASCPP="$ASCPP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ASCPP="cpp"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ASCPP=$ac_cv_prog_ASCPP
-if test -n "$ASCPP"; then
-  { $as_echo "$as_me:$LINENO: result: $ASCPP" >&5
-$as_echo "$ASCPP" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:$LINENO: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_AR" = x; then
-    AR="ar"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-else
-  AR="$ac_cv_prog_AR"
-fi
-
-
-
-
-
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-  if test "${ac_cv_header_minix_config_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
-$as_echo_n "checking for minix/config.h... " >&6; }
-if test "${ac_cv_header_minix_config_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-$as_echo "$ac_cv_header_minix_config_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5
-$as_echo_n "checking minix/config.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <minix/config.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5
-$as_echo_n "checking minix/config.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <minix/config.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: minix/config.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
-$as_echo_n "checking for minix/config.h... " >&6; }
-if test "${ac_cv_header_minix_config_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_minix_config_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-$as_echo "$ac_cv_header_minix_config_h" >&6; }
-
-fi
-if test "x$ac_cv_header_minix_config_h" = x""yes; then
-  MINIX=yes
-else
-  MINIX=
-fi
-
-
-  if test "$MINIX" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define _POSIX_SOURCE 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define _POSIX_1_SOURCE 2
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define _MINIX 1
-_ACEOF
-
-  fi
-
-
-
-  { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
-$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#	  define __EXTENSIONS__ 1
-	  $ac_includes_default
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_safe_to_define___extensions__=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_safe_to_define___extensions__=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
-$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
-  test $ac_cv_safe_to_define___extensions__ = yes &&
-    cat >>confdefs.h <<\_ACEOF
-#define __EXTENSIONS__ 1
-_ACEOF
-
-  cat >>confdefs.h <<\_ACEOF
-#define _ALL_SOURCE 1
-_ACEOF
-
-  cat >>confdefs.h <<\_ACEOF
-#define _GNU_SOURCE 1
-_ACEOF
-
-  cat >>confdefs.h <<\_ACEOF
-#define _POSIX_PTHREAD_SEMANTICS 1
-_ACEOF
-
-  cat >>confdefs.h <<\_ACEOF
-#define _TANDEM_SOURCE 1
-_ACEOF
-
-
-
-
-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
-$as_echo_n "checking for library containing strerror... " >&6; }
-if test "${ac_cv_search_strerror+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strerror ();
-int
-main ()
-{
-return strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' cposix; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_search_strerror=$ac_res
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_strerror+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_strerror+set}" = set; then
-  :
-else
-  ac_cv_search_strerror=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-$as_echo "$ac_cv_search_strerror" >&6; }
-ac_res=$ac_cv_search_strerror
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-
-  { $as_echo "$as_me:$LINENO: checking whether system uses EBCDIC" >&5
-$as_echo_n "checking whether system uses EBCDIC... " >&6; }
-if test "${ac_cv_ebcdic+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-  if test "$cross_compiling" = yes; then
-
-  ac_cv_ebcdic="no"
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int main(void) {
-  return (unsigned char)'A' != (unsigned char)0xC1;
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-  ac_cv_ebcdic="yes"
-
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-  ac_cv_ebcdic="no"
-
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_ebcdic" >&5
-$as_echo "$ac_cv_ebcdic" >&6; }
-  if test "$ac_cv_ebcdic" = "yes"; then
-    apr_charset_ebcdic=1
-  else
-    apr_charset_ebcdic=0
-  fi
-
-
-
-APR_LIBNAME="apr${libsuffix}"
-
-
-echo "performing libtool configuration..."
-
-# Check whether --enable-experimental-libtool was given.
-if test "${enable_experimental_libtool+set}" = set; then
-  enableval=$enable_experimental_libtool; experimental_libtool=$enableval
-else
-  experimental_libtool=no
-fi
-
-
-case $host in
-*os2*)
-    # Use a custom-made libtool replacement
-    echo "using aplibtool"
-    LIBTOOL="$srcdir/build/aplibtool"
-    gcc $CFLAGS $CPPFLAGS -o $LIBTOOL.exe $LIBTOOL.c
-    ;;
-*)
-    if test "x$LTFLAGS" = "x"; then
-        LTFLAGS='--silent'
-    fi
-    if test "$experimental_libtool" = "yes"; then
-        # Use a custom-made libtool replacement
-        echo "using jlibtool"
-        LIBTOOL="$apr_builddir/libtool"
-        LIBTOOL_SRC="$apr_srcdir/build/jlibtool.c"
-        if test ! -f $LIBTOOL_SRC; then
-          { { $as_echo "$as_me:$LINENO: error: Experimental libtool source not found.  It is not included with APR by default." >&5
-$as_echo "$as_me: error: Experimental libtool source not found.  It is not included with APR by default." >&2;}
-   { (exit 1); exit 1; }; }
-        fi
-        $CC $CFLAGS $CPPFLAGS -o $LIBTOOL $LIBTOOL_SRC
-    else
-    # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval=$enable_shared; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_shared=yes
-fi
-
-
-# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_static=yes
-fi
-
-
-# Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
-  enableval=$enable_fast_install; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_fast_install=yes
-fi
-
-
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${lt_cv_path_SED+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  # Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-
-fi
-
-SED=$lt_cv_path_SED
-
-{ $as_echo "$as_me:$LINENO: result: $SED" >&5
-$as_echo "$SED" >&6; }
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if test "${lt_cv_path_LD+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:$LINENO: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-
-{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-$as_echo_n "checking for BSD-compatible nm... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-NM="$lt_cv_path_NM"
-
-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[4-9]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[45]*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[3-9]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval=$enable_libtool_lock;
-fi
-
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 9566 "configure"' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-   fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    case `/usr/bin/file conftest.o` in
-    *32-bit*)
-      case $host in
-        x86_64-*kfreebsd*-gnu)
-          LD="${LD-ld} -m elf_i386_fbsd"
-          ;;
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      libsuff=64
-      case $host in
-        x86_64-*kfreebsd*-gnu)
-          LD="${LD-ld} -m elf_x86_64_fbsd"
-          ;;
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  lt_cv_cc_needs_belf=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	lt_cv_cc_needs_belf=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-
-esac
-
-need_locks="$enable_libtool_lock"
-
-
-
-for ac_header in dlfcn.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CXX" && break
-done
-
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
-
-  fi
-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cxx_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CXXFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cxx_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-fi
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-fi
-
-
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_F77+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$F77"; then
-  ac_cv_prog_F77="$F77" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-F77=$ac_cv_prog_F77
-if test -n "$F77"; then
-  { $as_echo "$as_me:$LINENO: result: $F77" >&5
-$as_echo "$F77" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$F77" && break
-  done
-fi
-if test -z "$F77"; then
-  ac_ct_F77=$F77
-  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_F77"; then
-  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_F77="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_F77=$ac_cv_prog_ac_ct_F77
-if test -n "$ac_ct_F77"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-$as_echo "$ac_ct_F77" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_F77" && break
-done
-
-  if test "x$ac_ct_F77" = x; then
-    F77=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    F77=$ac_ct_F77
-  fi
-fi
-
-
-# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-rm -f a.out
-
-# If we don't use `.F' as extension, the preprocessor is not run on the
-# input file.  (Note that this only needs to work for GNU compilers.)
-ac_save_ext=$ac_ext
-ac_ext=F
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
-if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-      program main
-#ifndef __GNUC__
-       choke me
-#endif
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_f77_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
-ac_ext=$ac_save_ext
-ac_test_FFLAGS=${FFLAGS+set}
-ac_save_FFLAGS=$FFLAGS
-FFLAGS=
-{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-$as_echo_n "checking whether $F77 accepts -g... " >&6; }
-if test "${ac_cv_prog_f77_g+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  FFLAGS=-g
-cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_f77_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_f77_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_prog_f77_g=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-$as_echo "$ac_cv_prog_f77_g" >&6; }
-if test "$ac_test_FFLAGS" = set; then
-  FFLAGS=$ac_save_FFLAGS
-elif test $ac_cv_prog_f77_g = yes; then
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-g -O2"
-  else
-    FFLAGS="-g"
-  fi
-else
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-O2"
-  else
-    FFLAGS=
-  fi
-fi
-
-if test $ac_compiler_gnu = yes; then
-  G77=yes
-else
-  G77=
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-# find the maximum length of command line arguments
-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-    i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ 	]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
-	       = "XX$teststring") >/dev/null 2>&1 &&
-	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	      lt_cv_sys_max_cmd_len=$new_result &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on massive
-      # amounts of additional arguments before passing them to the linker.
-      # It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-
-fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: none" >&5
-$as_echo "none" >&6; }
-fi
-
-
-
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDEGRST]'
-  fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-linux* | k*bsd*-gnu)
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDGIRSTW]'
-    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris*)
-  symcode='[BDRT]'
-  ;;
-sco3.2v5*)
-  symcode='[DT]'
-  ;;
-sysv4.2uw2*)
-  symcode='[DT]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[ABDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[] =
-{
-EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:$LINENO: result: failed" >&5
-$as_echo "failed" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: ok" >&5
-$as_echo "ok" >&6; }
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:$LINENO: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-else
-  AR="$ac_cv_prog_AR"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:$LINENO: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-
-  case $host_os in
-    rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
-  fi
-else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    NMEDIT=$ac_ct_NMEDIT
-  fi
-else
-  NMEDIT="$ac_cv_prog_NMEDIT"
-fi
-
-
-    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-   # By default we will add the -single_module flag. You can override
-   # by either setting the environment variable LT_MULTI_MODULE
-   # non-empty at configure time, or by adding -multi_module to the
-   # link flags.
-   echo "int foo(void){return 1;}" > conftest.c
-   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-     -dynamiclib ${wl}-single_module conftest.c
-   if test -f libconftest.dylib; then
-     lt_cv_apple_cc_single_mod=yes
-     rm -rf libconftest.dylib*
-   fi
-   rm conftest.c
-      fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  lt_cv_ld_exported_symbols_list=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	lt_cv_ld_exported_symbols_list=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-    case $host_os in
-    rhapsody* | darwin1.[0123])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*)
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-   10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-   10.[012]*)
-     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-   10.*)
-     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-    fi
-    if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil="~$DSYMUTIL \$lib || :"
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-
-
-enable_dlopen=no
-enable_win32_dll=no
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval=$enable_libtool_lock;
-fi
-
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then
-  withval=$with_pic; pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-test -z "$pic_mode" && pic_mode=default
-
-# Use C for the default configuration in the libtool script
-tagname=
-lt_save_CC="$CC"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
-
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-
-lt_prog_compiler_no_builtin_flag=
-
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-
-
-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-  ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12055: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:12059: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
-
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         lt_prog_compiler_pic='-qnocommon'
-         lt_prog_compiler_wl='-Wl,'
-         ;;
-       esac
-       ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    linux* | k*bsd*-gnu)
-      case $cc_basename in
-      icc* | ecc*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fpic'
-	lt_prog_compiler_static='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      *)
-        case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Wl,'
-	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	lt_prog_compiler_wl='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-
-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works=no
-  ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12345: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:12349: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works=yes
-     fi
-   fi
-   $rm -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12449: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:12453: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  runpath_var=
-  allow_undefined_flag=
-  enable_shared_with_static_runtimes=no
-  archive_cmds=
-  archive_expsym_cmds=
-  old_archive_From_new_cmds=
-  old_archive_from_expsyms_cmds=
-  export_dynamic_flag_spec=
-  whole_archive_flag_spec=
-  thread_safe_flag_spec=
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
-  hardcode_libdir_separator=
-  hardcode_direct=no
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  link_all_deplibs=unknown
-  hardcode_automatic=no
-  module_cmds=
-  module_expsym_cmds=
-  always_export_symbols=no
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | k*bsd*-gnu)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
-	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	*)
-	  tmp_sharedflag='-shared' ;;
-	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-	if test $supports_anon_versioning = yes; then
-	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-	  else
-	    ld_shlibs=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec=
-      export_dynamic_flag_spec=
-      whole_archive_flag_spec=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=unsupported
-      fi
-      ;;
-
-    aix[4-9]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  :
-	  else
-  	  # We have old collect2
-  	  hardcode_direct=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  hardcode_minus_L=yes
-  	  hardcode_libdir_flag_spec='-L$libdir'
-  	  hardcode_libdir_separator=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag=' ${wl}-bernotok'
-	  allow_undefined_flag=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec='$convenience'
-	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs=no
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      archive_cmds_need_lc=no
-      hardcode_direct=no
-      hardcode_automatic=yes
-      hardcode_shlibpath_var=unsupported
-      whole_archive_flag_spec=''
-      link_all_deplibs=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-        module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-        archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-        module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator=:
-
-	hardcode_direct=yes
-	export_dynamic_flag_spec='${wl}-E'
-
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_libdir_flag_spec_ld='+b $libdir'
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	*)
-	  hardcode_direct=yes
-	  export_dynamic_flag_spec='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      link_all_deplibs=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct=yes
-	hardcode_shlibpath_var=no
-	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-        fi
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      hardcode_libdir_separator=:
-      ;;
-
-    solaris*)
-      no_undefined_flag=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	wlarc=''
-	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds='$CC -r -o $output$reload_objs'
-	  hardcode_direct=no
-        ;;
-	motorola)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='${wl}-z,text'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag='${wl}-z,text'
-      allow_undefined_flag='${wl}-z,nodefs'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-  fi
-
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $rm conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl
-	pic_flag=$lt_prog_compiler_pic
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag
-        allow_undefined_flag=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc=no
-        else
-	  archive_cmds_need_lc=yes
-        fi
-        allow_undefined_flag=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[lt_foo]++; }
-  if (lt_freq[lt_foo] == 1) { print lt_foo; }
-}'`
-  sys_lib_search_path_spec=`echo $lt_search_path_spec`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[123]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix[3-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-fi
-
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-fi
-
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
-   test -n "$runpath_var" || \
-   test "X$hardcode_automatic" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
-
-if test "$hardcode_action" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         old_striplib="$STRIP -S"
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-       else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-       ;;
-   *)
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  esac
-fi
-
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-   ;;
-
-  *)
-    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-$as_echo_n "checking for shl_load... " >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_shl_load || defined __stub___shl_load
-choke me
-#endif
-
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_shl_load=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_shl_load=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-$as_echo "$ac_cv_func_shl_load" >&6; }
-if test "x$ac_cv_func_shl_load" = x""yes; then
-  lt_cv_dlopen="shl_load"
-else
-  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dld_shl_load=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else
-  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-$as_echo_n "checking for dlopen... " >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_dlopen || defined __stub___dlopen
-choke me
-#endif
-
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_dlopen=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_dlopen=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
-if test "x$ac_cv_func_dlopen" = x""yes; then
-  lt_cv_dlopen="dlopen"
-else
-  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_svld_dlopen=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_svld_dlopen=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-int
-main ()
-{
-return dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_dld_dld_link=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dld_dld_link=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 14851 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 14951 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-# Report which library types will actually be built
-{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix[4-9]*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler \
-    CC \
-    LD \
-    lt_prog_compiler_wl \
-    lt_prog_compiler_pic \
-    lt_prog_compiler_static \
-    lt_prog_compiler_no_builtin_flag \
-    export_dynamic_flag_spec \
-    thread_safe_flag_spec \
-    whole_archive_flag_spec \
-    enable_shared_with_static_runtimes \
-    old_archive_cmds \
-    old_archive_from_new_cmds \
-    predep_objects \
-    postdep_objects \
-    predeps \
-    postdeps \
-    compiler_lib_search_path \
-    compiler_lib_search_dirs \
-    archive_cmds \
-    archive_expsym_cmds \
-    postinstall_cmds \
-    postuninstall_cmds \
-    old_archive_from_expsyms_cmds \
-    allow_undefined_flag \
-    no_undefined_flag \
-    export_symbols_cmds \
-    hardcode_libdir_flag_spec \
-    hardcode_libdir_flag_spec_ld \
-    hardcode_libdir_separator \
-    hardcode_automatic \
-    module_cmds \
-    module_expsym_cmds \
-    lt_cv_prog_compiler_c_o \
-    fix_srcfile_path \
-    exclude_expsyms \
-    include_expsyms; do
-
-    case $var in
-    old_archive_cmds | \
-    old_archive_from_new_cmds | \
-    archive_cmds | \
-    archive_expsym_cmds | \
-    module_cmds | \
-    module_expsym_cmds | \
-    old_archive_from_expsyms_cmds | \
-    export_symbols_cmds | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  { $as_echo "$as_me:$LINENO: creating $ofile" >&5
-$as_echo "$as_me: creating $ofile" >&6;}
-
-  cat <<__EOF__ >> "$cfgfile"
-#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e 1s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps
-
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# ### END LIBTOOL CONFIG
-
-__EOF__
-
-
-  case $host_os in
-  aix3*)
-    cat <<\EOF >> "$cfgfile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-    ;;
-  esac
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-
-# Check whether --with-tags was given.
-if test "${with_tags+set}" = set; then
-  withval=$with_tags; tagnames="$withval"
-fi
-
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
-    else
-      { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
-    fi
-  fi
-  if test -z "$LTCFLAGS"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-  fi
-
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
-    IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
-    "") ;;
-    *)  { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-$as_echo "$as_me: error: invalid tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
-	;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      case $tagname in
-      CXX)
-	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-	    (test "X$CXX" != "Xg++"))) ; then
-	  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
-
-archive_cmds_need_lc_CXX=no
-allow_undefined_flag_CXX=
-always_export_symbols_CXX=no
-archive_expsym_cmds_CXX=
-export_dynamic_flag_spec_CXX=
-hardcode_direct_CXX=no
-hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
-hardcode_libdir_separator_CXX=
-hardcode_minus_L_CXX=no
-hardcode_shlibpath_var_CXX=unsupported
-hardcode_automatic_CXX=no
-module_cmds_CXX=
-module_expsym_cmds_CXX=
-link_all_deplibs_CXX=unknown
-old_archive_cmds_CXX=$old_archive_cmds
-no_undefined_flag_CXX=
-whole_archive_flag_spec_CXX=
-enable_shared_with_static_runtimes_CXX=no
-
-# Dependencies to place before and after the object being linked:
-predep_objects_CXX=
-postdep_objects_CXX=
-predeps_CXX=
-postdeps_CXX=
-compiler_lib_search_path_CXX=
-compiler_lib_search_dirs_CXX=
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-objext_CXX=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
-  $as_unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
-  lt_cv_path_LD=$lt_cv_path_LDCXX
-else
-  $as_unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-compiler_CXX=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
-else
-  lt_prog_compiler_no_builtin_flag_CXX=
-fi
-
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if test "${lt_cv_path_LD+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:$LINENO: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if test "$with_gnu_ld" = yes; then
-    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-    #     investigate it a little bit more. (MM)
-    wlarc='${wl}'
-
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-	grep 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec_CXX=
-    fi
-  else
-    with_gnu_ld=no
-    wlarc=
-
-    # A generic and very simple default shared library creation
-    # command for GNU C++ for the case where it uses the native
-    # linker, instead of GNU ld.  If possible, this setting should
-    # overridden to take advantage of the native linker features on
-    # the platform it is being used on.
-    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
-
-  # Commands to make compiler produce verbose output that lists
-  # what "hidden" libraries, object files and flags are used when
-  # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-else
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-ld_shlibs_CXX=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  aix[4-9]*)
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
-
-      # Test if we are trying to use run time linking or normal
-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-      # need to do runtime linking.
-      case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	for ld_flag in $LDFLAGS; do
-	  case $ld_flag in
-	  *-brtl*)
-	    aix_use_runtimelinking=yes
-	    break
-	    ;;
-	  esac
-	done
-	;;
-      esac
-
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-    archive_cmds_CXX=''
-    hardcode_direct_CXX=yes
-    hardcode_libdir_separator_CXX=':'
-    link_all_deplibs_CXX=yes
-
-    if test "$GXX" = yes; then
-      case $host_os in aix4.[012]|aix4.[012].*)
-      # We only want to do this on AIX 4.2 and lower, the check
-      # below for broken collect2 doesn't work under 4.3+
-	collect2name=`${CC} -print-prog-name=collect2`
-	if test -f "$collect2name" && \
-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	then
-	  # We have reworked collect2
-	  :
-	else
-	  # We have old collect2
-	  hardcode_direct_CXX=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L_CXX=yes
-	  hardcode_libdir_flag_spec_CXX='-L$libdir'
-	  hardcode_libdir_separator_CXX=
-	fi
-	;;
-      esac
-      shared_flag='-shared'
-      if test "$aix_use_runtimelinking" = yes; then
-	shared_flag="$shared_flag "'${wl}-G'
-      fi
-    else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	shared_flag='-G'
-      else
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='${wl}-G'
-	else
-	  shared_flag='${wl}-bM:SRE'
-	fi
-      fi
-    fi
-
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    always_export_symbols_CXX=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      allow_undefined_flag_CXX='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-      if test "$host_cpu" = ia64; then
-	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-	allow_undefined_flag_CXX="-z nodefs"
-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-      else
-	# Determine the default libpath from the value encoded in an empty executable.
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-	# Warning - without using the other run time loading flags,
-	# -berok will link without error, but may produce a broken library.
-	no_undefined_flag_CXX=' ${wl}-bernotok'
-	allow_undefined_flag_CXX=' ${wl}-berok'
-	# Exported symbols can be pulled into shared objects from archives
-	whole_archive_flag_spec_CXX='$convenience'
-	archive_cmds_need_lc_CXX=yes
-	# This is similar to how AIX traditionally builds its shared libraries.
-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-      fi
-    fi
-    ;;
-
-  beos*)
-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-      allow_undefined_flag_CXX=unsupported
-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-      # support --undefined.  This deserves some investigation.  FIXME
-      archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    else
-      ld_shlibs_CXX=no
-    fi
-    ;;
-
-  chorus*)
-    case $cc_basename in
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-    # as there is no search path for DLLs.
-    hardcode_libdir_flag_spec_CXX='-L$libdir'
-    allow_undefined_flag_CXX=unsupported
-    always_export_symbols_CXX=no
-    enable_shared_with_static_runtimes_CXX=yes
-
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      # If the export-symbols file already is a .def file (1st line
-      # is EXPORTS), use it as is; otherwise, prepend...
-      archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	cp $export_symbols $output_objdir/$soname.def;
-      else
-	echo EXPORTS > $output_objdir/$soname.def;
-	cat $export_symbols >> $output_objdir/$soname.def;
-      fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-    else
-      ld_shlibs_CXX=no
-    fi
-  ;;
-      darwin* | rhapsody*)
-      archive_cmds_need_lc_CXX=no
-      hardcode_direct_CXX=no
-      hardcode_automatic_CXX=yes
-      hardcode_shlibpath_var_CXX=unsupported
-      whole_archive_flag_spec_CXX=''
-      link_all_deplibs_CXX=yes
-      allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
-      if test "$GXX" = yes ; then
-      output_verbose_link_cmd='echo'
-      archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-      module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-      module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-        archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-        archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-      fi
-      else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs_CXX=no
-          ;;
-      esac
-      fi
-        ;;
-
-  dgux*)
-    case $cc_basename in
-      ec++*)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      ghcx*)
-	# Green Hills C++ Compiler
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  freebsd[12]*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    ld_shlibs_CXX=no
-    ;;
-  freebsd-elf*)
-    archive_cmds_need_lc_CXX=no
-    ;;
-  freebsd* | dragonfly*)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    ld_shlibs_CXX=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-    hardcode_libdir_separator_CXX=:
-    export_dynamic_flag_spec_CXX='${wl}-E'
-    hardcode_direct_CXX=yes
-    hardcode_minus_L_CXX=yes # Not in the search PATH,
-				# but as the default
-				# location of the library.
-
-    case $cc_basename in
-    CC*)
-      # FIXME: insert proper C++ library support
-      ld_shlibs_CXX=no
-      ;;
-    aCC*)
-      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      #
-      # There doesn't appear to be a way to prevent this compiler from
-      # explicitly linking system object files so we need to strip them
-      # from the output so that they don't get included in the library
-      # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-      ;;
-    *)
-      if test "$GXX" = yes; then
-        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-      fi
-      ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_CXX=:
-
-      case $host_cpu in
-      hppa*64*|ia64*) ;;
-      *)
-	export_dynamic_flag_spec_CXX='${wl}-E'
-        ;;
-      esac
-    fi
-    case $host_cpu in
-    hppa*64*|ia64*)
-      hardcode_direct_CXX=no
-      hardcode_shlibpath_var_CXX=no
-      ;;
-    *)
-      hardcode_direct_CXX=yes
-      hardcode_minus_L_CXX=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    esac
-
-    case $cc_basename in
-      CC*)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      aCC*)
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	esac
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test $with_gnu_ld = no; then
-	    case $host_cpu in
-	    hppa*64*)
-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    ia64*)
-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    *)
-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    esac
-	  fi
-	else
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  interix[3-9]*)
-    hardcode_direct_CXX=no
-    hardcode_shlibpath_var_CXX=no
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-    export_dynamic_flag_spec_CXX='${wl}-E'
-    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-    # Instead, shared libraries are loaded at an image base (0x10000000 by
-    # default) and relocated if they conflict, which is a slow very memory
-    # consuming and fragmenting process.  To avoid this, we pick a random,
-    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-    archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC*)
-	# SGI C++
-	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	# Archives containing C++ object files must be created using
-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test "$with_gnu_ld" = no; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	  else
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-	  fi
-	fi
-	link_all_deplibs_CXX=yes
-	;;
-    esac
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator_CXX=:
-    ;;
-  linux* | k*bsd*-gnu)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-	;;
-      icpc*)
-	# Intel C++
-	with_gnu_ld=yes
-	# version 8.0 and above of icpc choke on multiply defined symbols
-	# if we add $predep_objects and $postdep_objects, however 7.1 and
-	# earlier do not add the objects themselves.
-	case `$CC -V 2>&1` in
-	*"Version 7."*)
-  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	*)  # Version 8.0 or newer
-	  tmp_idyn=
-	  case $host_cpu in
-	    ia64*) tmp_idyn=' -i_dynamic';;
-	  esac
-  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	esac
-	archive_cmds_need_lc_CXX=no
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	;;
-      pgCC* | pgcpp*)
-        # Portland Group C++ compiler
-	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-  	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-        ;;
-      cxx*)
-	# Compaq C++
-	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	runpath_var=LD_RUN_PATH
-	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C++ 5.9
-	  no_undefined_flag_CXX=' -zdefs'
-	  archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	  hardcode_libdir_flag_spec_CXX='-R$libdir'
-	  whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-
-	  # Not sure whether something based on
-	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	  # would be better.
-	  output_verbose_link_cmd='echo'
-
-	  # Archives containing C++ object files must be created using
-	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	  # necessary to make sure instantiated templates are included
-	  # in the archive.
-	  old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-	  ;;
-	esac
-	;;
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx*)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  netbsd*)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-      wlarc=
-      hardcode_libdir_flag_spec_CXX='-R$libdir'
-      hardcode_direct_CXX=yes
-      hardcode_shlibpath_var_CXX=no
-    fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-    ;;
-  openbsd2*)
-    # C++ shared libraries are fairly broken
-    ld_shlibs_CXX=no
-    ;;
-  openbsd*)
-    if test -f /usr/libexec/ld.so; then
-      hardcode_direct_CXX=yes
-      hardcode_shlibpath_var_CXX=no
-      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	export_dynamic_flag_spec_CXX='${wl}-E'
-	whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      fi
-      output_verbose_link_cmd='echo'
-    else
-      ld_shlibs_CXX=no
-    fi
-    ;;
-  osf3*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      cxx*)
-	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	  hardcode_libdir_separator_CXX=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  osf4* | osf5*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Archives containing C++ object files must be created using
-	# the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      cxx*)
-	allow_undefined_flag_CXX=' -expect_unresolved \*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
-	  $rm $lib.exp'
-
-	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	  hardcode_libdir_separator_CXX=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.x
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      lcc*)
-	# Lucid
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.2, 5.x and Centerline C++
-        archive_cmds_need_lc_CXX=yes
-	no_undefined_flag_CXX=' -zdefs'
-	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	hardcode_libdir_flag_spec_CXX='-R$libdir'
-	hardcode_shlibpath_var_CXX=no
-	case $host_os in
-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
-	  *)
-	    # The compiler driver will combine and reorder linker options,
-	    # but understands `-z linker_flag'.
-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
-	    ;;
-	esac
-	link_all_deplibs_CXX=yes
-
-	output_verbose_link_cmd='echo'
-
-	# Archives containing C++ object files must be created using
-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-	;;
-      gcx*)
-	# Green Hills C++ Compiler
-	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	# The C++ compiler must be used to create the archive.
-	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	;;
-      *)
-	# GNU C++ compiler with Solaris linker
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  else
-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	    # platform.
-	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  fi
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-	  case $host_os in
-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
-	  *)
-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	    ;;
-	  esac
-	fi
-	;;
-    esac
-    ;;
-  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-    no_undefined_flag_CXX='${wl}-z,text'
-    archive_cmds_need_lc_CXX=no
-    hardcode_shlibpath_var_CXX=no
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  sysv5* | sco3.2v5* | sco5v6*)
-    # Note: We can NOT use -z defs as we might desire, because we do not
-    # link with -lc, and that would cause any symbols used from libc to
-    # always be unresolved, which means just about no library would
-    # ever link correctly.  If we're not using GNU ld we use -z text
-    # though, which does catch some bad symbols but isn't as heavy-handed
-    # as -z defs.
-    # For security reasons, it is highly recommended that you always
-    # use absolute paths for naming shared libraries, and exclude the
-    # DT_RUNPATH tag from executables and libraries.  But doing so
-    # requires that you compile everything twice, which is a pain.
-    # So that behaviour is only enabled if SCOABSPATH is set to a
-    # non-empty value in the environment.  Most likely only useful for
-    # creating official distributions of packages.
-    # This is a hack until libtool officially supports absolute path
-    # names for shared libraries.
-    no_undefined_flag_CXX='${wl}-z,text'
-    allow_undefined_flag_CXX='${wl}-z,nodefs'
-    archive_cmds_need_lc_CXX=no
-    hardcode_shlibpath_var_CXX=no
-    hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-    hardcode_libdir_separator_CXX=':'
-    link_all_deplibs_CXX=yes
-    export_dynamic_flag_spec_CXX='${wl}-Bexport'
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC*)
-	# NonStop-UX NCC 3.20
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
-
-GCC_CXX="$GXX"
-LD_CXX="$LD"
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-
-  for p in `eval $output_verbose_link_cmd`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" \
-	  || test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$compiler_lib_search_path_CXX"; then
-	     compiler_lib_search_path_CXX="${prev}${p}"
-	   else
-	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$postdeps_CXX"; then
-	   postdeps_CXX="${prev}${p}"
-	 else
-	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$predep_objects_CXX"; then
-	   predep_objects_CXX="$p"
-	 else
-	   predep_objects_CXX="$predep_objects_CXX $p"
-	 fi
-       else
-	 if test -z "$postdep_objects_CXX"; then
-	   postdep_objects_CXX="$p"
-	 else
-	   postdep_objects_CXX="$postdep_objects_CXX $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling CXX test program"
-fi
-
-$rm -f confest.$objext
-
-compiler_lib_search_dirs_CXX=
-if test -n "$compiler_lib_search_path_CXX"; then
-  compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-
-# PORTME: override above test on systems where it is broken
-case $host_os in
-interix[3-9]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  predep_objects_CXX=
-  postdep_objects_CXX=
-  postdeps_CXX=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-    #
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-    if test "$solaris_use_stlport4" != yes; then
-      postdeps_CXX='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      postdeps_CXX='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-
-case " $postdeps_CXX " in
-*" -lc "*) archive_cmds_need_lc_CXX=no ;;
-esac
-
-lt_prog_compiler_wl_CXX=
-lt_prog_compiler_pic_CXX=
-lt_prog_compiler_static_CXX=
-
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    lt_prog_compiler_wl_CXX='-Wl,'
-    lt_prog_compiler_static_CXX='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_CXX='-Bstatic'
-      fi
-      ;;
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
-      ;;
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_CXX='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      lt_prog_compiler_pic_CXX=
-      ;;
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_CXX=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	;;
-      *)
-	lt_prog_compiler_pic_CXX='-fPIC'
-	;;
-      esac
-      ;;
-    *)
-      lt_prog_compiler_pic_CXX='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[4-9]*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  lt_prog_compiler_static_CXX='-Bstatic'
-	else
-	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-       darwin*)
-         # PIC is the default on this platform
-         # Common symbols not allowed in MH_DYLIB files
-         case $cc_basename in
-           xlc*)
-           lt_prog_compiler_pic_CXX='-qnocommon'
-           lt_prog_compiler_wl_CXX='-Wl,'
-           ;;
-         esac
-       ;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      lt_prog_compiler_pic_CXX='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      lt_prog_compiler_pic_CXX='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    ;;
-	  icpc* | ecpc*)
-	    # Intel C++
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler.
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-fpic'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      lt_prog_compiler_pic_CXX='-KPIC'
-	      lt_prog_compiler_static_CXX='-Bstatic'
-	      lt_prog_compiler_wl_CXX='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    lt_prog_compiler_pic_CXX='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    lt_prog_compiler_wl_CXX='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    lt_prog_compiler_pic_CXX='-pic'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	lt_prog_compiler_can_build_shared_CXX=no
-	;;
-    esac
-  fi
-
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_CXX"; then
-
-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works_CXX=no
-  ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17364: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:17368: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works_CXX=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-    case $lt_prog_compiler_pic_CXX in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-     esac
-else
-    lt_prog_compiler_pic_CXX=
-     lt_prog_compiler_can_build_shared_CXX=no
-fi
-
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_CXX=
-    ;;
-  *)
-    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works_CXX=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works_CXX=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works_CXX=yes
-     fi
-   fi
-   $rm -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-    :
-else
-    lt_prog_compiler_static_CXX=
-fi
-
-
-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_CXX=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17468: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:17472: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_CXX=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix[4-9]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-    else
-      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    export_symbols_cmds_CXX="$ltdll_cmds"
-  ;;
-  cygwin* | mingw*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-  ;;
-  *)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_CXX" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_CXX=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_CXX in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $rm conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_CXX
-	pic_flag=$lt_prog_compiler_pic_CXX
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-        allow_undefined_flag_CXX=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_CXX=no
-        else
-	  archive_cmds_need_lc_CXX=yes
-        fi
-        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-$as_echo "$archive_cmds_need_lc_CXX" >&6; }
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[123]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix[3-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-fi
-
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-fi
-
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action_CXX=
-if test -n "$hardcode_libdir_flag_spec_CXX" || \
-   test -n "$runpath_var_CXX" || \
-   test "X$hardcode_automatic_CXX" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_CXX" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
-     test "$hardcode_minus_L_CXX" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_CXX=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_CXX=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_CXX=unsupported
-fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-$as_echo "$hardcode_action_CXX" >&6; }
-
-if test "$hardcode_action_CXX" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_CXX \
-    CC_CXX \
-    LD_CXX \
-    lt_prog_compiler_wl_CXX \
-    lt_prog_compiler_pic_CXX \
-    lt_prog_compiler_static_CXX \
-    lt_prog_compiler_no_builtin_flag_CXX \
-    export_dynamic_flag_spec_CXX \
-    thread_safe_flag_spec_CXX \
-    whole_archive_flag_spec_CXX \
-    enable_shared_with_static_runtimes_CXX \
-    old_archive_cmds_CXX \
-    old_archive_from_new_cmds_CXX \
-    predep_objects_CXX \
-    postdep_objects_CXX \
-    predeps_CXX \
-    postdeps_CXX \
-    compiler_lib_search_path_CXX \
-    compiler_lib_search_dirs_CXX \
-    archive_cmds_CXX \
-    archive_expsym_cmds_CXX \
-    postinstall_cmds_CXX \
-    postuninstall_cmds_CXX \
-    old_archive_from_expsyms_cmds_CXX \
-    allow_undefined_flag_CXX \
-    no_undefined_flag_CXX \
-    export_symbols_cmds_CXX \
-    hardcode_libdir_flag_spec_CXX \
-    hardcode_libdir_flag_spec_ld_CXX \
-    hardcode_libdir_separator_CXX \
-    hardcode_automatic_CXX \
-    module_cmds_CXX \
-    module_expsym_cmds_CXX \
-    lt_cv_prog_compiler_c_o_CXX \
-    fix_srcfile_path_CXX \
-    exclude_expsyms_CXX \
-    include_expsyms_CXX; do
-
-    case $var in
-    old_archive_cmds_CXX | \
-    old_archive_from_new_cmds_CXX | \
-    archive_cmds_CXX | \
-    archive_expsym_cmds_CXX | \
-    module_cmds_CXX | \
-    module_expsym_cmds_CXX | \
-    old_archive_from_expsyms_cmds_CXX | \
-    export_symbols_cmds_CXX | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler_CXX
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_CXX
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_CXX
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_CXX
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_CXX
-
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_CXX
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_CXX
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_CXX
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_CXX
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_CXX
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_CXX
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_CXX
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_CXX
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_CXX
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-
-
-archive_cmds_need_lc_F77=no
-allow_undefined_flag_F77=
-always_export_symbols_F77=no
-archive_expsym_cmds_F77=
-export_dynamic_flag_spec_F77=
-hardcode_direct_F77=no
-hardcode_libdir_flag_spec_F77=
-hardcode_libdir_flag_spec_ld_F77=
-hardcode_libdir_separator_F77=
-hardcode_minus_L_F77=no
-hardcode_automatic_F77=no
-module_cmds_F77=
-module_expsym_cmds_F77=
-link_all_deplibs_F77=unknown
-old_archive_cmds_F77=$old_archive_cmds
-no_undefined_flag_F77=
-whole_archive_flag_spec_F77=
-enable_shared_with_static_runtimes_F77=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-objext_F77=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="\
-      program t
-      end
-"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-compiler_F77=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-aix[4-9]*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-esac
-{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-GCC_F77="$G77"
-LD_F77="$LD"
-
-lt_prog_compiler_wl_F77=
-lt_prog_compiler_pic_F77=
-lt_prog_compiler_static_F77=
-
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl_F77='-Wl,'
-    lt_prog_compiler_static_F77='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_F77='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_F77='-fno-common'
-      ;;
-
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared_F77=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_F77=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_F77='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic_F77='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_F77='-Bstatic'
-      else
-	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         lt_prog_compiler_pic_F77='-qnocommon'
-         lt_prog_compiler_wl_F77='-Wl,'
-         ;;
-       esac
-       ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_F77='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    linux* | k*bsd*-gnu)
-      case $cc_basename in
-      icc* | ecc*)
-	lt_prog_compiler_wl_F77='-Wl,'
-	lt_prog_compiler_pic_F77='-KPIC'
-	lt_prog_compiler_static_F77='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl_F77='-Wl,'
-	lt_prog_compiler_pic_F77='-fpic'
-	lt_prog_compiler_static_F77='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_F77='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_F77='-non_shared'
-        ;;
-      *)
-        case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic_F77='-KPIC'
-	  lt_prog_compiler_static_F77='-Bstatic'
-	  lt_prog_compiler_wl_F77='-Wl,'
-	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic_F77='-KPIC'
-	  lt_prog_compiler_static_F77='-Bstatic'
-	  lt_prog_compiler_wl_F77=''
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	lt_prog_compiler_wl_F77='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl_F77='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl_F77='-Qoption ld '
-      lt_prog_compiler_pic_F77='-PIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic_F77='-Kconform_pic'
-	lt_prog_compiler_static_F77='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_can_build_shared_F77=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic_F77='-pic'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared_F77=no
-      ;;
-    esac
-  fi
-
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-$as_echo "$lt_prog_compiler_pic_F77" >&6; }
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_F77"; then
-
-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works_F77=no
-  ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_F77"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19053: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:19057: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works_F77=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
-    case $lt_prog_compiler_pic_F77 in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-     esac
-else
-    lt_prog_compiler_pic_F77=
-     lt_prog_compiler_can_build_shared_F77=no
-fi
-
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_F77=
-    ;;
-  *)
-    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works_F77=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works_F77=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works_F77=yes
-     fi
-   fi
-   $rm -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
-$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
-    :
-else
-    lt_prog_compiler_static_F77=
-fi
-
-
-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_F77=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19157: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:19161: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_F77=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  runpath_var=
-  allow_undefined_flag_F77=
-  enable_shared_with_static_runtimes_F77=no
-  archive_cmds_F77=
-  archive_expsym_cmds_F77=
-  old_archive_From_new_cmds_F77=
-  old_archive_from_expsyms_cmds_F77=
-  export_dynamic_flag_spec_F77=
-  whole_archive_flag_spec_F77=
-  thread_safe_flag_spec_F77=
-  hardcode_libdir_flag_spec_F77=
-  hardcode_libdir_flag_spec_ld_F77=
-  hardcode_libdir_separator_F77=
-  hardcode_direct_F77=no
-  hardcode_minus_L_F77=no
-  hardcode_shlibpath_var_F77=unsupported
-  link_all_deplibs_F77=unknown
-  hardcode_automatic_F77=no
-  module_cmds_F77=
-  module_expsym_cmds_F77=
-  always_export_symbols_F77=no
-  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms_F77=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs_F77=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_F77=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs_F77=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs_F77=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag_F77=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      allow_undefined_flag_F77=unsupported
-      always_export_symbols_F77=no
-      enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct_F77=no
-      hardcode_shlibpath_var_F77=no
-      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec_F77='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | k*bsd*-gnu)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
-	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	*)
-	  tmp_sharedflag='-shared' ;;
-	esac
-	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-	if test $supports_anon_versioning = yes; then
-	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs_F77=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs_F77=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-	  else
-	    ld_shlibs_F77=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs_F77" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec_F77=
-      export_dynamic_flag_spec_F77=
-      whole_archive_flag_spec_F77=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag_F77=unsupported
-      always_export_symbols_F77=yes
-      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L_F77=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct_F77=unsupported
-      fi
-      ;;
-
-    aix[4-9]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds_F77=''
-      hardcode_direct_F77=yes
-      hardcode_libdir_separator_F77=':'
-      link_all_deplibs_F77=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  :
-	  else
-  	  # We have old collect2
-  	  hardcode_direct_F77=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  hardcode_minus_L_F77=yes
-  	  hardcode_libdir_flag_spec_F77='-L$libdir'
-  	  hardcode_libdir_separator_F77=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols_F77=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag_F77='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_f77_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag_F77="-z nodefs"
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_f77_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag_F77=' ${wl}-bernotok'
-	  allow_undefined_flag_F77=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_F77='$convenience'
-	  archive_cmds_need_lc_F77=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs_F77=no
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec_F77=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec_F77=' '
-      allow_undefined_flag_F77=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds_F77='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_F77=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      archive_cmds_need_lc_F77=no
-      hardcode_direct_F77=no
-      hardcode_automatic_F77=yes
-      hardcode_shlibpath_var_F77=unsupported
-      whole_archive_flag_spec_F77=''
-      link_all_deplibs_F77=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-        module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-        archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-        module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs_F77=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs_F77=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      hardcode_direct_F77=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_F77=yes
-      export_dynamic_flag_spec_F77='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_F77=:
-
-	hardcode_direct_F77=yes
-	export_dynamic_flag_spec_F77='${wl}-E'
-
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L_F77=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_F77=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-	  hardcode_direct_F77=no
-	  hardcode_shlibpath_var_F77=no
-	  ;;
-	*)
-	  hardcode_direct_F77=yes
-	  export_dynamic_flag_spec_F77='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_F77=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      link_all_deplibs_F77=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    newsos6)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct_F77=yes
-	hardcode_shlibpath_var_F77=no
-	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec_F77='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec_F77='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-        fi
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-      allow_undefined_flag_F77=unsupported
-      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag_F77=' -expect_unresolved \*'
-	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag_F77=' -expect_unresolved \*'
-	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-      fi
-      hardcode_libdir_separator_F77=:
-      ;;
-
-    solaris*)
-      no_undefined_flag_F77=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	wlarc=''
-	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_shlibpath_var_F77=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs_F77=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_F77=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds_F77='$CC -r -o $output$reload_objs'
-	  hardcode_direct_F77=no
-        ;;
-	motorola)
-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_F77=no
-      export_dynamic_flag_spec_F77='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var_F77=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs_F77=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag_F77='${wl}-z,text'
-      archive_cmds_need_lc_F77=no
-      hardcode_shlibpath_var_F77=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag_F77='${wl}-z,text'
-      allow_undefined_flag_F77='${wl}-z,nodefs'
-      archive_cmds_need_lc_F77=no
-      hardcode_shlibpath_var_F77=no
-      hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      hardcode_libdir_separator_F77=':'
-      link_all_deplibs_F77=yes
-      export_dynamic_flag_spec_F77='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    *)
-      ld_shlibs_F77=no
-      ;;
-    esac
-  fi
-
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-$as_echo "$ld_shlibs_F77" >&6; }
-test "$ld_shlibs_F77" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_F77" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_F77=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_F77 in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $rm conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_F77
-	pic_flag=$lt_prog_compiler_pic_F77
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
-        allow_undefined_flag_F77=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_F77=no
-        else
-	  archive_cmds_need_lc_F77=yes
-        fi
-        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-$as_echo "$archive_cmds_need_lc_F77" >&6; }
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[123]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix[3-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-fi
-
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-fi
-
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action_F77=
-if test -n "$hardcode_libdir_flag_spec_F77" || \
-   test -n "$runpath_var_F77" || \
-   test "X$hardcode_automatic_F77" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_F77" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
-     test "$hardcode_minus_L_F77" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_F77=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_F77=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_F77=unsupported
-fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-$as_echo "$hardcode_action_F77" >&6; }
-
-if test "$hardcode_action_F77" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_F77 \
-    CC_F77 \
-    LD_F77 \
-    lt_prog_compiler_wl_F77 \
-    lt_prog_compiler_pic_F77 \
-    lt_prog_compiler_static_F77 \
-    lt_prog_compiler_no_builtin_flag_F77 \
-    export_dynamic_flag_spec_F77 \
-    thread_safe_flag_spec_F77 \
-    whole_archive_flag_spec_F77 \
-    enable_shared_with_static_runtimes_F77 \
-    old_archive_cmds_F77 \
-    old_archive_from_new_cmds_F77 \
-    predep_objects_F77 \
-    postdep_objects_F77 \
-    predeps_F77 \
-    postdeps_F77 \
-    compiler_lib_search_path_F77 \
-    compiler_lib_search_dirs_F77 \
-    archive_cmds_F77 \
-    archive_expsym_cmds_F77 \
-    postinstall_cmds_F77 \
-    postuninstall_cmds_F77 \
-    old_archive_from_expsyms_cmds_F77 \
-    allow_undefined_flag_F77 \
-    no_undefined_flag_F77 \
-    export_symbols_cmds_F77 \
-    hardcode_libdir_flag_spec_F77 \
-    hardcode_libdir_flag_spec_ld_F77 \
-    hardcode_libdir_separator_F77 \
-    hardcode_automatic_F77 \
-    module_cmds_F77 \
-    module_expsym_cmds_F77 \
-    lt_cv_prog_compiler_c_o_F77 \
-    fix_srcfile_path_F77 \
-    exclude_expsyms_F77 \
-    include_expsyms_F77; do
-
-    case $var in
-    old_archive_cmds_F77 | \
-    old_archive_from_new_cmds_F77 | \
-    archive_cmds_F77 | \
-    archive_expsym_cmds_F77 | \
-    module_cmds_F77 | \
-    module_expsym_cmds_F77 | \
-    old_archive_from_expsyms_cmds_F77 | \
-    export_symbols_cmds_F77 | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_F77
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler_F77
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_F77
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_F77
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_F77
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_F77
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_F77
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_F77
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_F77
-archive_expsym_cmds=$lt_archive_expsym_cmds_F77
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_F77
-module_expsym_cmds=$lt_module_expsym_cmds_F77
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_F77
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_F77
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_F77
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_F77
-
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_F77
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_F77
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_F77
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_F77
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_F77
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_F77
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_F77
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_F77
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_F77
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_F77
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_F77
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      GCJ)
-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-objext_GCJ=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-compiler_GCJ=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-archive_cmds_need_lc_GCJ=no
-
-old_archive_cmds_GCJ=$old_archive_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-
-lt_prog_compiler_no_builtin_flag_GCJ=
-
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-
-
-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-  ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21378: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:21382: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-lt_prog_compiler_wl_GCJ=
-lt_prog_compiler_pic_GCJ=
-lt_prog_compiler_static_GCJ=
-
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl_GCJ='-Wl,'
-    lt_prog_compiler_static_GCJ='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_GCJ='-fno-common'
-      ;;
-
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared_GCJ=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_GCJ=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_GCJ='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic_GCJ='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      else
-	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         lt_prog_compiler_pic_GCJ='-qnocommon'
-         lt_prog_compiler_wl_GCJ='-Wl,'
-         ;;
-       esac
-       ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_GCJ='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    linux* | k*bsd*-gnu)
-      case $cc_basename in
-      icc* | ecc*)
-	lt_prog_compiler_wl_GCJ='-Wl,'
-	lt_prog_compiler_pic_GCJ='-KPIC'
-	lt_prog_compiler_static_GCJ='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl_GCJ='-Wl,'
-	lt_prog_compiler_pic_GCJ='-fpic'
-	lt_prog_compiler_static_GCJ='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_GCJ='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_GCJ='-non_shared'
-        ;;
-      *)
-        case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic_GCJ='-KPIC'
-	  lt_prog_compiler_static_GCJ='-Bstatic'
-	  lt_prog_compiler_wl_GCJ='-Wl,'
-	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic_GCJ='-KPIC'
-	  lt_prog_compiler_static_GCJ='-Bstatic'
-	  lt_prog_compiler_wl_GCJ=''
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl_GCJ='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl_GCJ='-Qoption ld '
-      lt_prog_compiler_pic_GCJ='-PIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic_GCJ='-Kconform_pic'
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_can_build_shared_GCJ=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic_GCJ='-pic'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared_GCJ=no
-      ;;
-    esac
-  fi
-
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_GCJ"; then
-
-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works_GCJ=no
-  ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21668: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:21672: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works_GCJ=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
-    case $lt_prog_compiler_pic_GCJ in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-     esac
-else
-    lt_prog_compiler_pic_GCJ=
-     lt_prog_compiler_can_build_shared_GCJ=no
-fi
-
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_GCJ=
-    ;;
-  *)
-    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works_GCJ=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works_GCJ=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works_GCJ=yes
-     fi
-   fi
-   $rm -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
-$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
-    :
-else
-    lt_prog_compiler_static_GCJ=
-fi
-
-
-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_GCJ=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21772: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:21776: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_GCJ=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  runpath_var=
-  allow_undefined_flag_GCJ=
-  enable_shared_with_static_runtimes_GCJ=no
-  archive_cmds_GCJ=
-  archive_expsym_cmds_GCJ=
-  old_archive_From_new_cmds_GCJ=
-  old_archive_from_expsyms_cmds_GCJ=
-  export_dynamic_flag_spec_GCJ=
-  whole_archive_flag_spec_GCJ=
-  thread_safe_flag_spec_GCJ=
-  hardcode_libdir_flag_spec_GCJ=
-  hardcode_libdir_flag_spec_ld_GCJ=
-  hardcode_libdir_separator_GCJ=
-  hardcode_direct_GCJ=no
-  hardcode_minus_L_GCJ=no
-  hardcode_shlibpath_var_GCJ=unsupported
-  link_all_deplibs_GCJ=unknown
-  hardcode_automatic_GCJ=no
-  module_cmds_GCJ=
-  module_expsym_cmds_GCJ=
-  always_export_symbols_GCJ=no
-  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms_GCJ=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs_GCJ=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_GCJ=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs_GCJ=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs_GCJ=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag_GCJ=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      allow_undefined_flag_GCJ=unsupported
-      always_export_symbols_GCJ=no
-      enable_shared_with_static_runtimes_GCJ=yes
-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec_GCJ='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | k*bsd*-gnu)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
-	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	*)
-	  tmp_sharedflag='-shared' ;;
-	esac
-	archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-	if test $supports_anon_versioning = yes; then
-	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs_GCJ=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs_GCJ=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-	  else
-	    ld_shlibs_GCJ=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs_GCJ" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec_GCJ=
-      export_dynamic_flag_spec_GCJ=
-      whole_archive_flag_spec_GCJ=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag_GCJ=unsupported
-      always_export_symbols_GCJ=yes
-      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L_GCJ=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct_GCJ=unsupported
-      fi
-      ;;
-
-    aix[4-9]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds_GCJ=''
-      hardcode_direct_GCJ=yes
-      hardcode_libdir_separator_GCJ=':'
-      link_all_deplibs_GCJ=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  :
-	  else
-  	  # We have old collect2
-  	  hardcode_direct_GCJ=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  hardcode_minus_L_GCJ=yes
-  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
-  	  hardcode_libdir_separator_GCJ=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols_GCJ=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag_GCJ='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag_GCJ="-z nodefs"
-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag_GCJ=' ${wl}-bernotok'
-	  allow_undefined_flag_GCJ=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_GCJ='$convenience'
-	  archive_cmds_need_lc_GCJ=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs_GCJ=no
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec_GCJ=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec_GCJ=' '
-      allow_undefined_flag_GCJ=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds_GCJ='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_GCJ=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      archive_cmds_need_lc_GCJ=no
-      hardcode_direct_GCJ=no
-      hardcode_automatic_GCJ=yes
-      hardcode_shlibpath_var_GCJ=unsupported
-      whole_archive_flag_spec_GCJ=''
-      link_all_deplibs_GCJ=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-        module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-        archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-        module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs_GCJ=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs_GCJ=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      hardcode_direct_GCJ=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_GCJ=yes
-      export_dynamic_flag_spec_GCJ='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_GCJ=:
-
-	hardcode_direct_GCJ=yes
-	export_dynamic_flag_spec_GCJ='${wl}-E'
-
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L_GCJ=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_GCJ=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-	  hardcode_direct_GCJ=no
-	  hardcode_shlibpath_var_GCJ=no
-	  ;;
-	*)
-	  hardcode_direct_GCJ=yes
-	  export_dynamic_flag_spec_GCJ='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_GCJ=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      link_all_deplibs_GCJ=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    newsos6)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct_GCJ=yes
-	hardcode_shlibpath_var_GCJ=no
-	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec_GCJ='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec_GCJ='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-        fi
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-      allow_undefined_flag_GCJ=unsupported
-      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-      fi
-      hardcode_libdir_separator_GCJ=:
-      ;;
-
-    solaris*)
-      no_undefined_flag_GCJ=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	wlarc=''
-	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs_GCJ=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_GCJ=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
-	  hardcode_direct_GCJ=no
-        ;;
-	motorola)
-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_GCJ=no
-      export_dynamic_flag_spec_GCJ='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var_GCJ=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs_GCJ=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag_GCJ='${wl}-z,text'
-      archive_cmds_need_lc_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag_GCJ='${wl}-z,text'
-      allow_undefined_flag_GCJ='${wl}-z,nodefs'
-      archive_cmds_need_lc_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      hardcode_libdir_separator_GCJ=':'
-      link_all_deplibs_GCJ=yes
-      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    *)
-      ld_shlibs_GCJ=no
-      ;;
-    esac
-  fi
-
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-$as_echo "$ld_shlibs_GCJ" >&6; }
-test "$ld_shlibs_GCJ" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_GCJ" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_GCJ=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_GCJ in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $rm conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_GCJ
-	pic_flag=$lt_prog_compiler_pic_GCJ
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
-        allow_undefined_flag_GCJ=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_GCJ=no
-        else
-	  archive_cmds_need_lc_GCJ=yes
-        fi
-        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-$as_echo "$archive_cmds_need_lc_GCJ" >&6; }
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[123]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix[3-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-fi
-
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-fi
-
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action_GCJ=
-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-   test -n "$runpath_var_GCJ" || \
-   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_GCJ" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
-     test "$hardcode_minus_L_GCJ" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_GCJ=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_GCJ=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_GCJ=unsupported
-fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-$as_echo "$hardcode_action_GCJ" >&6; }
-
-if test "$hardcode_action_GCJ" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_GCJ \
-    CC_GCJ \
-    LD_GCJ \
-    lt_prog_compiler_wl_GCJ \
-    lt_prog_compiler_pic_GCJ \
-    lt_prog_compiler_static_GCJ \
-    lt_prog_compiler_no_builtin_flag_GCJ \
-    export_dynamic_flag_spec_GCJ \
-    thread_safe_flag_spec_GCJ \
-    whole_archive_flag_spec_GCJ \
-    enable_shared_with_static_runtimes_GCJ \
-    old_archive_cmds_GCJ \
-    old_archive_from_new_cmds_GCJ \
-    predep_objects_GCJ \
-    postdep_objects_GCJ \
-    predeps_GCJ \
-    postdeps_GCJ \
-    compiler_lib_search_path_GCJ \
-    compiler_lib_search_dirs_GCJ \
-    archive_cmds_GCJ \
-    archive_expsym_cmds_GCJ \
-    postinstall_cmds_GCJ \
-    postuninstall_cmds_GCJ \
-    old_archive_from_expsyms_cmds_GCJ \
-    allow_undefined_flag_GCJ \
-    no_undefined_flag_GCJ \
-    export_symbols_cmds_GCJ \
-    hardcode_libdir_flag_spec_GCJ \
-    hardcode_libdir_flag_spec_ld_GCJ \
-    hardcode_libdir_separator_GCJ \
-    hardcode_automatic_GCJ \
-    module_cmds_GCJ \
-    module_expsym_cmds_GCJ \
-    lt_cv_prog_compiler_c_o_GCJ \
-    fix_srcfile_path_GCJ \
-    exclude_expsyms_GCJ \
-    include_expsyms_GCJ; do
-
-    case $var in
-    old_archive_cmds_GCJ | \
-    old_archive_from_new_cmds_GCJ | \
-    archive_cmds_GCJ | \
-    archive_expsym_cmds_GCJ | \
-    module_cmds_GCJ | \
-    module_expsym_cmds_GCJ | \
-    old_archive_from_expsyms_cmds_GCJ | \
-    export_symbols_cmds_GCJ | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_GCJ
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler_GCJ
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_GCJ
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_GCJ
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_GCJ
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_GCJ
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_GCJ
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_GCJ
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_GCJ
-archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_GCJ
-module_expsym_cmds=$lt_module_expsym_cmds_GCJ
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_GCJ
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_GCJ
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_GCJ
-
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_GCJ
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_GCJ
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_GCJ
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_GCJ
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_GCJ
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_GCJ
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_GCJ
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_GCJ
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_GCJ
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_GCJ
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_GCJ
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      RC)
-
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-objext_RC=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-compiler_RC=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-lt_cv_prog_compiler_c_o_RC=yes
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_RC \
-    CC_RC \
-    LD_RC \
-    lt_prog_compiler_wl_RC \
-    lt_prog_compiler_pic_RC \
-    lt_prog_compiler_static_RC \
-    lt_prog_compiler_no_builtin_flag_RC \
-    export_dynamic_flag_spec_RC \
-    thread_safe_flag_spec_RC \
-    whole_archive_flag_spec_RC \
-    enable_shared_with_static_runtimes_RC \
-    old_archive_cmds_RC \
-    old_archive_from_new_cmds_RC \
-    predep_objects_RC \
-    postdep_objects_RC \
-    predeps_RC \
-    postdeps_RC \
-    compiler_lib_search_path_RC \
-    compiler_lib_search_dirs_RC \
-    archive_cmds_RC \
-    archive_expsym_cmds_RC \
-    postinstall_cmds_RC \
-    postuninstall_cmds_RC \
-    old_archive_from_expsyms_cmds_RC \
-    allow_undefined_flag_RC \
-    no_undefined_flag_RC \
-    export_symbols_cmds_RC \
-    hardcode_libdir_flag_spec_RC \
-    hardcode_libdir_flag_spec_ld_RC \
-    hardcode_libdir_separator_RC \
-    hardcode_automatic_RC \
-    module_cmds_RC \
-    module_expsym_cmds_RC \
-    lt_cv_prog_compiler_c_o_RC \
-    fix_srcfile_path_RC \
-    exclude_expsyms_RC \
-    include_expsyms_RC; do
-
-    case $var in
-    old_archive_cmds_RC | \
-    old_archive_from_new_cmds_RC | \
-    archive_cmds_RC | \
-    archive_expsym_cmds_RC | \
-    module_cmds_RC | \
-    module_expsym_cmds_RC | \
-    old_archive_from_expsyms_cmds_RC | \
-    export_symbols_cmds_RC | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_RC
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler_RC
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_RC
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_RC
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_RC
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_RC
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_RC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_RC
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_RC
-archive_expsym_cmds=$lt_archive_expsym_cmds_RC
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_RC
-module_expsym_cmds=$lt_module_expsym_cmds_RC
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_RC
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_RC
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_RC
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_RC
-
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_RC
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_RC
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_RC
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_RC
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_RC
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_RC
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_RC
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_RC
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_RC
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_RC
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_RC
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-	;;
-
-      *)
-	{ { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
-	;;
-      esac
-
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(apr_builddir)/libtool'
-
-# Prevent multiple expansion
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        # get libtool's setting of shlibpath_var
-        eval `grep "^shlibpath_var=[A-Z_]*$" $apr_builddir/libtool`
-        if test "x$shlibpath_var" = "x"; then
-            shlibpath_var=REPLACE_WITH_YOUR_SHLIBPATH_VAR
-        fi
-    fi
-    ;;
-esac
-
-
-# Check whether --with-installbuilddir was given.
-if test "${with_installbuilddir+set}" = set; then
-  withval=$with_installbuilddir;  installbuilddir=$withval
-else
-   installbuilddir="${datadir}/build"
-fi
-
-
-
-
-# Check whether --with-libtool was given.
-if test "${with_libtool+set}" = set; then
-  withval=$with_libtool;  use_libtool=$withval
-else
-   use_libtool="yes"
-fi
-
-
-if test "x$use_libtool" = "xyes"; then
-      lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -c $< && touch $@'
-      LT_VERSION="-version-info `$get_version libtool $version_hdr APR`"
-      link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${LT_VERSION} \$(ALL_LDFLAGS) -o \$@"
-      so_ext='lo'
-      lib_target='-rpath $(libdir) $$objects'
-      export_lib_target='-rpath \$(libdir) \$\$objects'
-else
-      lt_compile='$(COMPILE) -c $<'
-      link='$(AR) cr $(TARGET_LIB) $$objects; $(RANLIB) $(TARGET_LIB)'
-      so_ext='o'
-      lib_target=''
-      export_lib_target=''
-fi
-
-case $host in
-    *-solaris2*)
-        apr_platform_runtime_link_flag="-R"
-        ;;
-    *)
-        ;;
-esac
-
-
-
-
-
-
-
-
-
-
-nl='
-'
-echo "${nl}Check for compiler flags..."
-
-
-case $host in
-    *os390)
-        if test "$ac_test_CFLAGS" != set; then
-
-  if test "x$CFLAGS" = "x-g"; then
-    echo "  nulling CFLAGS"
-    CFLAGS=""
-  else
-    apr_new_bugger=""
-    apr_removed=0
-    for i in $CFLAGS; do
-      if test "x$i" != "x-g"; then
-        apr_new_bugger="$apr_new_bugger $i"
-      else
-        apr_removed=1
-      fi
-    done
-    if test $apr_removed = "1"; then
-      echo "  removed \"-g\" from CFLAGS"
-      CFLAGS=$apr_new_bugger
-    fi
-  fi
-
-        fi
-        ;;
-esac
-
-# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then
-  enableval=$enable_debug;
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-g\""
-    CFLAGS="-g"
-  else
-    apr_addto_bugger="-g"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-   if test "$GCC" = "yes"; then
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-Wall\""
-    CFLAGS="-Wall"
-  else
-    apr_addto_bugger="-Wall"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-   elif test "$AIX_XLC" = "yes"; then
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-qfullpath\""
-    CFLAGS="-qfullpath"
-  else
-    apr_addto_bugger="-qfullpath"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-   fi
-
-fi
-
-# Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval=$enable_maintainer_mode;
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-g\""
-    CFLAGS="-g"
-  else
-    apr_addto_bugger="-g"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-   if test "$GCC" = "yes"; then
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations\""
-    CFLAGS="-Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations"
-  else
-    apr_addto_bugger="-Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-   elif test "$AIX_XLC" = "yes"; then
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-qfullpath -qinitauto=FE -qcheck=all -qinfo=pro\""
-    CFLAGS="-qfullpath -qinitauto=FE -qcheck=all -qinfo=pro"
-  else
-    apr_addto_bugger="-qfullpath -qinitauto=FE -qcheck=all -qinfo=pro"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-   fi
-
-fi
-
-# Check whether --enable-profile was given.
-if test "${enable_profile+set}" = set; then
-  enableval=$enable_profile; if test "$GCC" = "yes"; then
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-pg\""
-    CFLAGS="-pg"
-  else
-    apr_addto_bugger="-pg"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$CFLAGS" = "x-g"; then
-    echo "  nulling CFLAGS"
-    CFLAGS=""
-  else
-    apr_new_bugger=""
-    apr_removed=0
-    for i in $CFLAGS; do
-      if test "x$i" != "x-g"; then
-        apr_new_bugger="$apr_new_bugger $i"
-      else
-        apr_removed=1
-      fi
-    done
-    if test $apr_removed = "1"; then
-      echo "  removed \"-g\" from CFLAGS"
-      CFLAGS=$apr_new_bugger
-    fi
-  fi
-
-    if test "$host" = "i586-pc-beos"; then
-
-  if test "x$CFLAGS" = "x-O2"; then
-    echo "  nulling CFLAGS"
-    CFLAGS=""
-  else
-    apr_new_bugger=""
-    apr_removed=0
-    for i in $CFLAGS; do
-      if test "x$i" != "x-O2"; then
-        apr_new_bugger="$apr_new_bugger $i"
-      else
-        apr_removed=1
-      fi
-    done
-    if test $apr_removed = "1"; then
-      echo "  removed \"-O2\" from CFLAGS"
-      CFLAGS=$apr_new_bugger
-    fi
-  fi
-
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-O1\""
-    CFLAGS="-O1"
-  else
-    apr_addto_bugger="-O1"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$LDFLAGS" = "x"; then
-    echo "  setting LDFLAGS to \"-p\""
-    LDFLAGS="-p"
-  else
-    apr_addto_bugger="-p"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LDFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LDFLAGS"
-        LDFLAGS="$LDFLAGS $i"
-      fi
-    done
-  fi
-
-    fi
-  fi
-
-fi
-
-# Check whether --enable-pool-debug was given.
-if test "${enable_pool_debug+set}" = set; then
-  enableval=$enable_pool_debug;  if test -z "$enableval"; then
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DAPR_POOL_DEBUG=1\""
-    CPPFLAGS="-DAPR_POOL_DEBUG=1"
-  else
-    apr_addto_bugger="-DAPR_POOL_DEBUG=1"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-    elif test ! "$enableval" = "no"; then
-        apr_pool_debug=1
-
-        for i in $enableval
-        do
-            flag=0
-
-            case $i in
-            yes)
-                flag=1
-                ;;
-            verbose)
-                flag=2
-                ;;
-            lifetime)
-                flag=4
-                ;;
-            owner)
-                flag=8
-                ;;
-            verbose-alloc)
-                flag=16
-                ;;
-            all)
-                apr_pool_debug=31
-                ;;
-            *)
-                ;;
-            esac
-
-            if test $flag -gt 0; then
-                apr_pool_debug=`expr '(' $apr_pool_debug - $apr_pool_debug % \
-                    '(' $flag '*' 2 ')' ')' + $flag + $apr_pool_debug % $flag`
-            fi
-        done
-
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DAPR_POOL_DEBUG=$apr_pool_debug\""
-    CPPFLAGS="-DAPR_POOL_DEBUG=$apr_pool_debug"
-  else
-    apr_addto_bugger="-DAPR_POOL_DEBUG=$apr_pool_debug"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-    fi
-
-fi
-
-
-
-# Check whether --with-efence was given.
-if test "${with_efence+set}" = set; then
-  withval=$with_efence;  apr_efence_dir="$withval"
-    if test "$apr_efence_dir" != "yes"; then
-
-  if test "x$LDFLAGS" = "x"; then
-    echo "  setting LDFLAGS to \"-L$apr_efence_dir/lib\""
-    LDFLAGS="-L$apr_efence_dir/lib"
-  else
-    apr_addto_bugger="-L$apr_efence_dir/lib"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LDFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LDFLAGS"
-        LDFLAGS="$LDFLAGS $i"
-      fi
-    done
-  fi
-
-      if test "x$apr_platform_runtime_link_flag" != "x"; then
-
-  if test "x$LDFLAGS" = "x"; then
-    echo "  setting LDFLAGS to \"$apr_platform_runtime_link_flag$apr_efence_dir/lib\""
-    LDFLAGS="$apr_platform_runtime_link_flag$apr_efence_dir/lib"
-  else
-    apr_addto_bugger="$apr_platform_runtime_link_flag$apr_efence_dir/lib"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LDFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LDFLAGS"
-        LDFLAGS="$LDFLAGS $i"
-      fi
-    done
-  fi
-
-      fi
-    fi
-    { $as_echo "$as_me:$LINENO: checking for malloc in -lefence" >&5
-$as_echo_n "checking for malloc in -lefence... " >&6; }
-if test "${ac_cv_lib_efence_malloc+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lefence  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char malloc ();
-int
-main ()
-{
-return malloc ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_efence_malloc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_efence_malloc=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_efence_malloc" >&5
-$as_echo "$ac_cv_lib_efence_malloc" >&6; }
-if test "x$ac_cv_lib_efence_malloc" = x""yes; then
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-lefence\""
-    LIBS="-lefence"
-  else
-    apr_addto_bugger="-lefence"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-else
-   { { $as_echo "$as_me:$LINENO: error: Electric Fence requested but not detected" >&5
-$as_echo "$as_me: error: Electric Fence requested but not detected" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-fi
-
-
-if test "$host" = "i586-pc-beos"; then
-  # Check whether --enable-malloc-debug was given.
-if test "${enable_malloc_debug+set}" = set; then
-  enableval=$enable_malloc_debug;
-  if test "x$CFLAGS" = "x-O2"; then
-    echo "  nulling CFLAGS"
-    CFLAGS=""
-  else
-    apr_new_bugger=""
-    apr_removed=0
-    for i in $CFLAGS; do
-      if test "x$i" != "x-O2"; then
-        apr_new_bugger="$apr_new_bugger $i"
-      else
-        apr_removed=1
-      fi
-    done
-    if test $apr_removed = "1"; then
-      echo "  removed \"-O2\" from CFLAGS"
-      CFLAGS=$apr_new_bugger
-    fi
-  fi
-
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-fcheck-memory-usage -D_KERNEL_MODE\""
-    CPPFLAGS="-fcheck-memory-usage -D_KERNEL_MODE"
-  else
-    apr_addto_bugger="-fcheck-memory-usage -D_KERNEL_MODE"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-fi
- fi
-
-# this is the place to put specific options for platform/compiler
-# combinations
-case "$host:$CC" in
-    *-hp-hpux*:cc )
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-Ae +Z\""
-    CFLAGS="-Ae +Z"
-  else
-    apr_addto_bugger="-Ae +Z"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-	case $host in
-	  ia64-* )
-	    ;;
-          * )
-	    if echo "$CFLAGS " | grep '+DA' >/dev/null; then :
-	    else
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"+DAportable\""
-    CFLAGS="+DAportable"
-  else
-    apr_addto_bugger="+DAportable"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-	    fi
-	    ;;
-        esac
-	;;
-    powerpc-*-beos:mwcc* )
-
-  echo "  forcing CPP to \"mwcc -E\""
-  CPP="mwcc -E"
-
-
-  echo "  forcing CC to \"mwcc\""
-  CC="mwcc"
-
-
-  echo "  forcing AR to \"ar\""
-  AR="ar"
-
-	;;
-esac
-
-
-if test "$GCC" = "yes"; then
-  MKDEP='$(CC) -MM'
-else
-  rm -f conftest.c
-  cat > conftest.c <<EOF
-#include <sys/types.h>
-  int main() { return 0; }
-EOF
-  MKDEP="true"
-  for i in "$CC -MM" "$CC -M" "$CPP -MM" "$CPP -M" "cpp -M"; do
-    { $as_echo "$as_me:$LINENO: checking if $i can create proper make dependencies" >&5
-$as_echo_n "checking if $i can create proper make dependencies... " >&6; }
-    if $i conftest.c 2>/dev/null | grep 'conftest.o: conftest.c' >/dev/null; then
-      MKDEP=$i
-      { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-      break;
-    fi
-    { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-  done
-  rm -f conftest.c
-fi
-
-
-
-
-# force_atomic_generic flag
-# this will be set we find a cpu/OS combo
-# which is historical and doesn't work with the method
-# we are using for the more up to date cpu/OS
-# (ie.. old sparcs)
-apr_force_atomic_generic=0
-proc_mutex_is_global=0
-nonportable_atomics_enabled=0
-
-# Check whether --enable-nonportable-atomics was given.
-if test "${enable_nonportable_atomics+set}" = set; then
-  enableval=$enable_nonportable_atomics;
-    if test "$enableval" = "yes"; then
-        nonportable_atomics_enabled=1
-    fi
-
-fi
-
-
-config_subdirs="none"
-INSTALL_SUBDIRS="none"
-case $host in
-   i386-ibm-aix* | *-ibm-aix[1-2].* | *-ibm-aix3.* | *-ibm-aix4.1 | *-ibm-aix4.1.* | *-ibm-aix4.2 | *-ibm-aix4.2.*)
-       OSDIR="aix"
-
-  if test "x$LDFLAGS" = "x"; then
-    echo "  setting LDFLAGS to \"-lld\""
-    LDFLAGS="-lld"
-  else
-    apr_addto_bugger="-lld"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LDFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LDFLAGS"
-        LDFLAGS="$LDFLAGS $i"
-      fi
-    done
-  fi
-
-       eolstr="\\n"
-       ;;
-   *-os2*)
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DOS2\""
-    CPPFLAGS="-DOS2"
-  else
-    apr_addto_bugger="-DOS2"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"-Zmt\""
-    CFLAGS="-Zmt"
-  else
-    apr_addto_bugger="-Zmt"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-
-{ $as_echo "$as_me:$LINENO: checking for random in -lbsd" >&5
-$as_echo_n "checking for random in -lbsd... " >&6; }
-if test "${ac_cv_lib_bsd_random+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbsd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char random ();
-int
-main ()
-{
-return random ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_bsd_random=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_bsd_random=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_random" >&5
-$as_echo "$ac_cv_lib_bsd_random" >&6; }
-if test "x$ac_cv_lib_bsd_random" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBBSD 1
-_ACEOF
-
-  LIBS="-lbsd $LIBS"
-
-fi
-
-       OSDIR="os2"
-       enable_threads="system_threads"
-       eolstr="\\r\\n"
-       file_as_socket="0"
-       proc_mutex_is_global=1
-       ;;
-   *beos*)
-       OSDIR="beos"
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DBEOS\""
-    CPPFLAGS="-DBEOS"
-  else
-    apr_addto_bugger="-DBEOS"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-       enable_threads="system_threads"
-       native_mmap_emul="1"
-
-  { $as_echo "$as_me:$LINENO: checking for BONE_VERSION in sys/socket.h" >&5
-$as_echo_n "checking for BONE_VERSION in sys/socket.h... " >&6; }
-if test "${ac_cv_define_BONE_VERSION+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <sys/socket.h>
-#ifdef BONE_VERSION
-YES_IS_DEFINED
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then
-  ac_cv_define_BONE_VERSION=yes
-else
-  ac_cv_define_BONE_VERSION=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_BONE_VERSION" >&5
-$as_echo "$ac_cv_define_BONE_VERSION" >&6; }
-  if test "$ac_cv_define_BONE_VERSION" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BONE_VERSION 1
-_ACEOF
-
-  fi
-
-       eolstr="\\n"
-       osver=`uname -r`
-       proc_mutex_is_global=1
-       case $osver in
-          5.0.4)
-             file_as_socket="1"
-             ;;
-          *)
-             file_as_socket="0"
-             ;;
-       esac
-       ;;
-   *os390)
-       OSDIR="os390"
-       eolstr="\\n"
-       ;;
-   *os400)
-       OSDIR="as400"
-       eolstr="\\n"
-       ;;
-   *cygwin*)
-       OSDIR="unix"
-
-  if test "x$CPPFLAGS" = "x"; then
-    echo "  setting CPPFLAGS to \"-DCYGWIN\""
-    CPPFLAGS="-DCYGWIN"
-  else
-    apr_addto_bugger="-DCYGWIN"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CPPFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $i"
-      fi
-    done
-  fi
-
-       enable_threads="no"
-       eolstr="\\n"
-       ;;
-   *linux*)
-       apr_force_atomic_generic=1
-       case $host_cpu in
-         i486|i586|i686)
-            if test "$nonportable_atomics_enabled" = 1; then
-              apr_force_atomic_generic=0
-            fi
-            ;;
-       esac
-       OSDIR="unix"
-       eolstr="\\n"
-       ;;
-   *hpux10* )
-       enable_threads="no"
-       OSDIR="unix"
-       eolstr="\\n"
-       ;;
-   *)
-       OSDIR="unix"
-       eolstr="\\n"
-       ;;
-esac
-
-
-
-
-
-
-# For some platforms we need a version string which allows easy numeric
-# comparisons.
-case $host in
-    *freebsd*)
-        if test -x /sbin/sysctl; then
-            os_version=`/sbin/sysctl -n kern.osreldate`
-        else
-            os_version=000000
-        fi
-        ;;
-    *linux*)
-        os_version=`uname -r | sed -e 's/\(.\)\.\(.\)\.\(.\).*/\1\2\3/'`
-        ;;
-    *darwin*)
-        os_version=`uname -r | sed -e 's/\(.\)\.\(.\).*/\1\2/'`
-        ;;
-    *)
-        os_version=OS_VERSION_IS_NOT_SET
-        ;;
-esac
-
-
-{ $as_echo "$as_me:$LINENO: checking for res_init in -lresolv" >&5
-$as_echo_n "checking for res_init in -lresolv... " >&6; }
-if test "${ac_cv_lib_resolv_res_init+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char res_init ();
-int
-main ()
-{
-return res_init ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_resolv_res_init=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_resolv_res_init=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_init" >&5
-$as_echo "$ac_cv_lib_resolv_res_init" >&6; }
-if test "x$ac_cv_lib_resolv_res_init" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBRESOLV 1
-_ACEOF
-
-  LIBS="-lresolv $LIBS"
-
-fi
-
-
-{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyname ();
-int
-main ()
-{
-return gethostbyname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_nsl_gethostbyname=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_nsl_gethostbyname=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBNSL 1
-_ACEOF
-
-  LIBS="-lnsl $LIBS"
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for library containing gethostname" >&5
-$as_echo_n "checking for library containing gethostname... " >&6; }
-if test "${ac_cv_search_gethostname+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostname ();
-int
-main ()
-{
-return gethostname ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' nsl; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_search_gethostname=$ac_res
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_gethostname+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_gethostname+set}" = set; then
-  :
-else
-  ac_cv_search_gethostname=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostname" >&5
-$as_echo "$ac_cv_search_gethostname" >&6; }
-ac_res=$ac_cv_search_gethostname
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-
-{ $as_echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
-$as_echo_n "checking for socket in -lsocket... " >&6; }
-if test "${ac_cv_lib_socket_socket+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char socket ();
-int
-main ()
-{
-return socket ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_socket_socket=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket_socket=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
-$as_echo "$ac_cv_lib_socket_socket" >&6; }
-if test "x$ac_cv_lib_socket_socket" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSOCKET 1
-_ACEOF
-
-  LIBS="-lsocket $LIBS"
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for library containing crypt" >&5
-$as_echo_n "checking for library containing crypt... " >&6; }
-if test "${ac_cv_search_crypt+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char crypt ();
-int
-main ()
-{
-return crypt ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' crypt ufc; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_search_crypt=$ac_res
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_crypt+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_crypt+set}" = set; then
-  :
-else
-  ac_cv_search_crypt=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
-$as_echo "$ac_cv_search_crypt" >&6; }
-ac_res=$ac_cv_search_crypt
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-
-{ $as_echo "$as_me:$LINENO: checking for main in -ltruerand" >&5
-$as_echo_n "checking for main in -ltruerand... " >&6; }
-if test "${ac_cv_lib_truerand_main+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltruerand  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_truerand_main=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_truerand_main=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_truerand_main" >&5
-$as_echo "$ac_cv_lib_truerand_main" >&6; }
-if test "x$ac_cv_lib_truerand_main" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBTRUERAND 1
-_ACEOF
-
-  LIBS="-ltruerand $LIBS"
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for library containing modf" >&5
-$as_echo_n "checking for library containing modf... " >&6; }
-if test "${ac_cv_search_modf+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char modf ();
-int
-main ()
-{
-return modf ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' m; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_search_modf=$ac_res
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_modf+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_modf+set}" = set; then
-  :
-else
-  ac_cv_search_modf=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_modf" >&5
-$as_echo "$ac_cv_search_modf" >&6; }
-ac_res=$ac_cv_search_modf
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for library containing sqrt" >&5
-$as_echo_n "checking for library containing sqrt... " >&6; }
-if test "${ac_cv_search_sqrt+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sqrt ();
-int
-main ()
-{
-return sqrt ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' m; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_search_sqrt=$ac_res
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_sqrt+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_sqrt+set}" = set; then
-  :
-else
-  ac_cv_search_sqrt=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_sqrt" >&5
-$as_echo "$ac_cv_search_sqrt" >&6; }
-ac_res=$ac_cv_search_sqrt
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-
-echo "${nl}Checking for Threads..."
-
-if test -z "$enable_threads"; then
-	# Check whether --enable-threads was given.
-if test "${enable_threads+set}" = set; then
-  enableval=$enable_threads;  enable_threads=$enableval
-else
-
-  if test "$GCC" = "yes"; then
-    SAVE_FL="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS -w"
-
-for ac_header in pthread.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-   enable_threads="pthread"
-else
-    enable_threads="no"
-fi
-
-done
-
-    CPPFLAGS="$SAVE_FL"
-  else
-
-for ac_header in pthread.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-   enable_threads="pthread"
-else
-    enable_threads="no"
-fi
-
-done
-
-  fi
-
-fi
-
-fi
-
-if test "$enable_threads" = "no"; then
-    threads="0"
-    pthreadh="0"
-    pthreadser="0"
-else
-    if test "$enable_threads" = "pthread"; then
-# We have specified pthreads for our threading library, just make sure
-# that we have everything we need
-
-  apr_pthsv_CFLAGS="$CFLAGS"
-  apr_pthsv_LIBS="$LIBS"
-
-
-
-{ $as_echo "$as_me:$LINENO: checking for CFLAGS needed for pthreads" >&5
-$as_echo_n "checking for CFLAGS needed for pthreads... " >&6; }
-if test "${apr_cv_pthreads_cflags+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  apr_ptc_cflags=$CFLAGS
- for flag in none -kthread -pthread -pthreads -mt -mthreads -Kthread -threads; do
-    CFLAGS=$apr_ptc_cflags
-    test "x$flag" != "xnone" && CFLAGS="$CFLAGS $flag"
-
-if test "$cross_compiling" = yes; then
-  apr_p_t_r=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <pthread.h>
-#include <stddef.h>
-
-void *thread_routine(void *data) {
-    return data;
-}
-
-int main() {
-    pthread_t thd;
-    pthread_mutexattr_t mattr;
-    pthread_once_t once_init = PTHREAD_ONCE_INIT;
-    int data = 1;
-    pthread_mutexattr_init(&mattr);
-    return pthread_create(&thd, NULL, thread_routine, &data);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  apr_p_t_r=yes
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-apr_p_t_r=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-
-if test $apr_p_t_r = yes; then
-
-      apr_cv_pthreads_cflags="$flag"
-      break
-
-fi
-
-
- done
- CFLAGS=$apr_ptc_cflags
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $apr_cv_pthreads_cflags" >&5
-$as_echo "$apr_cv_pthreads_cflags" >&6; }
-
-if test -n "$apr_cv_pthreads_cflags"; then
-   pthreads_working=yes
-   if test "x$apr_cv_pthreads_cflags" != "xnone"; then
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"$apr_cv_pthreads_cflags\""
-    CFLAGS="$apr_cv_pthreads_cflags"
-  else
-    apr_addto_bugger="$apr_cv_pthreads_cflags"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-   fi
-fi
-
-# The CFLAGS may or may not be sufficient to ensure that libapr
-# depends on the pthreads library: some versions of libtool
-# drop -pthread when passed on the link line; some versions of
-# gcc ignore -pthread when linking a shared object.  So always
-# try and add the relevant library to LIBS too.
-
-{ $as_echo "$as_me:$LINENO: checking for LIBS needed for pthreads" >&5
-$as_echo_n "checking for LIBS needed for pthreads... " >&6; }
-if test "${apr_cv_pthreads_lib+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-  apr_ptc_libs=$LIBS
-  for lib in -lpthread -lpthreads -lc_r; do
-    LIBS="$apr_ptc_libs $lib"
-
-if test "$cross_compiling" = yes; then
-  apr_p_t_r=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <pthread.h>
-#include <stddef.h>
-
-void *thread_routine(void *data) {
-    return data;
-}
-
-int main() {
-    pthread_t thd;
-    pthread_mutexattr_t mattr;
-    pthread_once_t once_init = PTHREAD_ONCE_INIT;
-    int data = 1;
-    pthread_mutexattr_init(&mattr);
-    return pthread_create(&thd, NULL, thread_routine, &data);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  apr_p_t_r=yes
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-apr_p_t_r=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-
-if test $apr_p_t_r = yes; then
-
-      apr_cv_pthreads_lib=$lib
-      break
-
-fi
-
-
-  done
-  LIBS=$apr_ptc_libs
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $apr_cv_pthreads_lib" >&5
-$as_echo "$apr_cv_pthreads_lib" >&6; }
-
-if test -n "$apr_cv_pthreads_lib"; then
-   pthreads_working=yes
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"$apr_cv_pthreads_lib\""
-    LIBS="$apr_cv_pthreads_lib"
-  else
-    apr_addto_bugger="$apr_cv_pthreads_lib"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-fi
-
-if test "$pthreads_working" = "yes"; then
-  threads_result="POSIX Threads found"
-else
-  threads_result="POSIX Threads not found"
-fi
-
-
-  if test "$GCC" = "yes"; then
-    SAVE_FL="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS -w"
-
-for ac_header in pthread.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-          threads="1"
-          pthreadh="1"
-          pthreadser="1"
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_THREADS 1
-_ACEOF
-
-else
-
-          threads="0"
-          pthreadh="0"
-          pthreadser="0"
-
-  CFLAGS="$apr_pthsv_CFLAGS"
-  LIBS="$apr_pthsv_LIBS"
-
-fi
-
-done
-
-    CPPFLAGS="$SAVE_FL"
-  else
-
-for ac_header in pthread.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-          threads="1"
-          pthreadh="1"
-          pthreadser="1"
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_THREADS 1
-_ACEOF
-
-else
-
-          threads="0"
-          pthreadh="0"
-          pthreadser="0"
-
-  CFLAGS="$apr_pthsv_CFLAGS"
-  LIBS="$apr_pthsv_LIBS"
-
-fi
-
-done
-
-  fi
-
-    elif test "$enable_threads" = "system_threads"; then
-        threads="1"
-        pthreadh="0"
-        pthreadser="0"
-    else
-# We basically specified that we wanted threads, but not how to implement
-# them.  In this case, just look for pthreads.  In the future, we can check
-# for other threading libraries as well.
-
-  apr_pthsv_CFLAGS="$CFLAGS"
-  apr_pthsv_LIBS="$LIBS"
-
-
-
-{ $as_echo "$as_me:$LINENO: checking for CFLAGS needed for pthreads" >&5
-$as_echo_n "checking for CFLAGS needed for pthreads... " >&6; }
-if test "${apr_cv_pthreads_cflags+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  apr_ptc_cflags=$CFLAGS
- for flag in none -kthread -pthread -pthreads -mt -mthreads -Kthread -threads; do
-    CFLAGS=$apr_ptc_cflags
-    test "x$flag" != "xnone" && CFLAGS="$CFLAGS $flag"
-
-if test "$cross_compiling" = yes; then
-  apr_p_t_r=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <pthread.h>
-#include <stddef.h>
-
-void *thread_routine(void *data) {
-    return data;
-}
-
-int main() {
-    pthread_t thd;
-    pthread_mutexattr_t mattr;
-    pthread_once_t once_init = PTHREAD_ONCE_INIT;
-    int data = 1;
-    pthread_mutexattr_init(&mattr);
-    return pthread_create(&thd, NULL, thread_routine, &data);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  apr_p_t_r=yes
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-apr_p_t_r=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-
-if test $apr_p_t_r = yes; then
-
-      apr_cv_pthreads_cflags="$flag"
-      break
-
-fi
-
-
- done
- CFLAGS=$apr_ptc_cflags
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $apr_cv_pthreads_cflags" >&5
-$as_echo "$apr_cv_pthreads_cflags" >&6; }
-
-if test -n "$apr_cv_pthreads_cflags"; then
-   pthreads_working=yes
-   if test "x$apr_cv_pthreads_cflags" != "xnone"; then
-
-  if test "x$CFLAGS" = "x"; then
-    echo "  setting CFLAGS to \"$apr_cv_pthreads_cflags\""
-    CFLAGS="$apr_cv_pthreads_cflags"
-  else
-    apr_addto_bugger="$apr_cv_pthreads_cflags"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $CFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to CFLAGS"
-        CFLAGS="$CFLAGS $i"
-      fi
-    done
-  fi
-
-   fi
-fi
-
-# The CFLAGS may or may not be sufficient to ensure that libapr
-# depends on the pthreads library: some versions of libtool
-# drop -pthread when passed on the link line; some versions of
-# gcc ignore -pthread when linking a shared object.  So always
-# try and add the relevant library to LIBS too.
-
-{ $as_echo "$as_me:$LINENO: checking for LIBS needed for pthreads" >&5
-$as_echo_n "checking for LIBS needed for pthreads... " >&6; }
-if test "${apr_cv_pthreads_lib+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-  apr_ptc_libs=$LIBS
-  for lib in -lpthread -lpthreads -lc_r; do
-    LIBS="$apr_ptc_libs $lib"
-
-if test "$cross_compiling" = yes; then
-  apr_p_t_r=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <pthread.h>
-#include <stddef.h>
-
-void *thread_routine(void *data) {
-    return data;
-}
-
-int main() {
-    pthread_t thd;
-    pthread_mutexattr_t mattr;
-    pthread_once_t once_init = PTHREAD_ONCE_INIT;
-    int data = 1;
-    pthread_mutexattr_init(&mattr);
-    return pthread_create(&thd, NULL, thread_routine, &data);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  apr_p_t_r=yes
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-apr_p_t_r=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-
-if test $apr_p_t_r = yes; then
-
-      apr_cv_pthreads_lib=$lib
-      break
-
-fi
-
-
-  done
-  LIBS=$apr_ptc_libs
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $apr_cv_pthreads_lib" >&5
-$as_echo "$apr_cv_pthreads_lib" >&6; }
-
-if test -n "$apr_cv_pthreads_lib"; then
-   pthreads_working=yes
-
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"$apr_cv_pthreads_lib\""
-    LIBS="$apr_cv_pthreads_lib"
-  else
-    apr_addto_bugger="$apr_cv_pthreads_lib"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-fi
-
-if test "$pthreads_working" = "yes"; then
-  threads_result="POSIX Threads found"
-else
-  threads_result="POSIX Threads not found"
-fi
-
-
-  if test "$GCC" = "yes"; then
-    SAVE_FL="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS -w"
-
-for ac_header in pthread.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-          threads="1"
-          pthreadh="1"
-          pthreadser="1"
-          cat >>confdefs.h <<\_ACEOF
-#define USE_THREADS 1
-_ACEOF
-
-else
-
-          threads="0"
-          pthreadser="0"
-          pthreadh="0"
-
-  CFLAGS="$apr_pthsv_CFLAGS"
-  LIBS="$apr_pthsv_LIBS"
-
-fi
-
-done
-
-    CPPFLAGS="$SAVE_FL"
-  else
-
-for ac_header in pthread.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-          threads="1"
-          pthreadh="1"
-          pthreadser="1"
-          cat >>confdefs.h <<\_ACEOF
-#define USE_THREADS 1
-_ACEOF
-
-else
-
-          threads="0"
-          pthreadser="0"
-          pthreadh="0"
-
-  CFLAGS="$apr_pthsv_CFLAGS"
-  LIBS="$apr_pthsv_LIBS"
-
-fi
-
-done
-
-  fi
-
-    fi
-    if test "$pthreadh" = "1"; then
-
-{ $as_echo "$as_me:$LINENO: checking whether pthread_getspecific takes two arguments" >&5
-$as_echo_n "checking whether pthread_getspecific takes two arguments... " >&6; }
-if test "${ac_cv_pthread_getspecific_two_args+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <pthread.h>
-
-int
-main ()
-{
-
-pthread_key_t key;
-void *tmp;
-pthread_getspecific(key,&tmp);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-
-    ac_cv_pthread_getspecific_two_args=yes
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-    ac_cv_pthread_getspecific_two_args=no
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_pthread_getspecific_two_args" >&5
-$as_echo "$ac_cv_pthread_getspecific_two_args" >&6; }
-
-if test "$ac_cv_pthread_getspecific_two_args" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define PTHREAD_GETSPECIFIC_TAKES_TWO_ARGS 1
-_ACEOF
-
-fi
-
-
-{ $as_echo "$as_me:$LINENO: checking whether pthread_attr_getdetachstate takes one argument" >&5
-$as_echo_n "checking whether pthread_attr_getdetachstate takes one argument... " >&6; }
-if test "${ac_cv_pthread_attr_getdetachstate_one_arg+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <pthread.h>
-
-int
-main ()
-{
-
-pthread_attr_t *attr;
-pthread_attr_getdetachstate(attr);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-
-    ac_cv_pthread_attr_getdetachstate_one_arg=yes
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-    ac_cv_pthread_attr_getdetachstate_one_arg=no
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_pthread_attr_getdetachstate_one_arg" >&5
-$as_echo "$ac_cv_pthread_attr_getdetachstate_one_arg" >&6; }
-
-if test "$ac_cv_pthread_attr_getdetachstate_one_arg" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define PTHREAD_ATTR_GETDETACHSTATE_TAKES_ONE_ARG 1
-_ACEOF
-
-fi
-
-
-
-for ac_func in pthread_key_delete pthread_rwlock_init
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-        if test "$ac_cv_func_pthread_rwlock_init" = "yes"; then
-                        { $as_echo "$as_me:$LINENO: checking for pthread_rwlock_t" >&5
-$as_echo_n "checking for pthread_rwlock_t... " >&6; }
-if test "${apr_cv_type_rwlock_t+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <pthread.h>
-int
-main ()
-{
-pthread_rwlock_t *rwlock;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  apr_cv_type_rwlock_t=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	apr_cv_type_rwlock_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $apr_cv_type_rwlock_t" >&5
-$as_echo "$apr_cv_type_rwlock_t" >&6; }
-            if test "$apr_cv_type_rwlock_t" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PTHREAD_RWLOCKS 1
-_ACEOF
-
-            fi
-        fi
-        # this might also require -DXOPEN_SOURCE=500, so leave after the
-        # rwlock check.
-
-  { $as_echo "$as_me:$LINENO: checking for recursive mutex support" >&5
-$as_echo_n "checking for recursive mutex support... " >&6; }
-if test "${apr_cv_mutex_recursive+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then
-  apr_cv_mutex_recursive=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <pthread.h>
-#include <stdlib.h>
-
-int main() {
-    pthread_mutexattr_t attr;
-    pthread_mutex_t m;
-
-    exit (pthread_mutexattr_init(&attr)
-          || pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE)
-          || pthread_mutex_init(&m, &attr));
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  apr_cv_mutex_recursive=yes
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-apr_cv_mutex_recursive=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $apr_cv_mutex_recursive" >&5
-$as_echo "$apr_cv_mutex_recursive" >&6; }
-
-if test "$apr_cv_mutex_recursive" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-_ACEOF
-
-fi
-
-    fi
-fi
-
-ac_cv_define_READDIR_IS_THREAD_SAFE=no
-ac_cv_define_GETHOSTBYNAME_IS_THREAD_SAFE=no
-ac_cv_define_GETHOSTBYADDR_IS_THREAD_SAFE=no
-if test "$threads" = "1"; then
-    echo "APR will use threads"
-    { $as_echo "$as_me:$LINENO: checking for readdir in -lc_r" >&5
-$as_echo_n "checking for readdir in -lc_r... " >&6; }
-if test "${ac_cv_lib_c_r_readdir+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc_r  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char readdir ();
-int
-main ()
-{
-return readdir ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_c_r_readdir=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_c_r_readdir=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_readdir" >&5
-$as_echo "$ac_cv_lib_c_r_readdir" >&6; }
-if test "x$ac_cv_lib_c_r_readdir" = x""yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define READDIR_IS_THREAD_SAFE 1
-_ACEOF
-
-fi
-
-    if test "x$apr_gethostbyname_is_thread_safe" = "x"; then
-        { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lc_r" >&5
-$as_echo_n "checking for gethostbyname in -lc_r... " >&6; }
-if test "${ac_cv_lib_c_r_gethostbyname+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc_r  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyname ();
-int
-main ()
-{
-return gethostbyname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_c_r_gethostbyname=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_c_r_gethostbyname=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_gethostbyname" >&5
-$as_echo "$ac_cv_lib_c_r_gethostbyname" >&6; }
-if test "x$ac_cv_lib_c_r_gethostbyname" = x""yes; then
-  apr_gethostbyname_is_thread_safe=yes
-fi
-
-    fi
-    if test "$apr_gethostbyname_is_thread_safe" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define GETHOSTBYNAME_IS_THREAD_SAFE 1
-_ACEOF
-
-    fi
-    if test "x$apr_gethostbyaddr_is_thread_safe" = "x"; then
-        { $as_echo "$as_me:$LINENO: checking for gethostbyaddr in -lc_r" >&5
-$as_echo_n "checking for gethostbyaddr in -lc_r... " >&6; }
-if test "${ac_cv_lib_c_r_gethostbyaddr+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc_r  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyaddr ();
-int
-main ()
-{
-return gethostbyaddr ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_c_r_gethostbyaddr=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_c_r_gethostbyaddr=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_gethostbyaddr" >&5
-$as_echo "$ac_cv_lib_c_r_gethostbyaddr" >&6; }
-if test "x$ac_cv_lib_c_r_gethostbyaddr" = x""yes; then
-  apr_gethostbyaddr_is_thread_safe=yes
-fi
-
-    fi
-    if test "$apr_gethostbyaddr_is_thread_safe" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define GETHOSTBYADDR_IS_THREAD_SAFE 1
-_ACEOF
-
-    fi
-
-
-for ac_func in gethostbyname_r gethostbyaddr_r
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-else
-    echo "APR will be non-threaded"
-fi
-
-
-for ac_func in sigsuspend
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-  have_sigsuspend="1"
-else
-   have_sigsuspend="0"
-fi
-done
-
-
-for ac_func in sigwait
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-  have_sigwait="1"
-else
-   have_sigwait="0"
-fi
-done
-
-case $host in
-    *alpha*-dec-osf* )
-        have_sigwait="1"
-        ;;
-esac
-
-
-
-
-
-
-for ac_func in poll
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-
-
-
-for ac_func in getpwnam_r getpwuid_r getgrnam_r getgrgid_r
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-echo "${nl}Checking for Shared Memory Support..."
-
-# The real-time POSIX extensions (e.g. shm_*, sem_*) may only
-# be available if linking against librt.
-{ $as_echo "$as_me:$LINENO: checking for library containing shm_open" >&5
-$as_echo_n "checking for library containing shm_open... " >&6; }
-if test "${ac_cv_search_shm_open+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shm_open ();
-int
-main ()
-{
-return shm_open ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' rt; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_search_shm_open=$ac_res
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_shm_open+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_shm_open+set}" = set; then
-  :
-else
-  ac_cv_search_shm_open=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_shm_open" >&5
-$as_echo "$ac_cv_search_shm_open" >&6; }
-ac_res=$ac_cv_search_shm_open
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-
-case $host in
- *-sysv*)
-   ac_includes_default="$ac_includes_default
-#if HAVE_SYS_MUTEX_H /* needed to define lock_t for sys/shm.h */
-# include <sys/mutex.h>
-#endif";;
-esac
-
-
-
-
-
-
-
-
-for ac_header in sys/mman.h sys/ipc.h sys/mutex.h sys/shm.h sys/file.h kernel/OS.h os2.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-
-
-
-
-
-for ac_func in mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \
-                create_area
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-  { $as_echo "$as_me:$LINENO: checking for MAP_ANON in sys/mman.h" >&5
-$as_echo_n "checking for MAP_ANON in sys/mman.h... " >&6; }
-if test "${ac_cv_define_MAP_ANON+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <sys/mman.h>
-#ifdef MAP_ANON
-YES_IS_DEFINED
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then
-  ac_cv_define_MAP_ANON=yes
-else
-  ac_cv_define_MAP_ANON=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_MAP_ANON" >&5
-$as_echo "$ac_cv_define_MAP_ANON" >&6; }
-  if test "$ac_cv_define_MAP_ANON" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MAP_ANON 1
-_ACEOF
-
-  fi
-
-{ $as_echo "$as_me:$LINENO: checking for /dev/zero" >&5
-$as_echo_n "checking for /dev/zero... " >&6; }
-if test "${ac_cv_file__dev_zero+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  test "$cross_compiling" = yes &&
-  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-if test -r "/dev/zero"; then
-  ac_cv_file__dev_zero=yes
-else
-  ac_cv_file__dev_zero=no
-fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__dev_zero" >&5
-$as_echo "$ac_cv_file__dev_zero" >&6; }
-
-
-# Not all systems can mmap /dev/zero (such as HP-UX).  Check for that.
-if test "$ac_cv_func_mmap" = "yes" &&
-   test "$ac_cv_file__dev_zero" = "yes"; then
-    { $as_echo "$as_me:$LINENO: checking for mmap that can map /dev/zero" >&5
-$as_echo_n "checking for mmap that can map /dev/zero... " >&6; }
-    if test "$cross_compiling" = yes; then
-  ac_cv_file__dev_zero=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-    int main()
-    {
-        int fd;
-        void *m;
-        fd = open("/dev/zero", O_RDWR);
-        if (fd < 0) {
-            return 1;
-        }
-        m = mmap(0, sizeof(void*), PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
-        if (m == (void *)-1) {  /* aka MAP_FAILED */
-            return 2;
-        }
-        if (munmap(m, sizeof(void*)) < 0) {
-            return 3;
-        }
-        return 0;
-    }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_file__dev_zero=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_file__dev_zero" >&5
-$as_echo "$ac_cv_file__dev_zero" >&6; }
-fi
-
-# Now we determine which one is our anonymous shmem preference.
-haveshmgetanon="0"
-havemmapzero="0"
-havemmapanon="0"
-ac_decision_item='anonymous shared memory allocation method'
-ac_decision_msg='FAILED'
-ac_decision=''
-
-ac_rc=yes
-for ac_spec in header:sys/ipc.h header:sys/shm.h header:sys/file.h              func:shmget func:shmat func:shmdt func:shmctl; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        struct ) ac_var="ac_cv_struct_$ac_item" ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-    haveshmgetanon="1"
-              ac_decision='USE_SHMEM_SHMGET_ANON'
-ac_decision_msg='SysV IPC shmget()'
-ac_decision_USE_SHMEM_SHMGET_ANON=yes
-ac_decision_USE_SHMEM_SHMGET_ANON_msg='SysV IPC shmget()'
-
-else
-    :
-
-fi
-
-ac_rc=yes
-for ac_spec in header:sys/mman.h func:mmap func:munmap file:/dev/zero; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        struct ) ac_var="ac_cv_struct_$ac_item" ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-    havemmapzero="1"
-              ac_decision='USE_SHMEM_MMAP_ZERO'
-ac_decision_msg='SVR4-style mmap() on /dev/zero'
-ac_decision_USE_SHMEM_MMAP_ZERO=yes
-ac_decision_USE_SHMEM_MMAP_ZERO_msg='SVR4-style mmap() on /dev/zero'
-
-else
-    :
-
-fi
-
-ac_rc=yes
-for ac_spec in header:sys/mman.h func:mmap func:munmap define:MAP_ANON; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        struct ) ac_var="ac_cv_struct_$ac_item" ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-    havemmapanon="1"
-              ac_decision='USE_SHMEM_MMAP_ANON'
-ac_decision_msg='4.4BSD-style mmap() via MAP_ANON'
-ac_decision_USE_SHMEM_MMAP_ANON=yes
-ac_decision_USE_SHMEM_MMAP_ANON_msg='4.4BSD-style mmap() via MAP_ANON'
-
-else
-    :
-
-fi
-
-ac_rc=yes
-for ac_spec in header:os2.h; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        struct ) ac_var="ac_cv_struct_$ac_item" ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-    haveos2shm="1"
-              ac_decision='USE_SHMEM_OS2_ANON'
-ac_decision_msg='OS/2 DosAllocSharedMem()'
-ac_decision_USE_SHMEM_OS2_ANON=yes
-ac_decision_USE_SHMEM_OS2_ANON_msg='OS/2 DosAllocSharedMem()'
-
-else
-    :
-
-fi
-
-ac_rc=yes
-for ac_spec in header:kernel/OS.h func:create_area; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        struct ) ac_var="ac_cv_struct_$ac_item" ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-    havebeosshm="1"
-              ac_decision='USE_SHMEM_BEOS_ANON'
-ac_decision_msg='BeOS areas'
-ac_decision_USE_SHMEM_BEOS_ANON=yes
-ac_decision_USE_SHMEM_BEOS_ANON_msg='BeOS areas'
-
-else
-    :
-
-fi
-
-case $host in
-    *linux* )
-        # Linux has problems with MM_SHMT_MMANON even though it reports
-        # that it has it.
-        # FIXME - find exact 2.3 version that MMANON was fixed in.  It is
-        # confirmed fixed in 2.4 series.
-        if test $os_version -le "240"; then
-                ac_decision=''
-    for ac_item in USE_SHMEM_MMAP_ZERO USE_SHMEM_SHMGET_ANON; do
-         eval "ac_decision_this=\$ac_decision_${ac_item}"
-         if test ".$ac_decision_this" = .yes; then
-             ac_decision=$ac_item
-             eval "ac_decision_msg=\$ac_decision_${ac_item}_msg"
-         fi
-    done
-
-        fi
-        ;;
-    *hpux11* )
-            ac_decision=''
-    for ac_item in USE_SHMEM_SHMGET_ANON; do
-         eval "ac_decision_this=\$ac_decision_${ac_item}"
-         if test ".$ac_decision_this" = .yes; then
-             ac_decision=$ac_item
-             eval "ac_decision_msg=\$ac_decision_${ac_item}_msg"
-         fi
-    done
-
-        ;;
-esac
-if test ".$ac_decision" = .; then
-    echo "$0:Error: decision on $ac_decision_item failed" 1>&2
-    exit 1
-else
-    if test ".$ac_decision_msg" = .; then
-        ac_decision_msg="$ac_decision"
-    fi
-    cat >>confdefs.h <<_ACEOF
-#define ${ac_decision_item} 1
-_ACEOF
-
-    { $as_echo "$as_me:$LINENO: result: decision on $ac_decision_item... $ac_decision_msg" >&5
-$as_echo "decision on $ac_decision_item... $ac_decision_msg" >&6; }
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define $ac_decision 1
-_ACEOF
-
-
-useshmgetanon="0"
-usemmapzero="0"
-usemmapanon="0"
-
-case $ac_decision in
-    USE_SHMEM_SHMGET_ANON )
-        useshmgetanon="1"
-        ;;
-    USE_SHMEM_MMAP_ZERO )
-        usemmapzero="1"
-        ;;
-    USE_SHMEM_MMAP_ANON )
-        usemmapanon="1"
-        ;;
-esac
-
-
-
-
-
-
-
-
-# Now we determine which one is our name-based shmem preference.
-havemmaptmp="0"
-havemmapshm="0"
-haveshmget="0"
-havebeosarea="0"
-haveos2shm="0"
-ac_decision_item='namebased memory allocation method'
-ac_decision_msg='FAILED'
-ac_decision=''
-
-ac_rc=yes
-for ac_spec in header:sys/mman.h func:mmap func:munmap; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        struct ) ac_var="ac_cv_struct_$ac_item" ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-    havemmaptmp="1"
-              ac_decision='USE_SHMEM_MMAP_TMP'
-ac_decision_msg='Classical mmap() on temporary file'
-ac_decision_USE_SHMEM_MMAP_TMP=yes
-ac_decision_USE_SHMEM_MMAP_TMP_msg='Classical mmap() on temporary file'
-
-else
-    :
-
-fi
-
-ac_rc=yes
-for ac_spec in header:sys/mman.h func:mmap func:munmap func:shm_open              func:shm_unlink; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        struct ) ac_var="ac_cv_struct_$ac_item" ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-    havemmapshm="1"
-              ac_decision='USE_SHMEM_MMAP_SHM'
-ac_decision_msg='mmap() via POSIX.1 shm_open() on temporary file'
-ac_decision_USE_SHMEM_MMAP_SHM=yes
-ac_decision_USE_SHMEM_MMAP_SHM_msg='mmap() via POSIX.1 shm_open() on temporary file'
-
-else
-    :
-
-fi
-
-ac_rc=yes
-for ac_spec in header:sys/ipc.h header:sys/shm.h header:sys/file.h              func:shmget func:shmat func:shmdt func:shmctl; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        struct ) ac_var="ac_cv_struct_$ac_item" ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-    haveshmget="1"
-              ac_decision='USE_SHMEM_SHMGET'
-ac_decision_msg='SysV IPC shmget()'
-ac_decision_USE_SHMEM_SHMGET=yes
-ac_decision_USE_SHMEM_SHMGET_msg='SysV IPC shmget()'
-
-else
-    :
-
-fi
-
-ac_rc=yes
-for ac_spec in header:kernel/OS.h func:create_area; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        struct ) ac_var="ac_cv_struct_$ac_item" ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-    havebeosshm="1"
-              ac_decision='USE_SHMEM_BEOS'
-ac_decision_msg='BeOS areas'
-ac_decision_USE_SHMEM_BEOS=yes
-ac_decision_USE_SHMEM_BEOS_msg='BeOS areas'
-
-else
-    :
-
-fi
-
-ac_rc=yes
-for ac_spec in header:os2.h; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        struct ) ac_var="ac_cv_struct_$ac_item" ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-    haveos2shm="1"
-              ac_decision='USE_SHMEM_OS2'
-ac_decision_msg='OS/2 DosAllocSharedMem()'
-ac_decision_USE_SHMEM_OS2=yes
-ac_decision_USE_SHMEM_OS2_msg='OS/2 DosAllocSharedMem()'
-
-else
-    :
-
-fi
-
-case $host in
-    *linux* )
-        # Linux has problems with MM_SHMT_MMANON even though it reports
-        # that it has it.
-        # FIXME - find exact 2.3 version that MMANON was fixed in.  It is
-        # confirmed fixed in 2.4 series.
-        if test $os_version -le "240"; then
-                ac_decision=''
-    for ac_item in USE_SHMEM_MMAP_TMP USE_SHMEM_MMAP_SHM                                   USE_SHMEM_SHMGET; do
-         eval "ac_decision_this=\$ac_decision_${ac_item}"
-         if test ".$ac_decision_this" = .yes; then
-             ac_decision=$ac_item
-             eval "ac_decision_msg=\$ac_decision_${ac_item}_msg"
-         fi
-    done
-
-        fi
-        ;;
-esac
-if test ".$ac_decision" = .; then
-    echo "$0:Error: decision on $ac_decision_item failed" 1>&2
-    exit 1
-else
-    if test ".$ac_decision_msg" = .; then
-        ac_decision_msg="$ac_decision"
-    fi
-    cat >>confdefs.h <<_ACEOF
-#define ${ac_decision_item} 1
-_ACEOF
-
-    { $as_echo "$as_me:$LINENO: result: decision on $ac_decision_item... $ac_decision_msg" >&5
-$as_echo "decision on $ac_decision_item... $ac_decision_msg" >&6; }
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define $ac_decision 1
-_ACEOF
-
-
-usemmaptmp="0"
-usemmapshm="0"
-useshmget="0"
-usebeosarea="0"
-useos2shm="0"
-
-case $ac_decision in
-    USE_SHMEM_MMAP_TMP )
-        usemmaptmp="1"
-        ;;
-    USE_SHMEM_MMAP_SHM )
-        usemmapshm="1"
-        ;;
-    USE_SHMEM_SHMGET )
-        useshmget="1"
-        ;;
-    USE_SHMEM_BEOS )
-        usebeosarea="1"
-        ;;
-    USE_SHMEM_OS2 )
-        useos2shm="1"
-        ;;
-esac
-
-# Do we have any shared memory support?
-if test "$usemmaptmp$usemmapshm$usemmapzero$useshmget$usemmapanon$usebeosarea$useos2shm" = "0000000"; then
-  sharedmem="0"
-else
-  sharedmem="1"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_func in alloca calloc strcasecmp stricmp setsid isinf isnan
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-
-
-for ac_func in getenv putenv setenv unsetenv
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-for ac_func in setrlimit
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-  have_setrlimit="1"
-else
-   have_setrlimit="0"
-fi
-done
-
-
-for ac_func in getrlimit
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-  have_getrlimit="1"
-else
-   have_getrlimit="0"
-fi
-done
-
-
-for ac_func in writev
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-sendfile="0"
-
-{ $as_echo "$as_me:$LINENO: checking for sendfilev in -lsendfile" >&5
-$as_echo_n "checking for sendfilev in -lsendfile... " >&6; }
-if test "${ac_cv_lib_sendfile_sendfilev+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsendfile  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sendfilev ();
-int
-main ()
-{
-return sendfilev ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_sendfile_sendfilev=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_sendfile_sendfilev=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sendfile_sendfilev" >&5
-$as_echo "$ac_cv_lib_sendfile_sendfilev" >&6; }
-if test "x$ac_cv_lib_sendfile_sendfilev" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSENDFILE 1
-_ACEOF
-
-  LIBS="-lsendfile $LIBS"
-
-fi
-
-
-
-
-for ac_func in sendfile send_file sendfilev
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-  sendfile="1"
-fi
-done
-
-
-
-for ac_func in utime utimes
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-
-# Check whether --with-sendfile was given.
-if test "${with_sendfile+set}" = set; then
-  withval=$with_sendfile;  if test "$withval" = "yes"; then
-        sendfile="1"
-    else
-        sendfile="0"
-    fi
-else
-
-    orig_sendfile=$sendfile
-    case $host in
-        *freebsd*)
-            # FreeBSD < 4.2 has issues with threads+sendfile
-            if test $os_version -le "401999"; then
-                if test "$threads" = "1"; then
-                    sendfile="0"
-                fi
-            fi
-            ;;
-        *alpha*-dec-osf* )
-            sendfile="0"
-            ;;
-        s390-*-linux-gnu)
-            # disable sendfile support for 2.2 on S/390
-            if test $os_version -lt 240; then
-                sendfile="0"
-            fi
-            ;;
-        *aix*)
-            # compiler-independent check for 64-bit build
-            # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of void*" >&5
-$as_echo_n "checking size of void*... " >&6; }
-if test "${ac_cv_sizeof_voidp+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (void*))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (void*))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (void*))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (void*))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (void*))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_voidp=$ac_lo;;
-'') if test "$ac_cv_type_voidp" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void*)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (void*)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-   else
-     ac_cv_sizeof_voidp=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (void*)); }
-static unsigned long int ulongval () { return (long int) (sizeof (void*)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (void*))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (void*))))
-	return 1;
-      fprintf (f, "%ld", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (void*))))
-	return 1;
-      fprintf (f, "%lu", i);
-    }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_voidp=`cat conftest.val`
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_voidp" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void*)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (void*)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-   else
-     ac_cv_sizeof_voidp=0
-   fi
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_voidp" >&5
-$as_echo "$ac_cv_sizeof_voidp" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_VOIDP $ac_cv_sizeof_voidp
-_ACEOF
-
-
-            if test "x$ac_cv_sizeof_voidp" = "x8"; then
-                # sendfile not working for 64-bit build
-                sendfile="0"
-            fi
-            ;;
-        *darwin*)
-            # darwin semantics in 9.0.0 appear to be fubar
-            sendfile="0"
-            ;;
-    esac
-    if test "$orig_sendfile" != "$sendfile"; then
-      echo "sendfile support disabled to avoid system problem"
-    fi
-fi
-
-
-
-
-for ac_func in sigaction
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-  have_sigaction="1"
-else
-   have_sigaction="0"
-fi
-done
-
-{ $as_echo "$as_me:$LINENO: checking whether sys_siglist is declared" >&5
-$as_echo_n "checking whether sys_siglist is declared... " >&6; }
-if test "${ac_cv_have_decl_sys_siglist+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <signal.h>
-/* NetBSD declares sys_siglist in unistd.h.  */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-
-int
-main ()
-{
-#ifndef sys_siglist
-  (void) sys_siglist;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_sys_siglist=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl_sys_siglist=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_siglist" >&5
-$as_echo "$ac_cv_have_decl_sys_siglist" >&6; }
-if test "x$ac_cv_have_decl_sys_siglist" = x""yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SYS_SIGLIST 1
-_ACEOF
-
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_SYS_SIGLIST 0
-_ACEOF
-
-
-fi
-
-
-
-
-
-for ac_func in fork
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-  fork="1"
-else
-   fork="0"
-fi
-done
-
-
-{ $as_echo "$as_me:$LINENO: checking for inet_addr" >&5
-$as_echo_n "checking for inet_addr... " >&6; }
-if test "${ac_cv_func_inet_addr+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-
-int
-main ()
-{
-
-inet_addr("127.0.0.1");
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-
-    ac_cv_func_inet_addr=yes
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-    ac_cv_func_inet_addr=no
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_inet_addr" >&5
-$as_echo "$ac_cv_func_inet_addr" >&6; }
-
-if test "$ac_cv_func_inet_addr" = "yes"; then
-  have_inet_addr=1
-else
-  have_inet_addr=0
-fi
-
-
-{ $as_echo "$as_me:$LINENO: checking for inet_network" >&5
-$as_echo_n "checking for inet_network... " >&6; }
-if test "${ac_cv_func_inet_network+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-
-int
-main ()
-{
-
-inet_network("127.0.0.1");
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-
-    ac_cv_func_inet_network=yes
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-    ac_cv_func_inet_network=no
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_inet_network" >&5
-$as_echo "$ac_cv_func_inet_network" >&6; }
-
-if test "$ac_cv_func_inet_network" = "yes"; then
-  have_inet_network=1
-else
-  have_inet_network=0
-fi
-
-
-{ $as_echo "$as_me:$LINENO: checking for _getch" >&5
-$as_echo_n "checking for _getch... " >&6; }
-if test "${ac_cv_func__getch+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define _getch to an innocuous variant, in case <limits.h> declares _getch.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define _getch innocuous__getch
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char _getch (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef _getch
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char _getch ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub__getch || defined __stub____getch
-choke me
-#endif
-
-int
-main ()
-{
-return _getch ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func__getch=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func__getch=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func__getch" >&5
-$as_echo "$ac_cv_func__getch" >&6; }
-
-
-for ac_func in strerror_r
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-  strerror_r="1"
-else
-   strerror_r="0"
-fi
-done
-
-if test "$strerror_r" = "1"; then
-
-{ $as_echo "$as_me:$LINENO: checking for type of return code from strerror_r" >&5
-$as_echo_n "checking for type of return code from strerror_r... " >&6; }
-if test "$cross_compiling" = yes; then
-
-    ac_cv_strerror_r_rc_int=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-main()
-{
-  char buf[1024];
-  if (strerror_r(ERANGE, buf, sizeof buf) < 1) {
-    exit(0);
-  }
-  else {
-    exit(1);
-  }
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-    ac_cv_strerror_r_rc_int=yes
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-    ac_cv_strerror_r_rc_int=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-if test "x$ac_cv_strerror_r_rc_int" = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STRERROR_R_RC_INT 1
-_ACEOF
-
-  msg="int"
-else
-  msg="pointer"
-fi
-{ $as_echo "$as_me:$LINENO: result: $msg" >&5
-$as_echo "$msg" >&6; }
-
-fi
-
-for ac_func in crypt_r
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-  crypt_r="1"
-else
-   crypt_r="0"
-fi
-done
-
-if test "$crypt_r" = "1"; then
-
-{ $as_echo "$as_me:$LINENO: checking style of crypt_r" >&5
-$as_echo_n "checking style of crypt_r... " >&6; }
-if test "${ac_cv_crypt_r_style+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-ac_cv_crypt_r_style=none
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <crypt.h>
-
-int
-main ()
-{
-
-CRYPTD buffer;
-crypt_r("passwd", "hash", &buffer);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_crypt_r_style=cryptd
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-if test "$ac_cv_crypt_r_style" = "none"; then
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <crypt.h>
-
-int
-main ()
-{
-
-struct crypt_data buffer;
-crypt_r("passwd", "hash", &buffer);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_crypt_r_style=struct_crypt_data
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_crypt_r_style" >&5
-$as_echo "$ac_cv_crypt_r_style" >&6; }
-if test "$ac_cv_crypt_r_style" = "cryptd"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define CRYPT_R_CRYPTD 1
-_ACEOF
-
-fi
-# if we don't combine these conditions, CRYPT_R_STRUCT_CRYPT_DATA
-# will end up defined twice
-if test "$ac_cv_crypt_r_style" = "struct_crypt_data"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define CRYPT_R_STRUCT_CRYPT_DATA 1
-_ACEOF
-
-fi
-
-fi
-
-for ac_func in mmap
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-  mmap="1"
-else
-   mmap="0"
-fi
-done
-
-if test "$native_mmap_emul" = "1"; then
-    mmap="1"
-fi
-
-for ac_func in memmove
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-  have_memmove="1"
-else
-  have_memmove="0"
-fi
-done
-
-
-
-
-
-
-
-for ac_func in getpass getpassphrase gmtime_r localtime_r hstrerror mkstemp
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:$LINENO: checking whether sigwait takes one argument" >&5
-$as_echo_n "checking whether sigwait takes one argument... " >&6; }
-if test "${ac_cv_sigwait_one_arg+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#if defined(__NETBSD__) || defined(DARWIN)
-    /* When using the unproven-pthreads package, we need to pull in this
-     * header to get a prototype for sigwait().  Else things will fail later
-     * on.  XXX Should probably be fixed in the unproven-pthreads package.
-     * Darwin is declaring sigwait() in the wrong place as well.
-     */
-#include <pthread.h>
-#endif
-#include <signal.h>
-
-int
-main ()
-{
-
-  sigset_t set;
-
-  sigwait(&set);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-
-  ac_cv_sigwait_one_arg=yes
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-  ac_cv_sigwait_one_arg=no
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sigwait_one_arg" >&5
-$as_echo "$ac_cv_sigwait_one_arg" >&6; }
-  if test "$ac_cv_sigwait_one_arg" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define SIGWAIT_TAKES_ONE_ARG 1
-_ACEOF
-
-  fi
-
-
-{ $as_echo "$as_me:$LINENO: checking for inode member of struct dirent" >&5
-$as_echo_n "checking for inode member of struct dirent... " >&6; }
-if test "${apr_cv_dirent_inode+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-apr_cv_dirent_inode=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <dirent.h>
-
-int
-main ()
-{
-
-#ifdef d_ino
-#undef d_ino
-#endif
-struct dirent de; de.d_fileno;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  apr_cv_dirent_inode=d_fileno
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-if test "$apr_cv_dirent_inode" = "no"; then
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <dirent.h>
-
-int
-main ()
-{
-
-#ifdef d_fileno
-#undef d_fileno
-#endif
-struct dirent de; de.d_ino;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  apr_cv_dirent_inode=d_ino
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $apr_cv_dirent_inode" >&5
-$as_echo "$apr_cv_dirent_inode" >&6; }
-if test "$apr_cv_dirent_inode" != "no"; then
-  cat >>confdefs.h <<_ACEOF
-#define DIRENT_INODE $apr_cv_dirent_inode
-_ACEOF
-
-fi
-
-
-{ $as_echo "$as_me:$LINENO: checking for file type member of struct dirent" >&5
-$as_echo_n "checking for file type member of struct dirent... " >&6; }
-if test "${apr_cv_dirent_type+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-apr_cv_dirent_type=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <dirent.h>
-
-int
-main ()
-{
-
-struct dirent de; de.d_type = DT_REG;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  apr_cv_dirent_type=d_type
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $apr_cv_dirent_type" >&5
-$as_echo "$apr_cv_dirent_type" >&6; }
-if test "$apr_cv_dirent_type" != "no"; then
-  cat >>confdefs.h <<_ACEOF
-#define DIRENT_TYPE $apr_cv_dirent_type
-_ACEOF
-
-fi
-
-
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_header in alloca.h            \
-    ByteOrder.h		\
-    conio.h		\
-    crypt.h		\
-    ctype.h		\
-    dir.h		\
-    dirent.h		\
-    dl.h		\
-    dlfcn.h		\
-    errno.h		\
-    fcntl.h		\
-    grp.h		\
-    io.h		\
-    limits.h		\
-    mach-o/dyld.h	\
-    malloc.h		\
-    memory.h		\
-    netdb.h		\
-    osreldate.h		\
-    poll.h		\
-    process.h		\
-    pwd.h		\
-    semaphore.h		\
-    signal.h		\
-    stdarg.h		\
-    stddef.h		\
-    stdio.h		\
-    stdlib.h		\
-    string.h		\
-    strings.h		\
-    sysapi.h		\
-    sysgtime.h		\
-    termios.h		\
-    time.h		\
-    tpfeq.h		\
-    tpfio.h		\
-    unistd.h		\
-    unix.h		\
-    arpa/inet.h		\
-    kernel/OS.h		\
-    net/errno.h		\
-    netinet/in.h	\
-    netinet/sctp.h      \
-    netinet/sctp_uio.h  \
-    sys/file.h		\
-    sys/ioctl.h         \
-    sys/mman.h		\
-    sys/poll.h		\
-    sys/resource.h	\
-    sys/select.h	\
-    sys/sem.h		\
-    sys/sendfile.h	\
-    sys/signal.h	\
-    sys/socket.h	\
-    sys/sockio.h	\
-    sys/stat.h          \
-    sys/sysctl.h	\
-    sys/syslimits.h	\
-    sys/time.h		\
-    sys/types.h		\
-    sys/uio.h		\
-    sys/un.h		\
-    sys/wait.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-for aprt_i in alloca.h            \
-    ByteOrder.h		\
-    conio.h		\
-    crypt.h		\
-    ctype.h		\
-    dir.h		\
-    dirent.h		\
-    dl.h		\
-    dlfcn.h		\
-    errno.h		\
-    fcntl.h		\
-    grp.h		\
-    io.h		\
-    limits.h		\
-    mach-o/dyld.h	\
-    malloc.h		\
-    memory.h		\
-    netdb.h		\
-    osreldate.h		\
-    poll.h		\
-    process.h		\
-    pwd.h		\
-    semaphore.h		\
-    signal.h		\
-    stdarg.h		\
-    stddef.h		\
-    stdio.h		\
-    stdlib.h		\
-    string.h		\
-    strings.h		\
-    sysapi.h		\
-    sysgtime.h		\
-    termios.h		\
-    time.h		\
-    tpfeq.h		\
-    tpfio.h		\
-    unistd.h		\
-    unix.h		\
-    arpa/inet.h		\
-    kernel/OS.h		\
-    net/errno.h		\
-    netinet/in.h	\
-    netinet/sctp.h      \
-    netinet/sctp_uio.h  \
-    sys/file.h		\
-    sys/ioctl.h         \
-    sys/mman.h		\
-    sys/poll.h		\
-    sys/resource.h	\
-    sys/select.h	\
-    sys/sem.h		\
-    sys/sendfile.h	\
-    sys/signal.h	\
-    sys/socket.h	\
-    sys/sockio.h	\
-    sys/stat.h          \
-    sys/sysctl.h	\
-    sys/syslimits.h	\
-    sys/time.h		\
-    sys/types.h		\
-    sys/uio.h		\
-    sys/un.h		\
-    sys/wait.h
-do
-    ac_safe=`echo "$aprt_i" | sed 'y%./+-%__p_%'`
-    aprt_2=`echo "$aprt_i" | sed -e 's%/%_%g' -e 's/\.//g' -e 's/-//g'`
-    if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-       eval "$aprt_2=1"
-    else
-       eval "$aprt_2=0"
-    fi
-done
-
-
-# IRIX 6.5 has a problem in <netinet/tcp.h> which prevents it from
-# being included by itself.  Check for <netinet/tcp.h> manually,
-# including another header file first.
-{ $as_echo "$as_me:$LINENO: checking for netinet/tcp.h" >&5
-$as_echo_n "checking for netinet/tcp.h... " >&6; }
-if test "${apr_cv_hdr_netinet_tcp_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#include <netinet/tcp.h>
-
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  apr_cv_hdr_netinet_tcp_h=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  apr_cv_hdr_netinet_tcp_h=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $apr_cv_hdr_netinet_tcp_h" >&5
-$as_echo "$apr_cv_hdr_netinet_tcp_h" >&6; }
-if test "$apr_cv_hdr_netinet_tcp_h" = "yes"; then
-   netinet_tcph=1
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NETINET_TCP_H 1
-_ACEOF
-
-else
-   netinet_tcph=0
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Checking for h_errno in <netdb.h>
-if test "$netdbh" = "1"; then
-
-  { $as_echo "$as_me:$LINENO: checking for h_errno in netdb.h" >&5
-$as_echo_n "checking for h_errno in netdb.h... " >&6; }
-  if test "${ac_cv_h_errno_cppflags+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-
-  if test x != x; then
-    CPPFLAGS="-D $CPPFLAGS"
-  fi
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-
-int
-main ()
-{
-
-int h_e = h_errno;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-
-  if test x != x; then
-    ac_cv_h_errno_cppflags=""
-  else
-    ac_cv_h_errno_cppflags=yes
-  fi
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-  ac_cv_h_errno_cppflags=no
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    if test "$ac_cv_h_errno_cppflags" = "no"; then
-      ac_save="$CPPFLAGS"
-      for flag in _XOPEN_SOURCE_EXTENDED; do
-
-  if test x$flag != x; then
-    CPPFLAGS="-D$flag $CPPFLAGS"
-  fi
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-
-int
-main ()
-{
-
-int h_e = h_errno;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-
-  if test x$flag != x; then
-    ac_cv_h_errno_cppflags="$flag"
-  else
-    ac_cv_h_errno_cppflags=yes
-  fi
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-  ac_cv_h_errno_cppflags=no
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-        if test "$ac_cv_h_errno_cppflags" != "no"; then
-          break
-        fi
-      done
-      CPPFLAGS="$ac_save"
-    fi
-
-fi
-
-  if test "$ac_cv_h_errno_cppflags" != "no"; then
-    if test "$ac_cv_h_errno_cppflags" != "yes"; then
-      CPPFLAGS="-D$ac_cv_h_errno_cppflags $CPPFLAGS"
-      { $as_echo "$as_me:$LINENO: result: yes, with -D$ac_cv_h_errno_cppflags" >&5
-$as_echo "yes, with -D$ac_cv_h_errno_cppflags" >&6; }
-    else
-      { $as_echo "$as_me:$LINENO: result: $ac_cv_h_errno_cppflags" >&5
-$as_echo "$ac_cv_h_errno_cppflags" >&6; }
-    fi
-  else
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_h_errno_cppflags" >&5
-$as_echo "$ac_cv_h_errno_cppflags" >&6; }
-  fi
-
-  if test "$ac_cv_h_errno_cflags" = "no"; then
-    { { $as_echo "$as_me:$LINENO: error: can not find h_errno in netdb.h" >&5
-$as_echo "$as_me: error: can not find h_errno in netdb.h" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
-$as_echo_n "checking for off_t... " >&6; }
-if test "${ac_cv_type_off_t+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_type_off_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (off_t))
-       return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((off_t)))
-	  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_off_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-$as_echo "$ac_cv_type_off_t" >&6; }
-if test "x$ac_cv_type_off_t" = x""yes; then
-  :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define off_t long int
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
-$as_echo_n "checking for pid_t... " >&6; }
-if test "${ac_cv_type_pid_t+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_type_pid_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (pid_t))
-       return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((pid_t)))
-	  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_pid_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-$as_echo "$ac_cv_type_pid_t" >&6; }
-if test "x$ac_cv_type_pid_t" = x""yes; then
-  :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define pid_t int
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
-$as_echo_n "checking for size_t... " >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_type_size_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (size_t))
-       return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((size_t)))
-	  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_size_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-$as_echo "$ac_cv_type_size_t" >&6; }
-if test "x$ac_cv_type_size_t" = x""yes; then
-  :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-if test "${ac_cv_type_uid_t+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uid_t" >/dev/null 2>&1; then
-  ac_cv_type_uid_t=yes
-else
-  ac_cv_type_uid_t=no
-fi
-rm -f conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-$as_echo "$ac_cv_type_uid_t" >&6; }
-if test $ac_cv_type_uid_t = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define uid_t int
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define gid_t int
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for ssize_t" >&5
-$as_echo_n "checking for ssize_t... " >&6; }
-if test "${ac_cv_type_ssize_t+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_type_ssize_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (ssize_t))
-       return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((ssize_t)))
-	  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_ssize_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
-$as_echo "$ac_cv_type_ssize_t" >&6; }
-if test "x$ac_cv_type_ssize_t" = x""yes; then
-  :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define ssize_t int
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_c_inline=$ac_kw
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  test "$ac_cv_c_inline" != no && break
-done
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
-
-
-case $ac_cv_c_inline in
-  inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
-    ;;
-esac
-
-{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if test "${ac_cv_c_const+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
-  typedef int charset[2];
-  const charset cs;
-  /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *pcpcc;
-  char **ppc;
-  /* NEC SVR4.0.2 mips cc rejects this.  */
-  struct point {int x, y;};
-  static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
-     It does not let you subtract one const X* pointer from another in
-     an arm of an if-expression whose if-part is not a constant
-     expression */
-  const char *g = "string";
-  pcpcc = &g + (g ? g-g : 0);
-  /* HPUX 7.0 cc rejects these. */
-  ++pcpcc;
-  ppc = (char**) pcpcc;
-  pcpcc = (char const *const *) ppc;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
-    char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-    *t++ = 0;
-    if (s) return 0;
-  }
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-    int x[] = {25, 17};
-    const int *foo = &x[0];
-    ++foo;
-  }
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-    typedef const int *iptr;
-    iptr p = 0;
-    ++p;
-  }
-  { /* AIX XL C 1.02.0.0 rejects this saying
-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
-  }
-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-    const int foo = 10;
-    if (!foo) return 0;
-  }
-  return !cs[0] && !zero.x;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_c_const=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_c_const=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define const /**/
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
-$as_echo_n "checking for size_t... " >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_type_size_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (size_t))
-       return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((size_t)))
-	  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_size_t=yes
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-$as_echo "$ac_cv_type_size_t" >&6; }
-if test "x$ac_cv_type_size_t" = x""yes; then
-  :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5
-$as_echo_n "checking whether setpgrp takes no argument... " >&6; }
-if test "${ac_cv_func_setpgrp_void+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: cannot check setpgrp when cross compiling" >&5
-$as_echo "$as_me: error: cannot check setpgrp when cross compiling" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-/* If this system has a BSD-style setpgrp which takes arguments,
-  setpgrp(1, 1) will fail with ESRCH and return -1, in that case
-  exit successfully. */
-  return setpgrp (1,1) != -1;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_setpgrp_void=no
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_setpgrp_void=yes
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp_void" >&5
-$as_echo "$ac_cv_func_setpgrp_void" >&6; }
-if test $ac_cv_func_setpgrp_void = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define SETPGRP_VOID 1
-_ACEOF
-
-fi
-
-
-
-{ $as_echo "$as_me:$LINENO: checking for socklen_t" >&5
-$as_echo_n "checking for socklen_t... " >&6; }
-if test "${ac_cv_socklen_t+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-int
-main ()
-{
-
-socklen_t foo = (socklen_t) 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-
-    ac_cv_socklen_t=yes
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-    ac_cv_socklen_t=no
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_socklen_t" >&5
-$as_echo "$ac_cv_socklen_t" >&6; }
-
-if test "$ac_cv_socklen_t" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SOCKLEN_T 1
-_ACEOF
-
-fi
-
-
-
-  { $as_echo "$as_me:$LINENO: checking whether system defines INADDR_NONE" >&5
-$as_echo_n "checking whether system defines INADDR_NONE... " >&6; }
-if test "${ac_cv_inaddr_none+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-
-int
-main ()
-{
-
-unsigned long foo = INADDR_NONE;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-
-    ac_cv_inaddr_none=yes
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-    ac_cv_inaddr_none=no
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_inaddr_none" >&5
-$as_echo "$ac_cv_inaddr_none" >&6; }
-  if test "$ac_cv_inaddr_none" = "no"; then
-    apr_inaddr_none="((unsigned int) 0xffffffff)"
-  else
-    apr_inaddr_none="INADDR_NONE"
-  fi
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of void*" >&5
-$as_echo_n "checking size of void*... " >&6; }
-if test "${ac_cv_sizeof_voidp+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (void*))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (void*))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (void*))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (void*))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (void*))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_voidp=$ac_lo;;
-'') if test "$ac_cv_type_voidp" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void*)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (void*)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-   else
-     ac_cv_sizeof_voidp=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (void*)); }
-static unsigned long int ulongval () { return (long int) (sizeof (void*)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (void*))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (void*))))
-	return 1;
-      fprintf (f, "%ld", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (void*))))
-	return 1;
-      fprintf (f, "%lu", i);
-    }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_voidp=`cat conftest.val`
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_voidp" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void*)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (void*)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-   else
-     ac_cv_sizeof_voidp=0
-   fi
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_voidp" >&5
-$as_echo "$ac_cv_sizeof_voidp" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_VOIDP $ac_cv_sizeof_voidp
-_ACEOF
-
-
-
-if test "x$ac_cv_sizeof_voidp" != "x"; then
-    voidp_size=$ac_cv_sizeof_voidp
-else
-    { { $as_echo "$as_me:$LINENO: error: Cannot determine size of void*" >&5
-$as_echo "$as_me: error: Cannot determine size of void*" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of char" >&5
-$as_echo_n "checking size of char... " >&6; }
-if test "${ac_cv_sizeof_char+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (char))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_char=$ac_lo;;
-'') if test "$ac_cv_type_char" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (char)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-   else
-     ac_cv_sizeof_char=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (char)); }
-static unsigned long int ulongval () { return (long int) (sizeof (char)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (char))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (char))))
-	return 1;
-      fprintf (f, "%ld", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (char))))
-	return 1;
-      fprintf (f, "%lu", i);
-    }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_char=`cat conftest.val`
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_char" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (char)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-   else
-     ac_cv_sizeof_char=0
-   fi
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
-$as_echo "$ac_cv_sizeof_char" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_CHAR $ac_cv_sizeof_char
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of int" >&5
-$as_echo_n "checking size of int... " >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_int=$ac_lo;;
-'') if test "$ac_cv_type_int" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-   else
-     ac_cv_sizeof_int=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (int)); }
-static unsigned long int ulongval () { return (long int) (sizeof (int)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (int))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (int))))
-	return 1;
-      fprintf (f, "%ld", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (int))))
-	return 1;
-      fprintf (f, "%lu", i);
-    }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_int=`cat conftest.val`
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_int" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-   else
-     ac_cv_sizeof_int=0
-   fi
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-$as_echo "$ac_cv_sizeof_int" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long=$ac_lo;;
-'') if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-   else
-     ac_cv_sizeof_long=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (long)); }
-static unsigned long int ulongval () { return (long int) (sizeof (long)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (long))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (long))))
-	return 1;
-      fprintf (f, "%ld", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (long))))
-	return 1;
-      fprintf (f, "%lu", i);
-    }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long=`cat conftest.val`
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-   else
-     ac_cv_sizeof_long=0
-   fi
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of short" >&5
-$as_echo_n "checking size of short... " >&6; }
-if test "${ac_cv_sizeof_short+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_short=$ac_lo;;
-'') if test "$ac_cv_type_short" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-   else
-     ac_cv_sizeof_short=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (short)); }
-static unsigned long int ulongval () { return (long int) (sizeof (short)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (short))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (short))))
-	return 1;
-      fprintf (f, "%ld", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (short))))
-	return 1;
-      fprintf (f, "%lu", i);
-    }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_short=`cat conftest.val`
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_short" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-   else
-     ac_cv_sizeof_short=0
-   fi
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-$as_echo "$ac_cv_sizeof_short" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of long double" >&5
-$as_echo_n "checking size of long double... " >&6; }
-if test "${ac_cv_sizeof_long_double+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long double))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long double))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long double))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long double))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long double))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_double=$ac_lo;;
-'') if test "$ac_cv_type_long_double" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long double)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (long double)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-   else
-     ac_cv_sizeof_long_double=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (long double)); }
-static unsigned long int ulongval () { return (long int) (sizeof (long double)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (long double))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (long double))))
-	return 1;
-      fprintf (f, "%ld", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (long double))))
-	return 1;
-      fprintf (f, "%lu", i);
-    }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_double=`cat conftest.val`
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_long_double" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long double)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (long double)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-   else
-     ac_cv_sizeof_long_double=0
-   fi
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_double" >&5
-$as_echo "$ac_cv_sizeof_long_double" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_DOUBLE $ac_cv_sizeof_long_double
-_ACEOF
-
-
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:$LINENO: checking size of long long" >&5
-$as_echo_n "checking size of long long... " >&6; }
-if test "${ac_cv_sizeof_long_long+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_long=$ac_lo;;
-'') if test "$ac_cv_type_long_long" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-   else
-     ac_cv_sizeof_long_long=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-static long int longval () { return (long int) (sizeof (long long)); }
-static unsigned long int ulongval () { return (long int) (sizeof (long long)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (long long))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (long long))))
-	return 1;
-      fprintf (f, "%ld", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (long long))))
-	return 1;
-      fprintf (f, "%lu", i);
-    }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_long=`cat conftest.val`
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_long_long" = yes; then
-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
-   else
-     ac_cv_sizeof_long_long=0
-   fi
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-$as_echo "$ac_cv_sizeof_long_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-_ACEOF
-
-
-
-if test "$ac_cv_sizeof_short" = "2"; then
-    short_value=short
-fi
-if test "$ac_cv_sizeof_int" = "4"; then
-    int_value=int
-fi
-# Now we need to find what apr_int64_t (sizeof == 8) will be.
-# The first match is our preference.
-if test "$ac_cv_sizeof_int" = "8"; then
-    int64_literal='#define APR_INT64_C(val) (val)'
-    int64_t_fmt='#define APR_INT64_T_FMT "d"'
-    int64_t_fmt_len='#define APR_INT64_T_FMT_LEN 1'
-    uint64_t_fmt='#define APR_UINT64_T_FMT "u"'
-    uint64_t_fmt_len='#define APR_UINT64_T_FMT_LEN 1'
-    uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "x"'
-    int64_value="int"
-    long_value=int
-    int64_strfn="strtoi"
-elif test "$ac_cv_sizeof_long" = "8"; then
-    int64_literal='#define APR_INT64_C(val) (val##L)'
-    int64_t_fmt='#define APR_INT64_T_FMT "ld"'
-    int64_t_fmt_len='#define APR_INT64_T_FMT_LEN 2'
-    uint64_t_fmt='#define APR_UINT64_T_FMT "lu"'
-    uint64_t_fmt_len='#define APR_UINT64_T_FMT_LEN 2'
-    uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "lx"'
-    int64_value="long"
-    long_value=long
-    int64_strfn="strtol"
-elif test "$ac_cv_sizeof_long_long" = "8"; then
-    int64_literal='#define APR_INT64_C(val) (val##LL)'
-    # Linux, Solaris, FreeBSD all support ll with printf.
-    # BSD 4.4 originated 'q'.  Solaris is more popular and
-    # doesn't support 'q'.  Solaris wins.  Exceptions can
-    # go to the OS-dependent section.
-    int64_t_fmt='#define APR_INT64_T_FMT "lld"'
-    int64_t_fmt_len='#define APR_INT64_T_FMT_LEN 3'
-    uint64_t_fmt='#define APR_UINT64_T_FMT "llu"'
-    uint64_t_fmt_len='#define APR_UINT64_T_FMT_LEN 3'
-    uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "llx"'
-    int64_value="long long"
-    long_value="long long"
-    int64_strfn="strtoll"
-elif test "$ac_cv_sizeof_long_double" = "8"; then
-    int64_literal='#define APR_INT64_C(val) (val##LD)'
-    int64_t_fmt='#define APR_INT64_T_FMT "Ld"'
-    int64_t_fmt_len='#define APR_INT64_T_FMT_LEN 2'
-    uint64_t_fmt='#define APR_UINT64_T_FMT "Lu"'
-    uint64_t_fmt_len='#define APR_UINT64_T_FMT_LEN 2'
-    uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "Lx"'
-    int64_value="long double"
-    long_value="long double"
-    int64_strfn="strtoll"
-elif test "$ac_cv_sizeof_longlong" = "8"; then
-    int64_literal='#define APR_INT64_C(val) (val##LL)'
-    int64_t_fmt='#define APR_INT64_T_FMT "qd"'
-    int64_t_fmt_len='#define APR_INT64_T_FMT_LEN 2'
-    uint64_t_fmt='#define APR_UINT64_T_FMT "qu"'
-    uint64_t_fmt_len='#define APR_UINT64_T_FMT_LEN 2'
-    uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "qx"'
-    int64_value="__int64"
-    long_value="__int64"
-    int64_strfn="strtoll"
-else
-    # int64_literal may be overriden if your compiler thinks you have
-    # a 64-bit value but APR does not agree.
-    int64_literal='#error Can not determine the proper size for apr_int64_t'
-    int64_t_fmt='#error Can not determine the proper size for apr_int64_t'
-    int64_t_fmt_len='#error Can not determine the proper size for apr_int64_t'
-    uint64_t_fmt='#error Can not determine the proper size for apr_int64_t'
-    uint64_t_fmt_len='#error Can not determine the proper size for apr_int64_t'
-    uint64_t_hex_fmt='#error Can not determine the proper size for apr_uint64_t'
-fi
-
-# If present, allow the C99 macro INT64_C to override our conversion.
-#
-# HP-UX's ANSI C compiler provides this without any includes, so we
-# will first look for INT64_C without adding stdint.h
-{ $as_echo "$as_me:$LINENO: checking for INT64_C" >&5
-$as_echo_n "checking for INT64_C... " >&6; }
-if test "${apr_cv_define_INT64_C+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef INT64_C
-YES_IS_DEFINED
-#endif
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then
-  apr_cv_define_INT64_C=yes
-else
-
-    # Now check for INT64_C in stdint.h
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdint.h>
-#ifdef INT64_C
-YES_IS_DEFINED
-#endif
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then
-  apr_cv_define_INT64_C=yes
-else
-  apr_cv_define_INT64_C=no
-fi
-rm -f conftest*
-
-fi
-rm -f conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $apr_cv_define_INT64_C" >&5
-$as_echo "$apr_cv_define_INT64_C" >&6; }
-
-if test "$apr_cv_define_INT64_C" = "yes"; then
-    int64_literal='#define APR_INT64_C(val) INT64_C(val)'
-    stdint=1
-else
-    stdint=0
-fi
-
-if test "$ac_cv_type_size_t" = "yes"; then
-    size_t_value="size_t"
-else
-    size_t_value="apr_int32_t"
-fi
-if test "$ac_cv_type_ssize_t" = "yes"; then
-    ssize_t_value="ssize_t"
-else
-    ssize_t_value="apr_int32_t"
-fi
-if test "$ac_cv_socklen_t" = "yes"; then
-    socklen_t_value="socklen_t"
-    case $host in
-        *-hp-hpux*)
-            if test "$ac_cv_sizeof_long" = "8"; then
-                # 64-bit HP-UX requires 32-bit socklens in
-                # kernel, but user-space declarations say
-                # 64-bit (socklen_t == size_t == long).
-                # This will result in many compile warnings,
-                # but we're functionally busted otherwise.
-                socklen_t_value="int"
-            fi
-            ;;
-    esac
-else
-    socklen_t_value="int"
-fi
-
-{ $as_echo "$as_me:$LINENO: checking size of ssize_t" >&5
-$as_echo_n "checking size of ssize_t... " >&6; }
-if test "${ac_cv_sizeof_ssize_t+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_ssize_t=8
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-#include <sys/types.h>
-main()
-{
-  FILE *f=fopen("conftestval","w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(ssize_t));
-  exit(0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_ssize_t=`cat conftestval`
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_sizeof_ssize_t=0
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_ssize_t" >&5
-$as_echo "$ac_cv_sizeof_ssize_t" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SSIZE_T $ac_cv_sizeof_ssize_t
-_ACEOF
-
-
-
-if test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_int"; then
-    ssize_t_fmt='#define APR_SSIZE_T_FMT "d"'
-elif test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_long"; then
-    ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
-else
-    ssize_t_fmt='#error Can not determine the proper size for ssize_t'
-fi
-
-{ $as_echo "$as_me:$LINENO: checking size of size_t" >&5
-$as_echo_n "checking size of size_t... " >&6; }
-if test "${ac_cv_sizeof_size_t+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_size_t=8
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-#include <stddef.h>
-main()
-{
-  FILE *f=fopen("conftestval","w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(size_t));
-  exit(0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_size_t=`cat conftestval`
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_sizeof_size_t=0
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
-$as_echo "$ac_cv_sizeof_size_t" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
-_ACEOF
-
-
-
-if test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_int"; then
-    size_t_fmt='#define APR_SIZE_T_FMT "d"'
-elif test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_long"; then
-    size_t_fmt='#define APR_SIZE_T_FMT "ld"'
-else
-    size_t_fmt='#error Can not determine the proper size for size_t'
-fi
-
-if test "$ac_cv_type_off_t" = "yes"; then
-    { $as_echo "$as_me:$LINENO: checking size of off_t" >&5
-$as_echo_n "checking size of off_t... " >&6; }
-if test "${ac_cv_sizeof_off_t+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_off_t=8
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-#include <sys/types.h>
-main()
-{
-  FILE *f=fopen("conftestval","w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(off_t));
-  exit(0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_off_t=`cat conftestval`
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_sizeof_off_t=0
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
-$as_echo "$ac_cv_sizeof_off_t" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_OFF_T $ac_cv_sizeof_off_t
-_ACEOF
-
-
-    { $as_echo "$as_me:$LINENO: checking which type to use for apr_off_t" >&5
-$as_echo_n "checking which type to use for apr_off_t... " >&6; }
-    if test "${ac_cv_sizeof_off_t}${ac_cv_sizeof_long}" = "44"; then
-        # Special case: off_t may change size with _FILE_OFFSET_BITS
-        # on 32-bit systems with LFS support.  To avoid compatibility
-        # issues when other packages do define _FILE_OFFSET_BITS,
-        # hard-code apr_off_t to long.
-        off_t_value=long
-        off_t_fmt='#define APR_OFF_T_FMT "ld"'
-    else
-        off_t_value=off_t
-        # off_t is more commonly a long than an int; prefer that case
-        # where int and long are the same size.
-        if test "$ac_cv_sizeof_off_t" = "$ac_cv_sizeof_long"; then
-            off_t_fmt='#define APR_OFF_T_FMT "ld"'
-        elif test "$ac_cv_sizeof_off_t" = "$ac_cv_sizeof_int"; then
-            off_t_fmt='#define APR_OFF_T_FMT "d"'
-        elif test "$ac_cv_sizeof_off_t" = "$ac_cv_sizeof_long_long"; then
-            off_t_fmt='#define APR_OFF_T_FMT APR_INT64_T_FMT'
-        else
-            { { $as_echo "$as_me:$LINENO: error: could not determine the size of off_t" >&5
-$as_echo "$as_me: error: could not determine the size of off_t" >&2;}
-   { (exit 1); exit 1; }; }
-        fi
-    fi
-    { $as_echo "$as_me:$LINENO: result: $off_t_value" >&5
-$as_echo "$off_t_value" >&6; }
-
-            ino_t_value=ino_t
-
-
-{ $as_echo "$as_me:$LINENO: checking whether ino_t and unsigned long long are the same" >&5
-$as_echo_n "checking whether ino_t and unsigned long long are the same... " >&6; }
-if test "${apr_cv_typematch_ino_t_unsigned_long_long+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-
-    int foo[0 - !__builtin_types_compatible_p(ino_t, unsigned long long)];
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  apr_cv_typematch_ino_t_unsigned_long_long=yes ino_t_value="unsigned long long"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	apr_cv_typematch_ino_t_unsigned_long_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $apr_cv_typematch_ino_t_unsigned_long_long" >&5
-$as_echo "$apr_cv_typematch_ino_t_unsigned_long_long" >&6; }
-
-
-
-{ $as_echo "$as_me:$LINENO: checking whether ino_t and unsigned long are the same" >&5
-$as_echo_n "checking whether ino_t and unsigned long are the same... " >&6; }
-if test "${apr_cv_typematch_ino_t_unsigned_long+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-
-    int foo[0 - !__builtin_types_compatible_p(ino_t, unsigned long)];
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  apr_cv_typematch_ino_t_unsigned_long=yes ino_t_value="unsigned long"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	apr_cv_typematch_ino_t_unsigned_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $apr_cv_typematch_ino_t_unsigned_long" >&5
-$as_echo "$apr_cv_typematch_ino_t_unsigned_long" >&6; }
-
-
-
-{ $as_echo "$as_me:$LINENO: checking whether ino_t and unsigned int are the same" >&5
-$as_echo_n "checking whether ino_t and unsigned int are the same... " >&6; }
-if test "${apr_cv_typematch_ino_t_unsigned_int+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-
-    int foo[0 - !__builtin_types_compatible_p(ino_t, unsigned int)];
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  apr_cv_typematch_ino_t_unsigned_int=yes ino_t_value="unsigned int"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	apr_cv_typematch_ino_t_unsigned_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $apr_cv_typematch_ino_t_unsigned_int" >&5
-$as_echo "$apr_cv_typematch_ino_t_unsigned_int" >&6; }
-
-
-else
-    off_t_value='apr_int32_t'
-    off_t_fmt='#define APR_OFF_T_FMT "d"'
-fi
-
-{ $as_echo "$as_me:$LINENO: checking size of pid_t" >&5
-$as_echo_n "checking size of pid_t... " >&6; }
-if test "${ac_cv_sizeof_pid_t+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_pid_t=8
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-#include <sys/types.h>
-main()
-{
-  FILE *f=fopen("conftestval","w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(pid_t));
-  exit(0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_pid_t=`cat conftestval`
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_sizeof_pid_t=0
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_pid_t" >&5
-$as_echo "$ac_cv_sizeof_pid_t" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_PID_T $ac_cv_sizeof_pid_t
-_ACEOF
-
-
-
-if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then
-    pid_t_fmt='#define APR_PID_T_FMT "hd"'
-elif test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_int"; then
-    pid_t_fmt='#define APR_PID_T_FMT "d"'
-elif test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_long"; then
-    pid_t_fmt='#define APR_PID_T_FMT "ld"'
-elif test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_long_long"; then
-    pid_t_fmt='#define APR_PID_T_FMT APR_INT64_T_FMT'
-else
-    pid_t_fmt='#error Can not determine the proper size for pid_t'
-fi
-
-# Basically, we have tried to figure out the correct format strings
-# for APR types which vary between platforms, but we don't always get
-# it right.  If you find that we don't get it right for your platform,
-# you can override our decision below.
-case $host in
-   *linux*)
-       case $host in
-           s390*)
-               size_t_fmt='#define APR_SIZE_T_FMT "ld"'
-               ;;
-       esac
-       ;;
-   *os2_emx)
-       size_t_fmt='#define APR_SIZE_T_FMT "lu"'
-       ;;
-   *-solaris*)
-       pid_t_fmt='#define APR_PID_T_FMT "ld"'
-       ;;
-   *aix4*|*aix5*)
-       ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
-       size_t_fmt='#define APR_SIZE_T_FMT "lu"'
-       ;;
-    *beos*)
-        ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
-        size_t_fmt='#define APR_SIZE_T_FMT "ld"'
-        ;;
-    *apple-darwin*)
-        osver=`uname -r`
-        case $osver in
-           [0-7].*)
-              ssize_t_fmt='#define APR_SSIZE_T_FMT "d"'
-              ;;
-           *)
-              ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
-              ;;
-        esac
-        size_t_fmt='#define APR_SIZE_T_FMT "lu"'
-        ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_func in strnicmp
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- have_strnicmp="1"
-else
-  have_strnicmp="0"
-fi
-done
-
-
-for ac_func in strncasecmp
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- have_strncasecmp="1"
-else
-  have_strncasecmp="0"
-fi
-done
-
-
-for ac_func in stricmp
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- have_stricmp="1"
-else
-  have_stricmp="0"
-fi
-done
-
-
-for ac_func in strcasecmp
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- have_strcasecmp="1"
-else
-  have_strcasecmp="0"
-fi
-done
-
-
-for ac_func in strdup
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- have_strdup="1"
-else
-  have_strdup="0"
-fi
-done
-
-
-for ac_func in strstr
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- have_strstr="1"
-else
-  have_strstr="0"
-fi
-done
-
-
-for ac_func in memchr
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- have_memchr="1"
-else
-  have_memchr="0"
-fi
-done
-
-
-for ac_func in $int64_strfn
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- have_int64_strfn="1"
-else
-  have_int64_strfn="0"
-fi
-done
-
-
-if test "$have_int64_strfn" = "0" && test "$int64_strfn" = "strtoll"; then
-    int64_strfn="strtoq"
-
-for ac_func in $int64_strfn
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- have_int64_strfn="1"
-else
-  have_int64_strfn="0"
-fi
-done
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-echo "${nl}Checking for DSO..."
-# Check whether --enable-dso was given.
-if test "${enable_dso+set}" = set; then
-  enableval=$enable_dso;  tempdso=$enableval
-else
-
-
-for ac_func in NSLinkModule
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-  tempdso="dyld"
-else
-   tempdso="no"
-fi
-done
-
-    if test "$tempdso" = "no"; then
-      { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dld_shl_load=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
-   tempdso="shl"
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-ldld\""
-    LIBS="-ldld"
-  else
-    apr_addto_bugger="-ldld"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-else
-  tempdso="no"
-fi
-
-    fi
-    if test "$tempdso" = "no"; then
-
-for ac_func in dlopen
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-  tempdso="dlfcn"
-else
-   tempdso="no"
-fi
-done
-
-    fi
-    if test "$tempdso" = "no"; then
-      { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-   tempdso="dlfcn"
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-ldl\""
-    LIBS="-ldl"
-  else
-    apr_addto_bugger="-ldl"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-else
-  tempdso="no"
-fi
-
-    fi
-    if test "$tempdso" = "dlfcn"; then
-        # ReliantUnix has dlopen() in libc but dlsym() in libdl :(
-
-for ac_func in dlsym
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-  tempdso="dlfcn"
-else
-   tempdso="no"
-fi
-done
-
-        if test "$tempdso" = "no"; then
-            { $as_echo "$as_me:$LINENO: checking for dlsym in -ldl" >&5
-$as_echo_n "checking for dlsym in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlsym+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlsym ();
-int
-main ()
-{
-return dlsym ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_dl_dlsym=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlsym=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5
-$as_echo "$ac_cv_lib_dl_dlsym" >&6; }
-if test "x$ac_cv_lib_dl_dlsym" = x""yes; then
-   tempdso="dlfcn"
-  if test "x$LIBS" = "x"; then
-    echo "  setting LIBS to \"-ldl\""
-    LIBS="-ldl"
-  else
-    apr_addto_bugger="-ldl"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
-      fi
-    done
-  fi
-
-else
-  tempdso="no"
-fi
-
-        fi
-        if test "$tempdso" = "no"; then
-            echo "Weird: dlopen() was found but dlsym() was not found!"
-        fi
-    fi
-    if test "$tempdso" = "no"; then
-      { $as_echo "$as_me:$LINENO: checking for load_image in -lroot" >&5
-$as_echo_n "checking for load_image in -lroot... " >&6; }
-if test "${ac_cv_lib_root_load_image+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lroot  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char load_image ();
-int
-main ()
-{
-return load_image ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_root_load_image=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_root_load_image=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_root_load_image" >&5
-$as_echo "$ac_cv_lib_root_load_image" >&6; }
-if test "x$ac_cv_lib_root_load_image" = x""yes; then
-  tempdso="yes"
-else
-  tempdso="no"
-fi
-
-    fi
-    if test "$tempdso" = "no"; then
-        case $host in
-            *os390|*-os2*|*os400)
-                tempdso="yes"
-                ;;
-        esac
-    fi
-
-fi
-
-
-if test "$tempdso" = "no"; then
-    aprdso="0"
-else
-    case "$tempdso" in
-    dlfcn)
-cat >>confdefs.h <<\_ACEOF
-#define DSO_USE_DLFCN 1
-_ACEOF
-;;
-    shl)
-cat >>confdefs.h <<\_ACEOF
-#define DSO_USE_SHL 1
-_ACEOF
-;;
-    dyld)
-cat >>confdefs.h <<\_ACEOF
-#define DSO_USE_DYLD 1
-_ACEOF
-;;
-    esac
-    aprdso="1"
-    apr_modules="$apr_modules dso"
-fi
-
-
-
-echo "${nl}Checking for Processes..."
-
-
-for ac_func in waitpid
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-# Check whether --enable-other-child was given.
-if test "${enable_other_child+set}" = set; then
-  enableval=$enable_other_child;  if test "$enableval" = "yes"; then
-        oc="1"
-    else
-        oc="0"
-    fi
-else
-   oc=1
-fi
-
-
-
-
-{ $as_echo "$as_me:$LINENO: checking for Variable Length Arrays" >&5
-$as_echo_n "checking for Variable Length Arrays... " >&6; }
-if test "x$CFLAGS_WARN" = "x"; then
-  apr_tcnw_flags=""
-else
-  apr_tcnw_flags=$CFLAGS_WARN
-fi
-if test "$ac_cv_c_compiler_gnu" = "yes"; then
-  apr_tcnw_flags="$apr_tcnw_flags -Werror"
-fi
-
-cat > conftest.$ac_ext <<EOTEST
-#include "confdefs.h"
-
-int main(int argc, const char * const *argv) {
-
-    int foo[argc];
-    foo[0] = 0;
-
-; return 0; }
-EOTEST
-
-if ${CC-cc} -c $CFLAGS $CPPFLAGS $apr_tcnw_flags conftest.$ac_ext 2>&5 ; then
-  rm -rf conftest*
-  vla_msg=yes
-else
-  echo "configure: failed or warning program:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  vla_msg=no
-fi
-rm -f conftest*
-
-{ $as_echo "$as_me:$LINENO: result: $vla_msg" >&5
-$as_echo "$vla_msg" >&6; }
-if test "$vla_msg" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_VLA 1
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking struct rlimit" >&5
-$as_echo_n "checking struct rlimit... " >&6; }
-if test "${ac_cv_struct_rlimit+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-if test "$cross_compiling" = yes; then
-
-    ac_cv_struct_rlimit=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-main()
-{
-    struct rlimit limit;
-    limit.rlim_cur = 0;
-    limit.rlim_max = 0;
-    exit(0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-    ac_cv_struct_rlimit=yes
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-    ac_cv_struct_rlimit=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_rlimit" >&5
-$as_echo "$ac_cv_struct_rlimit" >&6; }
-struct_rlimit=0
-test "x$ac_cv_struct_rlimit" = xyes && struct_rlimit=1
-
-
-echo "${nl}Checking for Locking..."
-
-
-
-
-for ac_func in semget semctl flock
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-for ac_header in semaphore.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-for ac_func in sem_close sem_unlink sem_post sem_wait
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-# Some systems return ENOSYS from sem_open.
-{ $as_echo "$as_me:$LINENO: checking for working sem_open" >&5
-$as_echo_n "checking for working sem_open... " >&6; }
-if test "${ac_cv_func_sem_open+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-if test "$cross_compiling" = yes; then
-  ac_cv_func_sem_open=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <errno.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <semaphore.h>
-main()
-{
-    sem_t *psem;
-    const char *sem_name = "/apr_autoconf";
-
-    if (sizeof(int) < sizeof(sem_t *))
-        exit(1);
-    psem = sem_open(sem_name, O_CREAT, 0644, 1);
-    if (psem == (sem_t *)SEM_FAILED) {
-	exit(1);
-    }
-    sem_close(psem);
-    sem_unlink(sem_name);
-    exit(0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_sem_open=yes
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_sem_open=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_sem_open" >&5
-$as_echo "$ac_cv_func_sem_open" >&6; }
-
-# It's stupid, but not all platforms have union semun, even those that need it.
-{ $as_echo "$as_me:$LINENO: checking for union semun in sys/sem.h" >&5
-$as_echo_n "checking for union semun in sys/sem.h... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-
-int
-main ()
-{
-
-union semun arg;
-semctl(0, 0, 0, arg);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  have_union_semun="1" union_semun=yes
-msg=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-have_union_semun="0"
-msg=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $msg" >&5
-$as_echo "$msg" >&6; }
-
-
-
-  { $as_echo "$as_me:$LINENO: checking for LOCK_EX in sys/file.h" >&5
-$as_echo_n "checking for LOCK_EX in sys/file.h... " >&6; }
-if test "${ac_cv_define_LOCK_EX+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <sys/file.h>
-#ifdef LOCK_EX
-YES_IS_DEFINED
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then
-  ac_cv_define_LOCK_EX=yes
-else
-  ac_cv_define_LOCK_EX=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_LOCK_EX" >&5
-$as_echo "$ac_cv_define_LOCK_EX" >&6; }
-  if test "$ac_cv_define_LOCK_EX" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LOCK_EX 1
-_ACEOF
-
-  fi
-
-
-  { $as_echo "$as_me:$LINENO: checking for F_SETLK in fcntl.h" >&5
-$as_echo_n "checking for F_SETLK in fcntl.h... " >&6; }
-if test "${ac_cv_define_F_SETLK+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <fcntl.h>
-#ifdef F_SETLK
-YES_IS_DEFINED
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then
-  ac_cv_define_F_SETLK=yes
-else
-  ac_cv_define_F_SETLK=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_F_SETLK" >&5
-$as_echo "$ac_cv_define_F_SETLK" >&6; }
-  if test "$ac_cv_define_F_SETLK" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_F_SETLK 1
-_ACEOF
-
-  fi
-
-
-  { $as_echo "$as_me:$LINENO: checking for SEM_UNDO in sys/sem.h" >&5
-$as_echo_n "checking for SEM_UNDO in sys/sem.h... " >&6; }
-if test "${ac_cv_define_SEM_UNDO+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <sys/sem.h>
-#ifdef SEM_UNDO
-YES_IS_DEFINED
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then
-  ac_cv_define_SEM_UNDO=yes
-else
-  ac_cv_define_SEM_UNDO=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_SEM_UNDO" >&5
-$as_echo "$ac_cv_define_SEM_UNDO" >&6; }
-  if test "$ac_cv_define_SEM_UNDO" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SEM_UNDO 1
-_ACEOF
-
-  fi
-
-
-# We are assuming that if the platform doesn't have POLLIN, it doesn't have
-# any POLL definitions.
-
-  { $as_echo "$as_me:$LINENO: checking for POLLIN in poll.h sys/poll.h" >&5
-$as_echo_n "checking for POLLIN in poll.h sys/poll.h... " >&6; }
-if test "${ac_cv_define_POLLIN+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-    ac_cv_define_POLLIN=no
-    for curhdr in poll.h sys/poll.h
-    do
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <$curhdr>
-#ifdef POLLIN
-YES_IS_DEFINED
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then
-  ac_cv_define_POLLIN=yes
-fi
-rm -f conftest*
-
-    done
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_POLLIN" >&5
-$as_echo "$ac_cv_define_POLLIN" >&6; }
-  if test "$ac_cv_define_POLLIN" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_POLLIN 1
-_ACEOF
-
-  fi
-
-
-if test "$threads" = "1"; then
-
-  { $as_echo "$as_me:$LINENO: checking for PTHREAD_PROCESS_SHARED in pthread.h" >&5
-$as_echo_n "checking for PTHREAD_PROCESS_SHARED in pthread.h... " >&6; }
-if test "${ac_cv_define_PTHREAD_PROCESS_SHARED+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <pthread.h>
-#ifdef PTHREAD_PROCESS_SHARED
-YES_IS_DEFINED
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then
-  ac_cv_define_PTHREAD_PROCESS_SHARED=yes
-else
-  ac_cv_define_PTHREAD_PROCESS_SHARED=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_PTHREAD_PROCESS_SHARED" >&5
-$as_echo "$ac_cv_define_PTHREAD_PROCESS_SHARED" >&6; }
-  if test "$ac_cv_define_PTHREAD_PROCESS_SHARED" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PTHREAD_PROCESS_SHARED 1
-_ACEOF
-
-  fi
-
-
-for ac_func in pthread_mutexattr_setpshared
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-    # Some systems have setpshared and define PROCESS_SHARED, but don't
-    # really support PROCESS_SHARED locks.  So, we must validate that we
-    # can go through the steps without receiving some sort of system error.
-    # Linux and older versions of AIX have this problem.
-    ac_rc=yes
-for ac_spec in header:pthread.h define:PTHREAD_PROCESS_SHARED func:pthread_mutexattr_setpshared; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        struct ) ac_var="ac_cv_struct_$ac_item" ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-
-      { $as_echo "$as_me:$LINENO: checking for working PROCESS_SHARED locks" >&5
-$as_echo_n "checking for working PROCESS_SHARED locks... " >&6; }
-if test "${apr_cv_process_shared_works+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-      if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <pthread.h>
-        int main()
-        {
-            pthread_mutex_t mutex;
-            pthread_mutexattr_t attr;
-            if (pthread_mutexattr_init(&attr))
-                exit(1);
-            if (pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED))
-                exit(2);
-            if (pthread_mutex_init(&mutex, &attr))
-                exit(3);
-            if (pthread_mutexattr_destroy(&attr))
-                exit(4);
-            if (pthread_mutex_destroy(&mutex))
-                exit(5);
-            exit(0);
-        }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  apr_cv_process_shared_works=yes
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-apr_cv_process_shared_works=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $apr_cv_process_shared_works" >&5
-$as_echo "$apr_cv_process_shared_works" >&6; }
-      # Override detection of pthread_mutexattr_setpshared
-      ac_cv_func_pthread_mutexattr_setpshared=$apr_cv_process_shared_works
-else
-    :
-
-fi
-
-
-    if test "$ac_cv_func_pthread_mutexattr_setpshared" = "yes"; then
-
-{ $as_echo "$as_me:$LINENO: checking for robust cross-process mutex support" >&5
-$as_echo_n "checking for robust cross-process mutex support... " >&6; }
-if test "${apr_cv_mutex_robust_shared+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <pthread.h>
-#include <stdlib.h>
-
-int main(int argc, char **argv)
-{
-    pthread_mutex_t mutex;
-    pthread_mutexattr_t attr;
-
-    if (pthread_mutexattr_init(&attr))
-        exit(1);
-    if (pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED))
-        exit(2);
-    if (pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST_NP))
-        exit(3);
-    if (pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT))
-        exit(4);
-    if (pthread_mutex_init(&mutex, &attr))
-        exit(5);
-    if (pthread_mutexattr_destroy(&attr))
-        exit(6);
-    if (pthread_mutex_destroy(&mutex))
-        exit(7);
-
-    exit(0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  apr_cv_mutex_robust_shared=yes
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-apr_cv_mutex_robust_shared=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $apr_cv_mutex_robust_shared" >&5
-$as_echo "$apr_cv_mutex_robust_shared" >&6; }
-
-if test "$apr_cv_mutex_robust_shared" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PTHREAD_MUTEX_ROBUST 1
-_ACEOF
-
-fi
-
-    fi
-fi
-
-# See which lock mechanisms we can support on this system.
-ac_rc=yes
-for ac_spec in header:semaphore.h func:sem_open func:sem_close              func:sem_unlink func:sem_post func:sem_wait; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        struct ) ac_var="ac_cv_struct_$ac_item" ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-    hasposixser="1"
-else
-    :
-    hasposixser="0"
-fi
-
-ac_rc=yes
-for ac_spec in func:semget func:semctl define:SEM_UNDO; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        struct ) ac_var="ac_cv_struct_$ac_item" ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-    hassysvser="1"
-else
-    :
-    hassysvser="0"
-fi
-
-ac_rc=yes
-for ac_spec in func:flock define:LOCK_EX; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        struct ) ac_var="ac_cv_struct_$ac_item" ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-    hasflockser="1"
-else
-    :
-    hasflockser="0"
-fi
-
-ac_rc=yes
-for ac_spec in header:fcntl.h define:F_SETLK; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        struct ) ac_var="ac_cv_struct_$ac_item" ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-    hasfcntlser="1"
-else
-    :
-    hasfcntlser="0"
-fi
-
-# note: the current APR use of shared mutex requires /dev/zero
-ac_rc=yes
-for ac_spec in header:pthread.h define:PTHREAD_PROCESS_SHARED              func:pthread_mutexattr_setpshared              file:/dev/zero; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        struct ) ac_var="ac_cv_struct_$ac_item" ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-    hasprocpthreadser="1"
-else
-    :
-    hasprocpthreadser="0"
-fi
-
-ac_rc=yes
-for ac_spec in struct:pthread_rw; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        struct ) ac_var="ac_cv_struct_$ac_item" ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-    hasrwlockser="1"
-else
-    :
-    hasrwlockser="0"
-fi
-
-
-# See which lock mechanism we'll select by default on this system.
-# The last APR_DECIDE to execute sets the default.
-# At this stage, we match the ordering in Apache 1.3
-# which is (highest to lowest): sysvsem -> fcntl -> flock.
-# POSIX semaphores and cross-process pthread mutexes are not
-# used by default since they have less desirable behaviour when
-# e.g. a process holding the mutex segfaults.
-ac_decision_item='apr_lock implementation method'
-ac_decision_msg='FAILED'
-ac_decision=''
-
-ac_rc=yes
-for ac_spec in func:flock define:LOCK_EX; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        struct ) ac_var="ac_cv_struct_$ac_item" ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-    ac_decision='USE_FLOCK_SERIALIZE'
-ac_decision_msg='4.2BSD-style flock()'
-ac_decision_USE_FLOCK_SERIALIZE=yes
-ac_decision_USE_FLOCK_SERIALIZE_msg='4.2BSD-style flock()'
-
-else
-    :
-
-fi
-
-ac_rc=yes
-for ac_spec in header:fcntl.h define:F_SETLK; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        struct ) ac_var="ac_cv_struct_$ac_item" ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-    ac_decision='USE_FCNTL_SERIALIZE'
-ac_decision_msg='SVR4-style fcntl()'
-ac_decision_USE_FCNTL_SERIALIZE=yes
-ac_decision_USE_FCNTL_SERIALIZE_msg='SVR4-style fcntl()'
-
-else
-    :
-
-fi
-
-ac_rc=yes
-for ac_spec in func:semget func:semctl define:SEM_UNDO; do
-    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
-    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
-    case $ac_type in
-        header )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_header_$ac_item"
-            ;;
-        file )
-            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
-            ac_var="ac_cv_file_$ac_item"
-            ;;
-        func )   ac_var="ac_cv_func_$ac_item"   ;;
-        struct ) ac_var="ac_cv_struct_$ac_item" ;;
-        define ) ac_var="ac_cv_define_$ac_item" ;;
-        custom ) ac_var="$ac_item" ;;
-    esac
-    eval "ac_val=\$$ac_var"
-    if test ".$ac_val" != .yes; then
-        ac_rc=no
-        break
-    fi
-done
-if test ".$ac_rc" = .yes; then
-    :
-    ac_decision='USE_SYSVSEM_SERIALIZE'
-ac_decision_msg='SysV IPC semget()'
-ac_decision_USE_SYSVSEM_SERIALIZE=yes
-ac_decision_USE_SYSVSEM_SERIALIZE_msg='SysV IPC semget()'
-
-else
-    :
-
-fi
-
-if test "x$apr_lock_method" != "x"; then
-    ac_decision="$apr_lock_method"
-eval "ac_decision_msg=\"\$ac_decision_${ac_decision}_msg\""
-
-fi
-if test ".$ac_decision" = .; then
-    echo "$0:Error: decision on $ac_decision_item failed" 1>&2
-    exit 1
-else
-    if test ".$ac_decision_msg" = .; then
-        ac_decision_msg="$ac_decision"
-    fi
-    cat >>confdefs.h <<_ACEOF
-#define ${ac_decision_item} 1
-_ACEOF
-
-    { $as_echo "$as_me:$LINENO: result: decision on $ac_decision_item... $ac_decision_msg" >&5
-$as_echo "decision on $ac_decision_item... $ac_decision_msg" >&6; }
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define $ac_decision 1
-_ACEOF
-
-
-flockser="0"
-sysvser="0"
-posixser="0"
-procpthreadser="0"
-fcntlser="0"
-case $ac_decision in
-    USE_FLOCK_SERIALIZE )
-        flockser="1"
-        ;;
-    USE_FCNTL_SERIALIZE )
-        fcntlser="1"
-        ;;
-    USE_SYSVSEM_SERIALIZE )
-        sysvser="1"
-        ;;
-    USE_POSIXSEM_SERIALIZE )
-        posixser="1"
-        ;;
-    USE_PROC_PTHREAD_SERIALIZE )
-        procpthreadser="1"
-        ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:$LINENO: checking if all interprocess locks affect threads" >&5
-$as_echo_n "checking if all interprocess locks affect threads... " >&6; }
-if test "x$apr_process_lock_is_global" = "xyes"; then
-    proclockglobal="1"
-    { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-    proclockglobal="0"
-    { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-{ $as_echo "$as_me:$LINENO: checking if POSIX sems affect threads in the same process" >&5
-$as_echo_n "checking if POSIX sems affect threads in the same process... " >&6; }
-if test "x$apr_posixsem_is_global" = "xyes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define POSIXSEM_IS_GLOBAL 1
-_ACEOF
-
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-{ $as_echo "$as_me:$LINENO: checking if SysV sems affect threads in the same process" >&5
-$as_echo_n "checking if SysV sems affect threads in the same process... " >&6; }
-if test "x$apr_sysvsem_is_global" = "xyes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define SYSVSEM_IS_GLOBAL 1
-_ACEOF
-
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-{ $as_echo "$as_me:$LINENO: checking if fcntl locks affect threads in the same process" >&5
-$as_echo_n "checking if fcntl locks affect threads in the same process... " >&6; }
-if test "x$apr_fcntl_is_global" = "xyes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define FCNTL_IS_GLOBAL 1
-_ACEOF
-
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-{ $as_echo "$as_me:$LINENO: checking if flock locks affect threads in the same process" >&5
-$as_echo_n "checking if flock locks affect threads in the same process... " >&6; }
-if test "x$apr_flock_is_global" = "xyes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define FLOCK_IS_GLOBAL 1
-_ACEOF
-
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for entropy source" >&5
-$as_echo_n "checking for entropy source... " >&6; }
-
-
-# Check whether --with-egd was given.
-if test "${with_egd+set}" = set; then
-  withval=$with_egd;
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_EGD 1
-_ACEOF
-
-    if test "$withval" = "yes"; then
-
-cat >>confdefs.h <<_ACEOF
-#define EGD_DEFAULT_SOCKET "/var/run/egd-pool","/dev/egd-pool","/etc/egd-pool","/etc/entropy"
-_ACEOF
-
-    else
-        cat >>confdefs.h <<_ACEOF
-#define EGD_DEFAULT_SOCKET "$withval"
-_ACEOF
-
-    fi
-    { $as_echo "$as_me:$LINENO: result: EGD-compatible daemon" >&5
-$as_echo "EGD-compatible daemon" >&6; }
-    rand="1"
-
-fi
-
-
-if test "$rand" != "1"; then
-
-# Check whether --with-devrandom was given.
-if test "${with_devrandom+set}" = set; then
-  withval=$with_devrandom;  apr_devrandom="$withval"
-else
-   apr_devrandom="yes"
-fi
-
-
-  if test "$apr_devrandom" = "yes"; then
-    # /dev/random on OpenBSD doesn't provide random data, so
-    # prefer /dev/arandom, which does; see random(4).
-    for f in /dev/arandom /dev/random /dev/urandom; do
-      if test -r $f; then
-        apr_devrandom=$f
-        rand=1
-        break
-      fi
-    done
-  elif test "$apr_devrandom" != "no"; then
-    if test -r "$apr_devrandom"; then
-      rand="1"
-    else
-      { { $as_echo "$as_me:$LINENO: error: $apr_devrandom not found or unreadable." >&5
-$as_echo "$as_me: error: $apr_devrandom not found or unreadable." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-
-  if test "$rand" = "1"; then
-
-cat >>confdefs.h <<_ACEOF
-#define DEV_RANDOM "$apr_devrandom"
-_ACEOF
-
-    { $as_echo "$as_me:$LINENO: result: $apr_devrandom" >&5
-$as_echo "$apr_devrandom" >&6; }
-  fi
-fi
-
-if test "$rand" != "1"; then
-    case $host in
-        # we have built in support for OS/2
-        *-os2*)
-            { $as_echo "$as_me:$LINENO: result: Using OS/2 builtin random" >&5
-$as_echo "Using OS/2 builtin random" >&6; }
-            rand="1"
-            ;;
-        *)
-            if test "$rand" != "1"; then
-              if test "$ac_cv_lib_truerand_main" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_TRUERAND 1
-_ACEOF
-
-                { $as_echo "$as_me:$LINENO: result: truerand" >&5
-$as_echo "truerand" >&6; }
-                rand="1"
-              else
-                { $as_echo "$as_me:$LINENO: result: not found" >&5
-$as_echo "not found" >&6; }
-                rand="0"
-              fi
-            fi
-            ;;
-    esac
-fi
-
-
-echo "${nl}Checking for Time Support..."
-{ $as_echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
-$as_echo_n "checking for tm_gmtoff in struct tm... " >&6; }
-if test "${ac_cv_struct_tm_gmtoff+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <time.h>
-int
-main ()
-{
-struct tm tm; tm.tm_gmtoff;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_struct_tm_gmtoff=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_struct_tm_gmtoff=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_tm_gmtoff" >&5
-$as_echo "$ac_cv_struct_tm_gmtoff" >&6; }
-
-if test "$ac_cv_struct_tm_gmtoff" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GMTOFF 1
-_ACEOF
-
-fi
-
-echo "${nl}Checking for Networking support..."
-{ $as_echo "$as_me:$LINENO: checking for in_addr in netinet/in.h" >&5
-$as_echo_n "checking for in_addr in netinet/in.h... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <netinet/in.h>
-
-int
-main ()
-{
-
-struct in_addr arg;
-arg.s_addr = htonl(INADDR_ANY);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-   have_in_addr="1"
-msg=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	 have_in_addr="0"
-msg=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $msg" >&5
-$as_echo "$msg" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking if fd == socket on this platform" >&5
-$as_echo_n "checking if fd == socket on this platform... " >&6; }
-if test "x$file_as_socket" != "x0" ; then
-    file_as_socket="1";
-    echo "yes"
-else
-    echo "no"
-fi
-
-
-
-
-# Check the types only if we have gethostbyname_r
-if test "$ac_cv_func_gethostbyname_r" = "yes"; then
-
-
-{ $as_echo "$as_me:$LINENO: checking style of gethostbyname_r routine" >&5
-$as_echo_n "checking style of gethostbyname_r routine... " >&6; }
-if test "${ac_cv_gethostbyname_r_style+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$CFLAGS_WARN" = "x"; then
-  apr_tcnw_flags=""
-else
-  apr_tcnw_flags=$CFLAGS_WARN
-fi
-if test "$ac_cv_c_compiler_gnu" = "yes"; then
-  apr_tcnw_flags="$apr_tcnw_flags -Werror"
-fi
-
-cat > conftest.$ac_ext <<EOTEST
-#include "confdefs.h"
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-int main(int argc, const char * const *argv) {
-
-int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0,
-                          (char *) 0, 0, (struct hostent **) 0, &tmp);
-
-; return 0; }
-EOTEST
-
-if ${CC-cc} -c $CFLAGS $CPPFLAGS $apr_tcnw_flags conftest.$ac_ext 2>&5 ; then
-  rm -rf conftest*
-  ac_cv_gethostbyname_r_style=glibc2
-else
-  echo "configure: failed or warning program:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_gethostbyname_r_style=none
-fi
-rm -f conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_gethostbyname_r_style" >&5
-$as_echo "$ac_cv_gethostbyname_r_style" >&6; }
-
-if test "$ac_cv_gethostbyname_r_style" = "glibc2"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define GETHOSTBYNAME_R_GLIBC2 1
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking 3rd argument to the gethostbyname_r routines" >&5
-$as_echo_n "checking 3rd argument to the gethostbyname_r routines... " >&6; }
-if test "${ac_cv_gethostbyname_r_arg+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$CFLAGS_WARN" = "x"; then
-  apr_tcnw_flags=""
-else
-  apr_tcnw_flags=$CFLAGS_WARN
-fi
-if test "$ac_cv_c_compiler_gnu" = "yes"; then
-  apr_tcnw_flags="$apr_tcnw_flags -Werror"
-fi
-
-cat > conftest.$ac_ext <<EOTEST
-#include "confdefs.h"
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-int main(int argc, const char * const *argv) {
-
-int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0,
-                          (struct hostent_data *) 0);
-; return 0; }
-EOTEST
-
-if ${CC-cc} -c $CFLAGS $CPPFLAGS $apr_tcnw_flags conftest.$ac_ext 2>&5 ; then
-  rm -rf conftest*
-  ac_cv_gethostbyname_r_arg=hostent_data
-else
-  echo "configure: failed or warning program:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_gethostbyname_r_arg=char
-fi
-rm -f conftest*
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_gethostbyname_r_arg" >&5
-$as_echo "$ac_cv_gethostbyname_r_arg" >&6; }
-
-if test "$ac_cv_gethostbyname_r_arg" = "hostent_data"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define GETHOSTBYNAME_R_HOSTENT_DATA 1
-_ACEOF
-
-fi
-
-fi
-
-
-  { $as_echo "$as_me:$LINENO: checking if TCP_NODELAY setting is inherited from listening sockets" >&5
-$as_echo_n "checking if TCP_NODELAY setting is inherited from listening sockets... " >&6; }
-if test "${ac_cv_tcp_nodelay_inherited+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-  if test "$cross_compiling" = yes; then
-
-    ac_cv_tcp_nodelay_inherited="yes"
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
-#ifndef HAVE_SOCKLEN_T
-typedef int socklen_t;
-#endif
-int main(void) {
-    int listen_s, connected_s, client_s;
-    int listen_port, rc;
-    struct sockaddr_in sa;
-    socklen_t sa_len;
-    socklen_t option_len;
-    int option;
-
-    listen_s = socket(AF_INET, SOCK_STREAM, 0);
-    if (listen_s < 0) {
-        perror("socket");
-        exit(1);
-    }
-    option = 1;
-    rc = setsockopt(listen_s, IPPROTO_TCP, TCP_NODELAY, &option, sizeof option);
-    if (rc < 0) {
-        perror("setsockopt TCP_NODELAY");
-        exit(1);
-    }
-    memset(&sa, 0, sizeof sa);
-    sa.sin_family = AF_INET;
-#ifdef BEOS
-    sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-#endif
-    /* leave port 0 to get ephemeral */
-    rc = bind(listen_s, (struct sockaddr *)&sa, sizeof sa);
-    if (rc < 0) {
-        perror("bind for ephemeral port");
-        exit(1);
-    }
-    /* find ephemeral port */
-    sa_len = sizeof(sa);
-    rc = getsockname(listen_s, (struct sockaddr *)&sa, &sa_len);
-    if (rc < 0) {
-        perror("getsockname");
-        exit(1);
-    }
-    listen_port = sa.sin_port;
-    rc = listen(listen_s, 5);
-    if (rc < 0) {
-        perror("listen");
-        exit(1);
-    }
-    client_s = socket(AF_INET, SOCK_STREAM, 0);
-    if (client_s < 0) {
-        perror("socket");
-        exit(1);
-    }
-    memset(&sa, 0, sizeof sa);
-    sa.sin_family = AF_INET;
-    sa.sin_port   = listen_port;
-#ifdef BEOS
-    sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-#endif
-    /* leave sin_addr all zeros to use loopback */
-    rc = connect(client_s, (struct sockaddr *)&sa, sizeof sa);
-    if (rc < 0) {
-        perror("connect");
-        exit(1);
-    }
-    sa_len = sizeof sa;
-    connected_s = accept(listen_s, (struct sockaddr *)&sa, &sa_len);
-    if (connected_s < 0) {
-        perror("accept");
-        exit(1);
-    }
-    option_len = sizeof option;
-    rc = getsockopt(connected_s, IPPROTO_TCP, TCP_NODELAY, &option, &option_len);
-    if (rc < 0) {
-        perror("getsockopt");
-        exit(1);
-    }
-    if (!option) {
-        fprintf(stderr, "TCP_NODELAY is not set in the child.\n");
-        exit(1);
-    }
-    return 0;
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-    ac_cv_tcp_nodelay_inherited="yes"
-
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-    ac_cv_tcp_nodelay_inherited="no"
-
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_tcp_nodelay_inherited" >&5
-$as_echo "$ac_cv_tcp_nodelay_inherited" >&6; }
-if test "$ac_cv_tcp_nodelay_inherited" = "yes"; then
-    tcp_nodelay_inherited=1
-else
-    tcp_nodelay_inherited=0
-fi
-
-
-  { $as_echo "$as_me:$LINENO: checking if O_NONBLOCK setting is inherited from listening sockets" >&5
-$as_echo_n "checking if O_NONBLOCK setting is inherited from listening sockets... " >&6; }
-if test "${ac_cv_o_nonblock_inherited+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-  if test "$cross_compiling" = yes; then
-
-    ac_cv_o_nonblock_inherited="yes"
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
-#ifndef HAVE_SOCKLEN_T
-typedef int socklen_t;
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-int main(void) {
-    int listen_s, connected_s, client_s;
-    int listen_port, rc;
-    struct sockaddr_in sa;
-    socklen_t sa_len;
-
-    listen_s = socket(AF_INET, SOCK_STREAM, 0);
-    if (listen_s < 0) {
-        perror("socket");
-        exit(1);
-    }
-    memset(&sa, 0, sizeof sa);
-    sa.sin_family = AF_INET;
-#ifdef BEOS
-    sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-#endif
-    /* leave port 0 to get ephemeral */
-    rc = bind(listen_s, (struct sockaddr *)&sa, sizeof sa);
-    if (rc < 0) {
-        perror("bind for ephemeral port");
-        exit(1);
-    }
-    /* find ephemeral port */
-    sa_len = sizeof(sa);
-    rc = getsockname(listen_s, (struct sockaddr *)&sa, &sa_len);
-    if (rc < 0) {
-        perror("getsockname");
-        exit(1);
-    }
-    listen_port = sa.sin_port;
-    rc = listen(listen_s, 5);
-    if (rc < 0) {
-        perror("listen");
-        exit(1);
-    }
-    rc = fcntl(listen_s, F_SETFL, O_NONBLOCK);
-    if (rc < 0) {
-        perror("fcntl(F_SETFL)");
-        exit(1);
-    }
-    client_s = socket(AF_INET, SOCK_STREAM, 0);
-    if (client_s < 0) {
-        perror("socket");
-        exit(1);
-    }
-    memset(&sa, 0, sizeof sa);
-    sa.sin_family = AF_INET;
-    sa.sin_port   = listen_port;
-#ifdef BEOS
-    sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-#endif
-    /* leave sin_addr all zeros to use loopback */
-    rc = connect(client_s, (struct sockaddr *)&sa, sizeof sa);
-    if (rc < 0) {
-        perror("connect");
-        exit(1);
-    }
-    sa_len = sizeof sa;
-    connected_s = accept(listen_s, (struct sockaddr *)&sa, &sa_len);
-    if (connected_s < 0) {
-        perror("accept");
-        exit(1);
-    }
-    rc = fcntl(connected_s, F_GETFL, 0);
-    if (rc < 0) {
-        perror("fcntl(F_GETFL)");
-        exit(1);
-    }
-    if (!(rc & O_NONBLOCK)) {
-        fprintf(stderr, "O_NONBLOCK is not set in the child.\n");
-        exit(1);
-    }
-    return 0;
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-    ac_cv_o_nonblock_inherited="yes"
-
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-    ac_cv_o_nonblock_inherited="no"
-
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_o_nonblock_inherited" >&5
-$as_echo "$ac_cv_o_nonblock_inherited" >&6; }
-if test "$ac_cv_o_nonblock_inherited" = "yes"; then
-    o_nonblock_inherited=1
-else
-    o_nonblock_inherited=0
-fi
-
-
-# Look for a way of corking TCP...
-
-  { $as_echo "$as_me:$LINENO: checking for TCP_CORK in netinet/tcp.h" >&5
-$as_echo_n "checking for TCP_CORK in netinet/tcp.h... " >&6; }
-if test "${ac_cv_define_TCP_CORK+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <netinet/tcp.h>
-#ifdef TCP_CORK
-YES_IS_DEFINED
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then
-  ac_cv_define_TCP_CORK=yes
-else
-  ac_cv_define_TCP_CORK=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_TCP_CORK" >&5
-$as_echo "$ac_cv_define_TCP_CORK" >&6; }
-  if test "$ac_cv_define_TCP_CORK" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_TCP_CORK 1
-_ACEOF
-
-  fi
-
-
-  { $as_echo "$as_me:$LINENO: checking for TCP_NOPUSH in netinet/tcp.h" >&5
-$as_echo_n "checking for TCP_NOPUSH in netinet/tcp.h... " >&6; }
-if test "${ac_cv_define_TCP_NOPUSH+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <netinet/tcp.h>
-#ifdef TCP_NOPUSH
-YES_IS_DEFINED
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then
-  ac_cv_define_TCP_NOPUSH=yes
-else
-  ac_cv_define_TCP_NOPUSH=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_TCP_NOPUSH" >&5
-$as_echo "$ac_cv_define_TCP_NOPUSH" >&6; }
-  if test "$ac_cv_define_TCP_NOPUSH" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_TCP_NOPUSH 1
-_ACEOF
-
-  fi
-
-apr_tcp_nopush_flag="0"
-have_corkable_tcp="0"
-if test "x$ac_cv_define_TCP_CORK" = "xyes"; then
-    apr_tcp_nopush_flag="TCP_CORK"
-    have_corkable_tcp="1"
-else
-    case $host in
-        *linux*)
-            cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <linux/socket.h>
-#ifdef TCP_CORK
-yes
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-
-                apr_tcp_nopush_flag="3"
-                have_corkable_tcp="1"
-
-fi
-rm -f conftest*
-
-            ;;
-        *)
-            ;;
-    esac
-fi
-if test "x$ac_cv_define_TCP_NOPUSH" = "xyes"; then
-    apr_tcp_nopush_flag="TCP_NOPUSH"
-    have_corkable_tcp="1"
-fi
-
-
-  { $as_echo "$as_me:$LINENO: checking for SO_ACCEPTFILTER in sys/socket.h" >&5
-$as_echo_n "checking for SO_ACCEPTFILTER in sys/socket.h... " >&6; }
-if test "${ac_cv_define_SO_ACCEPTFILTER+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <sys/socket.h>
-#ifdef SO_ACCEPTFILTER
-YES_IS_DEFINED
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then
-  ac_cv_define_SO_ACCEPTFILTER=yes
-else
-  ac_cv_define_SO_ACCEPTFILTER=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_SO_ACCEPTFILTER" >&5
-$as_echo "$ac_cv_define_SO_ACCEPTFILTER" >&6; }
-  if test "$ac_cv_define_SO_ACCEPTFILTER" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SO_ACCEPTFILTER 1
-_ACEOF
-
-  fi
-
-if test "x$ac_cv_define_SO_ACCEPTFILTER" = "xyes"; then
-    acceptfilter="1"
-else
-    acceptfilter="0"
-fi
-
-
-  { $as_echo "$as_me:$LINENO: checking whether SCTP is supported" >&5
-$as_echo_n "checking whether SCTP is supported... " >&6; }
-if test "${apr_cv_sctp+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-  if test "$cross_compiling" = yes; then
-  apr_cv_sctp=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_NETINET_SCTP_H
-#include <netinet/sctp.h>
-#endif
-#ifdef HAVE_NETINET_SCTP_UIO_H
-#include <netinet/sctp_uio.h>
-#endif
-#include <stdlib.h>
-int main(void) {
-    int s, opt = 1;
-    if ((s = socket(AF_INET, SOCK_STREAM, IPPROTO_SCTP)) < 0)
-       exit(1);
-    if (setsockopt(s, IPPROTO_SCTP, SCTP_NODELAY, &opt, sizeof(int)) < 0)
-       exit(2);
-    exit(0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  apr_cv_sctp=yes
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-apr_cv_sctp=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $apr_cv_sctp" >&5
-$as_echo "$apr_cv_sctp" >&6; }
-
-if test "$apr_cv_sctp" = "yes"; then
-    have_sctp=1
-else
-    have_sctp=0
-fi
-
-
-
-
-
-
-
-
-for ac_func in set_h_errno
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-  { $as_echo "$as_me:$LINENO: checking for presence of retrans/retry fields in res_state/resolv.h " >&5
-$as_echo_n "checking for presence of retrans/retry fields in res_state/resolv.h ... " >&6; }
-if test "${ac_cv_retransretry+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-  if test "$cross_compiling" = yes; then
-
-  ac_cv_retransretry="no"
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#if defined(__sun__)
-#include <inet/ip.h>
-#endif
-#include <resolv.h>
-/* _res is a global defined in resolv.h */
-int main(void) {
-    _res.retrans = 2;
-    _res.retry = 1;
-    exit(0);
-    return 0;
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-  ac_cv_retransretry="yes"
-
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-  ac_cv_retransretry="no"
-
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_retransretry" >&5
-$as_echo "$ac_cv_retransretry" >&6; }
-if test "$ac_cv_retransretry" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define RESOLV_RETRANSRETRY 1
-_ACEOF
-
-fi
-
-
-echo "${nl}Checking for IPv6 Networking support..."
-
-# Check whether --enable-ipv6 was given.
-if test "${enable_ipv6+set}" = set; then
-  enableval=$enable_ipv6;  if test "$enableval" = "no"; then
-        user_disabled_ipv6=1
-    fi
-else
-   user_disabled_ipv6=0
-fi
-
-
-case $host in
-  *)
-    broken_ipv6=0
-esac
-
-{ $as_echo "$as_me:$LINENO: checking for library containing getaddrinfo" >&5
-$as_echo_n "checking for library containing getaddrinfo... " >&6; }
-if test "${ac_cv_search_getaddrinfo+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getaddrinfo ();
-int
-main ()
-{
-return getaddrinfo ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' socket inet6; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_search_getaddrinfo=$ac_res
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_getaddrinfo+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_getaddrinfo+set}" = set; then
-  :
-else
-  ac_cv_search_getaddrinfo=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_getaddrinfo" >&5
-$as_echo "$ac_cv_search_getaddrinfo" >&6; }
-ac_res=$ac_cv_search_getaddrinfo
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for library containing gai_strerror" >&5
-$as_echo_n "checking for library containing gai_strerror... " >&6; }
-if test "${ac_cv_search_gai_strerror+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gai_strerror ();
-int
-main ()
-{
-return gai_strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' socket inet6; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_search_gai_strerror=$ac_res
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_gai_strerror+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_gai_strerror+set}" = set; then
-  :
-else
-  ac_cv_search_gai_strerror=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gai_strerror" >&5
-$as_echo "$ac_cv_search_gai_strerror" >&6; }
-ac_res=$ac_cv_search_gai_strerror
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for library containing getnameinfo" >&5
-$as_echo_n "checking for library containing getnameinfo... " >&6; }
-if test "${ac_cv_search_getnameinfo+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getnameinfo ();
-int
-main ()
-{
-return getnameinfo ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' socket inet6; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_search_getnameinfo=$ac_res
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_getnameinfo+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_getnameinfo+set}" = set; then
-  :
-else
-  ac_cv_search_getnameinfo=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_getnameinfo" >&5
-$as_echo "$ac_cv_search_getnameinfo" >&6; }
-ac_res=$ac_cv_search_getnameinfo
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-
-for ac_func in gai_strerror
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-  { $as_echo "$as_me:$LINENO: checking for working getaddrinfo" >&5
-$as_echo_n "checking for working getaddrinfo... " >&6; }
-if test "${ac_cv_working_getaddrinfo+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-  if test "$cross_compiling" = yes; then
-
-  ac_cv_working_getaddrinfo="yes"
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-void main(void) {
-    struct addrinfo hints, *ai;
-    int error;
-
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_socktype = SOCK_STREAM;
-    error = getaddrinfo("127.0.0.1", NULL, &hints, &ai);
-    if (error) {
-        exit(1);
-    }
-    if (ai->ai_addr->sa_family != AF_INET) {
-        exit(1);
-    }
-    exit(0);
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-  ac_cv_working_getaddrinfo="yes"
-
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-  ac_cv_working_getaddrinfo="no"
-
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_getaddrinfo" >&5
-$as_echo "$ac_cv_working_getaddrinfo" >&6; }
-if test "$ac_cv_working_getaddrinfo" = "yes"; then
-  if test "$ac_cv_func_gai_strerror" != "yes"; then
-    ac_cv_working_getaddrinfo="no"
-  else
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETADDRINFO 1
-_ACEOF
-
-  fi
-fi
-
-
-  { $as_echo "$as_me:$LINENO: checking for negative error codes for getaddrinfo" >&5
-$as_echo_n "checking for negative error codes for getaddrinfo... " >&6; }
-if test "${ac_cv_negative_eai+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-  if test "$cross_compiling" = yes; then
-
-  ac_cv_negative_eai="no"
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-
-void main(void) {
-    if (EAI_ADDRFAMILY < 0) {
-        exit(0);
-    }
-    exit(1);
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-  ac_cv_negative_eai="yes"
-
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-  ac_cv_negative_eai="no"
-
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_negative_eai" >&5
-$as_echo "$ac_cv_negative_eai" >&6; }
-if test "$ac_cv_negative_eai" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define NEGATIVE_EAI 1
-_ACEOF
-
-fi
-
-
-  { $as_echo "$as_me:$LINENO: checking for working getnameinfo" >&5
-$as_echo_n "checking for working getnameinfo... " >&6; }
-if test "${ac_cv_working_getnameinfo+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-  if test "$cross_compiling" = yes; then
-
-  ac_cv_working_getnameinfo="yes"
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
-void main(void) {
-    struct sockaddr_in sa;
-    char hbuf[256];
-    int error;
-
-    sa.sin_family = AF_INET;
-    sa.sin_port = 0;
-    sa.sin_addr.s_addr = inet_addr("127.0.0.1");
-#ifdef SIN6_LEN
-    sa.sin_len = sizeof(sa);
-#endif
-
-    error = getnameinfo((const struct sockaddr *)&sa, sizeof(sa),
-                        hbuf, 256, NULL, 0,
-                        NI_NUMERICHOST);
-    if (error) {
-        exit(1);
-    } else {
-        exit(0);
-    }
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-  ac_cv_working_getnameinfo="yes"
-
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-  ac_cv_working_getnameinfo="no"
-
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_getnameinfo" >&5
-$as_echo "$ac_cv_working_getnameinfo" >&6; }
-if test "$ac_cv_working_getnameinfo" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETNAMEINFO 1
-_ACEOF
-
-fi
-
-
-{ $as_echo "$as_me:$LINENO: checking for sockaddr_in6" >&5
-$as_echo_n "checking for sockaddr_in6... " >&6; }
-if test "${ac_cv_define_sockaddr_in6+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
-int
-main ()
-{
-
-struct sockaddr_in6 sa;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-
-    ac_cv_define_sockaddr_in6=yes
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-    ac_cv_define_sockaddr_in6=no
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_sockaddr_in6" >&5
-$as_echo "$ac_cv_define_sockaddr_in6" >&6; }
-
-if test "$ac_cv_define_sockaddr_in6" = "yes"; then
-  have_sockaddr_in6=1
-else
-  have_sockaddr_in6=0
-fi
-
-
-have_ipv6="0"
-if test "$user_disabled_ipv6" = 1; then
-    ipv6_result="no -- disabled by user"
-else
-    if test "x$broken_ipv6" = "x0"; then
-        if test "x$have_sockaddr_in6" = "x1"; then
-            if test "x$ac_cv_working_getaddrinfo" = "xyes"; then
-                if test "x$ac_cv_working_getnameinfo" = "xyes"; then
-                    have_ipv6="1"
-                    ipv6_result="yes"
-                else
-                    ipv6_result="no -- no getnameinfo"
-                fi
-            else
-                ipv6_result="no -- no working getaddrinfo"
-            fi
-        else
-            ipv6_result="no -- no sockaddr_in6"
-        fi
-    else
-        ipv6_result="no -- the platform has known problems supporting IPv6"
-    fi
-fi
-
-{ $as_echo "$as_me:$LINENO: checking if APR supports IPv6" >&5
-$as_echo_n "checking if APR supports IPv6... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $ipv6_result" >&5
-$as_echo "$ipv6_result" >&6; }
-
-
-
-
-
-for ac_header in langinfo.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_func in nl_langinfo
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-# AC_CHECK_FUNCS is not sufficient since the function may be usable when
-# struct stat64 is not exposed (e.g. HP-UX).  Note that fstat64 only
-# happens to be usable on Linux because -D_GNU_SOURCE is picked up
-# by the earlier crypt_r check.
-{ $as_echo "$as_me:$LINENO: checking for usable fstat64" >&5
-$as_echo_n "checking for usable fstat64... " >&6; }
-if test "${apr_cv_func_fstat64+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-int
-main ()
-{
-struct stat64 st; fstat64(0, &st);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  apr_cv_func_fstat64=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	apr_cv_func_fstat64=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $apr_cv_func_fstat64" >&5
-$as_echo "$apr_cv_func_fstat64" >&6; }
-if test $apr_cv_func_fstat64 = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FSTAT64 1
-_ACEOF
-
-fi
-
-
-
-echo "${nl}Restore user-defined environment settings..."
-
-
-if test "x$apr_ste_save_CPPFLAGS" = "x"; then
-  EXTRA_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS=
-else
-  if test "x$apr_ste_save_CPPFLAGS" = "x$CPPFLAGS"; then
-    EXTRA_CPPFLAGS=
-  else
-    EXTRA_CPPFLAGS=`echo $CPPFLAGS | sed -e "s%${apr_ste_save_CPPFLAGS}%%"`
-    CPPFLAGS="$apr_ste_save_CPPFLAGS"
-  fi
-fi
-echo "  restoring CPPFLAGS to \"$CPPFLAGS\""
-echo "  setting EXTRA_CPPFLAGS to \"$EXTRA_CPPFLAGS\""
-
-
-
-if test "x$apr_ste_save_CFLAGS" = "x"; then
-  EXTRA_CFLAGS="$CFLAGS"
-  CFLAGS=
-else
-  if test "x$apr_ste_save_CFLAGS" = "x$CFLAGS"; then
-    EXTRA_CFLAGS=
-  else
-    EXTRA_CFLAGS=`echo $CFLAGS | sed -e "s%${apr_ste_save_CFLAGS}%%"`
-    CFLAGS="$apr_ste_save_CFLAGS"
-  fi
-fi
-echo "  restoring CFLAGS to \"$CFLAGS\""
-echo "  setting EXTRA_CFLAGS to \"$EXTRA_CFLAGS\""
-
-
-
-if test "x$apr_ste_save_LDFLAGS" = "x"; then
-  EXTRA_LDFLAGS="$LDFLAGS"
-  LDFLAGS=
-else
-  if test "x$apr_ste_save_LDFLAGS" = "x$LDFLAGS"; then
-    EXTRA_LDFLAGS=
-  else
-    EXTRA_LDFLAGS=`echo $LDFLAGS | sed -e "s%${apr_ste_save_LDFLAGS}%%"`
-    LDFLAGS="$apr_ste_save_LDFLAGS"
-  fi
-fi
-echo "  restoring LDFLAGS to \"$LDFLAGS\""
-echo "  setting EXTRA_LDFLAGS to \"$EXTRA_LDFLAGS\""
-
-
-
-if test "x$apr_ste_save_LIBS" = "x"; then
-  EXTRA_LIBS="$LIBS"
-  LIBS=
-else
-  if test "x$apr_ste_save_LIBS" = "x$LIBS"; then
-    EXTRA_LIBS=
-  else
-    EXTRA_LIBS=`echo $LIBS | sed -e "s%${apr_ste_save_LIBS}%%"`
-    LIBS="$apr_ste_save_LIBS"
-  fi
-fi
-echo "  restoring LIBS to \"$LIBS\""
-echo "  setting EXTRA_LIBS to \"$EXTRA_LIBS\""
-
-
-
-if test "x$apr_ste_save_INCLUDES" = "x"; then
-  EXTRA_INCLUDES="$INCLUDES"
-  INCLUDES=
-else
-  if test "x$apr_ste_save_INCLUDES" = "x$INCLUDES"; then
-    EXTRA_INCLUDES=
-  else
-    EXTRA_INCLUDES=`echo $INCLUDES | sed -e "s%${apr_ste_save_INCLUDES}%%"`
-    INCLUDES="$apr_ste_save_INCLUDES"
-  fi
-fi
-echo "  restoring INCLUDES to \"$INCLUDES\""
-echo "  setting EXTRA_INCLUDES to \"$EXTRA_INCLUDES\""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-echo "${nl}Construct Makefiles and header files."
-MAKEFILE1="Makefile strings/Makefile passwd/Makefile tables/Makefile build/Makefile"
-SUBDIRS="strings passwd tables "
-for dir in $apr_modules
-do
-    test -d $dir || $MKDIR $dir
-    if test -f $srcdir/$dir/$OSDIR/Makefile.in; then
-        MAKEFILE2="$MAKEFILE2 $dir/$OSDIR/Makefile "
-        SUBDIRS="$SUBDIRS $dir/$OSDIR "
-    else
-        MAKEFILE2="$MAKEFILE2 $dir/$DEFAULT_OSDIR/Makefile "
-        SUBDIRS="$SUBDIRS $dir/$DEFAULT_OSDIR "
-    fi
-done
-
-if test -d $srcdir/test; then
-    MAKEFILE3="test/Makefile test/internal/Makefile"
-fi
-
-
-#
-# BSD/OS (BSDi) needs to use a different include syntax in the Makefiles
-#
-case $host in
-*bsdi*)
-    # Check whether they've installed GNU make
-    if make --version > /dev/null 2>&1; then
-	INCLUDE_RULES="include $apr_buildout/apr_rules.mk"
-    else
-	# BSDi make
-	INCLUDE_RULES=".include \"$apr_buildout/apr_rules.mk\""
-    fi
-    ;;
-*)
-    INCLUDE_RULES="include $apr_buildout/apr_rules.mk"
-    ;;
-esac
-
-
-SAVE_FILES="include/apr.h include/arch/unix/apr_private.h"
-
-for i in $SAVE_FILES; do
-  test -r $i && mv $i $i.save
-done
-
-dir=include/arch/unix
-test -d $dir || $MKDIR $dir
-
-ac_config_files="$ac_config_files $MAKEFILE1 $MAKEFILE2 $MAKEFILE3 include/apr.h build/apr_rules.mk build/pkg/pkginfo apr-config"
-
-ac_config_commands="$ac_config_commands default"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## 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
-
-
-
-
-# PATH needs CR
-# 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_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-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); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# Required to use basename.
-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
-
-
-# Name of the executable.
-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'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  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
-   { (exit 1); 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
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-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=:
-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 6>&1
-
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTION]... [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.63,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2008 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    { $as_echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "include/arch/unix/apr_private.h") CONFIG_HEADERS="$CONFIG_HEADERS include/arch/unix/apr_private.h" ;;
-    "$MAKEFILE1") CONFIG_FILES="$CONFIG_FILES $MAKEFILE1" ;;
-    "$MAKEFILE2") CONFIG_FILES="$CONFIG_FILES $MAKEFILE2" ;;
-    "$MAKEFILE3") CONFIG_FILES="$CONFIG_FILES $MAKEFILE3" ;;
-    "include/apr.h") CONFIG_FILES="$CONFIG_FILES include/apr.h" ;;
-    "build/apr_rules.mk") CONFIG_FILES="$CONFIG_FILES build/apr_rules.mk" ;;
-    "build/pkg/pkginfo") CONFIG_FILES="$CONFIG_FILES build/pkg/pkginfo" ;;
-    "apr-config") CONFIG_FILES="$CONFIG_FILES apr-config" ;;
-    "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} ||
-{
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr='
'
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\).*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\).*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-   { (exit 1); exit 1; }; }
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
-    break
-  elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-   { (exit 1); exit 1; }; }
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    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_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
- ;;
-
-  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "default":C)
-for i in $SAVE_FILES; do
-  if cmp -s $i $i.save 2>/dev/null; then
-    mv $i.save $i
-    echo "$i is unchanged"
-  fi
-  rm -f $i.save
-done
-chmod +x apr-config
- ;;
-
-  esac
-done # for ac_tag
-
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
-
-
-
-
-if test -n "$USE_VPATH"; then
-  for makefile in $MAKEFILE1 $MAKEFILE2 $MAKEFILE3; do
-    cat $makefile | \
-        sed \
-		-e 's#-I\($(INCDIR[0-9]*)\)#-I\1 -I$(srcdir)/\1#g' \
-		-e 's#-I\($(OSDIR[0-9]*)\)#-I\1 -I$(srcdir)/\1#g' \
-		-e 's#-I\($(DEFOSDIR[0-9]*)\)#-I\1 -I$(srcdir)/\1#g' \
-		> tmp
-    cp tmp $makefile
-  done
-  rm -f tmp
-fi
-
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/configure.in b/rubbos/app/httpd-2.0.64/srclib/apr/configure.in
deleted file mode 100644
index 3e63c9fa..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/configure.in
+++ /dev/null
@@ -1,1998 +0,0 @@
-dnl 
-dnl Autoconf configuration file for APR
-dnl 
-dnl Process this file with autoconf to produce a configure script.
-dnl Use ./buildconf to prepare build files and run autoconf for APR.
-
-AC_INIT(build/apr_common.m4)
-AC_CONFIG_HEADER(include/arch/unix/apr_private.h)
-AC_CONFIG_AUX_DIR(build)
-
-dnl 
-dnl Include our own M4 macros along with those for libtool
-dnl 
-sinclude(build/apr_common.m4)
-sinclude(build/apr_network.m4)
-sinclude(build/apr_threads.m4)
-sinclude(build/apr_hints.m4)
-sinclude(build/libtool.m4)
-
-dnl Save user-defined environment settings for later restoration
-dnl
-APR_SAVE_THE_ENVIRONMENT(CPPFLAGS)
-APR_SAVE_THE_ENVIRONMENT(CFLAGS)
-APR_SAVE_THE_ENVIRONMENT(LDFLAGS)
-APR_SAVE_THE_ENVIRONMENT(LIBS)
-APR_SAVE_THE_ENVIRONMENT(INCLUDES)
-
-dnl Generate ./config.nice for reproducing runs of configure
-dnl
-APR_CONFIG_NICE(config.nice)
-
-AC_CANONICAL_SYSTEM
-echo "Configuring APR library"
-echo "Platform: $host"
-
-dnl Some initial steps for configuration.  We setup the default directory
-dnl and which files are to be configured.
-
-dnl Setup the directory macros now
-
-# Absolute source/build directory
-apr_srcdir=`(cd $srcdir && pwd)`
-apr_builddir=`pwd`
-AC_SUBST(apr_srcdir)
-AC_SUBST(apr_builddir)
-
-if test "$apr_builddir" != "$apr_srcdir"; then
-  USE_VPATH=1
-  APR_CONFIG_LOCATION=build
-else
-  APR_CONFIG_LOCATION=source
-fi
-
-AC_SUBST(APR_CONFIG_LOCATION)
-
-# Libtool might need this symbol -- it must point to the location of
-# the generated libtool script (not necessarily the "top" build dir).
-#
-top_builddir="$apr_builddir"
-AC_SUBST(top_builddir)
-
-# Directory containing apr build macros, helpers, and make rules
-# NOTE: make rules (apr_rules.mk) will be in the builddir for vpath
-#
-apr_buildout=$apr_builddir/build
-apr_builders=$apr_srcdir/build
-AC_SUBST(apr_builders)
-
-MKDIR=$apr_builders/mkdir.sh
-
-dnl Initialize mkdir -p functionality.
-APR_MKDIR_P_CHECK($apr_builders/mkdir.sh)
-
-# get our version information
-get_version="$apr_builders/get-version.sh"
-version_hdr="$apr_srcdir/include/apr_version.h"
-APR_MAJOR_VERSION="`$get_version major $version_hdr APR`"
-APR_DOTTED_VERSION="`$get_version all $version_hdr APR`"
-
-AC_SUBST(APR_DOTTED_VERSION)
-AC_SUBST(APR_MAJOR_VERSION)
-
-echo "APR Version: ${APR_DOTTED_VERSION}"
-
-dnl Enable the layout handling code, then reparse the prefix-style
-dnl arguments due to autoconf being a PITA.
-APR_ENABLE_LAYOUT(apr)
-APR_PARSE_ARGUMENTS
-
-dnl Set optional CC hints here in case autoconf makes an inappropriate choice.
-dnl This allows us to suggest what the compiler should be, but still
-dnl allows the user to override CC externally.
-APR_CC_HINTS
-
-dnl Do the various CC checks *before* preloading values. The preload code
-dnl may need to use compiler characteristics to make decisions. This macro
-dnl can only be used once within a configure script, so this prevents a
-dnl preload section from invoking the macro to get compiler info.
-AC_PROG_CC
-
-dnl Preload
-APR_PRELOAD
-
-dnl These added to allow default directories to be used...
-DEFAULT_OSDIR="unix"
-echo "(Default will be ${DEFAULT_OSDIR})"
-
-apr_modules="file_io network_io threadproc misc locks time mmap shmem user memory atomic poll support"
-
-dnl Checks for programs.
-AC_PROG_MAKE_SET
-AC_PROG_CPP
-AC_PROG_AWK
-AC_PROG_LN_S
-AC_PROG_RANLIB
-AC_PROG_INSTALL
-AC_CHECK_PROG(RM, rm, rm)
-AC_CHECK_PROG(AS, as, as)
-AC_CHECK_PROG(ASCPP, cpp, cpp)
-AC_CHECK_TOOL(AR, ar, ar)
-
-dnl Various OS checks that apparently set required flags
-ifdef([AC_USE_SYSTEM_EXTENSIONS], [
-AC_USE_SYSTEM_EXTENSIONS
-], [
-AC_AIX
-AC_MINIX
-])
-
-AC_ISC_POSIX
-APR_EBCDIC
-
-dnl this is our library name
-APR_LIBNAME="apr${libsuffix}"
-AC_SUBST(APR_LIBNAME)
-
-dnl prep libtool
-dnl
-echo "performing libtool configuration..."
-
-AC_ARG_ENABLE(experimental-libtool,[  --experimental-libtool Use experimental custom libtool (not included in source distribution)],
-  [experimental_libtool=$enableval],[experimental_libtool=no])
-
-case $host in
-*os2*)
-    # Use a custom-made libtool replacement
-    echo "using aplibtool"
-    LIBTOOL="$srcdir/build/aplibtool"
-    gcc $CFLAGS $CPPFLAGS -o $LIBTOOL.exe $LIBTOOL.c
-    ;;
-*)
-    if test "x$LTFLAGS" = "x"; then
-        LTFLAGS='--silent'
-    fi
-    if test "$experimental_libtool" = "yes"; then
-        # Use a custom-made libtool replacement
-        echo "using jlibtool"
-        LIBTOOL="$apr_builddir/libtool"
-        LIBTOOL_SRC="$apr_srcdir/build/jlibtool.c"
-        if test ! -f $LIBTOOL_SRC; then
-          AC_MSG_ERROR([Experimental libtool source not found.  It is not included with APR by default.])
-        fi
-        $CC $CFLAGS $CPPFLAGS -o $LIBTOOL $LIBTOOL_SRC
-    else
-    dnl libtoolize requires that the following not be indented
-AC_PROG_LIBTOOL
-        # get libtool's setting of shlibpath_var
-        eval `grep "^shlibpath_var=[[A-Z_]]*$" $apr_builddir/libtool`
-        if test "x$shlibpath_var" = "x"; then
-            shlibpath_var=REPLACE_WITH_YOUR_SHLIBPATH_VAR
-        fi
-    fi
-    ;;
-esac
-
-AC_ARG_WITH(installbuilddir, [  --with-installbuilddir=DIR location to store APR build files (defaults to '${datadir}/build')],
-  [ installbuilddir=$withval ], [ installbuilddir="${datadir}/build" ] )
-AC_SUBST(installbuilddir)
-
-AC_ARG_WITH(libtool, [  --without-libtool       avoid using libtool to link the library],
-  [ use_libtool=$withval ], [ use_libtool="yes" ] )
-
-if test "x$use_libtool" = "xyes"; then
-      lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -c $< && touch $@'
-      LT_VERSION="-version-info `$get_version libtool $version_hdr APR`"
-      link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${LT_VERSION} \$(ALL_LDFLAGS) -o \$@"
-      so_ext='lo'
-      lib_target='-rpath $(libdir) $$objects'
-      export_lib_target='-rpath \$(libdir) \$\$objects'
-else
-      lt_compile='$(COMPILE) -c $<'
-      link='$(AR) cr $(TARGET_LIB) $$objects; $(RANLIB) $(TARGET_LIB)'
-      so_ext='o'
-      lib_target=''
-      export_lib_target=''
-fi
-
-case $host in
-    *-solaris2*)
-        apr_platform_runtime_link_flag="-R"
-        ;;
-    *)
-        ;;
-esac
-
-AC_SUBST(lt_compile)
-AC_SUBST(link)
-AC_SUBST(so_ext)
-AC_SUBST(lib_target)
-AC_SUBST(export_lib_target)
-AC_SUBST(shlibpath_var)
-AC_SUBST(LTFLAGS)
-AC_SUBST(LT_LDFLAGS)
-
-dnl ----------------------------- Checks for compiler flags
-nl='
-'
-echo "${nl}Check for compiler flags..."
-
-dnl AC_PROG_CC sets -g in CFLAGS (and -O2 for gcc) by default.
-dnl On OS/390 this causes the compiler to insert extra debugger
-dnl hook instructions.  That's fine for debug/maintainer builds, not fine
-dnl otherwise.
-
-case $host in
-    *os390)
-        if test "$ac_test_CFLAGS" != set; then
-           APR_REMOVEFROM(CFLAGS,-g)
-        fi
-        ;;
-esac
-
-AC_ARG_ENABLE(debug,[  --enable-debug          Turn on debugging and compile time warnings],
-  [APR_ADDTO(CFLAGS,-g)
-   if test "$GCC" = "yes"; then
-     APR_ADDTO(CFLAGS,-Wall)
-   elif test "$AIX_XLC" = "yes"; then
-     APR_ADDTO(CFLAGS,-qfullpath)
-   fi
-])dnl
-
-AC_ARG_ENABLE(maintainer-mode,[  --enable-maintainer-mode  Turn on debugging and compile time warnings],
-  [APR_ADDTO(CFLAGS,-g)
-   if test "$GCC" = "yes"; then
-     APR_ADDTO(CFLAGS,[-Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations])
-   elif test "$AIX_XLC" = "yes"; then
-     APR_ADDTO(CFLAGS,-qfullpath -qinitauto=FE -qcheck=all -qinfo=pro)
-   fi
-])dnl
-
-AC_ARG_ENABLE(profile,[  --enable-profile        Turn on profiling for the build (GCC)],
-  if test "$GCC" = "yes"; then
-    APR_ADDTO(CFLAGS, -pg)
-    APR_REMOVEFROM(CFLAGS, -g)
-    if test "$host" = "i586-pc-beos"; then
-        APR_REMOVEFROM(CFLAGS, -O2)
-        APR_ADDTO(CFLAGS, -O1)
-        APR_ADDTO(LDFLAGS, -p)
-    fi
-  fi
-)dnl
-
-AC_ARG_ENABLE(pool-debug,
-  [  --enable-pool-debug[[=yes|no|verbose|verbose-alloc|lifetime|owner|all]]    Turn on pools debugging],
-  [ if test -z "$enableval"; then
-        APR_ADDTO(CPPFLAGS, -DAPR_POOL_DEBUG=1)
-    elif test ! "$enableval" = "no"; then
-        apr_pool_debug=1
-    
-        for i in $enableval
-        do
-            flag=0
-        
-            case $i in
-            yes)
-                flag=1
-                ;;
-            verbose)
-                flag=2
-                ;;
-            lifetime)
-                flag=4
-                ;;
-            owner)
-                flag=8
-                ;;
-            verbose-alloc)
-                flag=16
-                ;;
-            all)
-                apr_pool_debug=31
-                ;;
-            *)
-                ;;
-            esac
-
-            if test $flag -gt 0; then
-                apr_pool_debug=`expr '(' $apr_pool_debug - $apr_pool_debug % \
-                    '(' $flag '*' 2 ')' ')' + $flag + $apr_pool_debug % $flag`
-            fi
-        done
-      
-        APR_ADDTO(CPPFLAGS, -DAPR_POOL_DEBUG=$apr_pool_debug)
-    fi
-  ])
-
-dnl Electric Fence malloc checker.
-dnl --with-efence specifies the path to Electric Fence
-AC_ARG_WITH(efence, 
-  [  --with-efence[[=DIR]]     path to Electric Fence installation], 
-  [ apr_efence_dir="$withval"
-    if test "$apr_efence_dir" != "yes"; then
-      APR_ADDTO(LDFLAGS,[-L$apr_efence_dir/lib])
-      if test "x$apr_platform_runtime_link_flag" != "x"; then
-          APR_ADDTO(LDFLAGS, 
-                    [$apr_platform_runtime_link_flag$apr_efence_dir/lib])
-      fi
-    fi
-    AC_CHECK_LIB(efence, malloc, 
-                 [ APR_ADDTO(LIBS,-lefence) ],
-                 [ AC_MSG_ERROR(Electric Fence requested but not detected) ])
-  ])
-
-if test "$host" = "i586-pc-beos"; then
-  AC_ARG_ENABLE(malloc-debug,[  --enable-malloc-debug   Switch on malloc_debug for BeOS],
-    APR_REMOVEFROM(CFLAGS, -O2)
-    APR_ADDTO(CPPFLAGS, -fcheck-memory-usage -D_KERNEL_MODE)
-  ) dnl
-fi
-
-# this is the place to put specific options for platform/compiler
-# combinations
-case "$host:$CC" in
-    *-hp-hpux*:cc )
-	APR_ADDTO(CFLAGS,[-Ae +Z])
-	case $host in
-	  ia64-* )
-	    ;;
-          * )
-	    if echo "$CFLAGS " | grep '+DA' >/dev/null; then :
-	    else
-	      APR_ADDTO(CFLAGS,[+DAportable])
-	    fi 
-	    ;;
-        esac
-	;;
-    powerpc-*-beos:mwcc* )
-	APR_SETVAR(CPP,[mwcc -E])
-	APR_SETVAR(CC,mwcc)
-	APR_SETVAR(AR,ar)
-	;;
-esac
-
-dnl Check the depend program we can use
-APR_CHECK_DEPEND
-
-# force_atomic_generic flag 
-# this will be set we find a cpu/OS combo
-# which is historical and doesn't work with the method
-# we are using for the more up to date cpu/OS
-# (ie.. old sparcs)
-apr_force_atomic_generic=0
-proc_mutex_is_global=0
-nonportable_atomics_enabled=0
-
-AC_ARG_ENABLE(nonportable-atomics,
-[  --enable-nonportable-atomics  Turn on optimized atomic code which may produce nonportable binaries],
-[
-    if test "$enableval" = "yes"; then
-        nonportable_atomics_enabled=1
-    fi
-])
-
-config_subdirs="none"
-INSTALL_SUBDIRS="none"
-case $host in
-   i386-ibm-aix* | *-ibm-aix[[1-2]].* | *-ibm-aix3.* | *-ibm-aix4.1 | *-ibm-aix4.1.* | *-ibm-aix4.2 | *-ibm-aix4.2.*)
-       OSDIR="aix"
-       APR_ADDTO(LDFLAGS,-lld)
-       eolstr="\\n"
-       ;;
-   *-os2*)
-       APR_ADDTO(CPPFLAGS,-DOS2)
-       APR_ADDTO(CFLAGS,-Zmt)
-       AC_CHECK_LIB(bsd, random)
-       OSDIR="os2"
-       enable_threads="system_threads"
-       eolstr="\\r\\n"
-       file_as_socket="0"
-       proc_mutex_is_global=1
-       ;;
-   *beos*)
-       OSDIR="beos"
-       APR_ADDTO(CPPFLAGS,-DBEOS)
-       enable_threads="system_threads"
-       native_mmap_emul="1"
-       APR_CHECK_DEFINE(BONE_VERSION, sys/socket.h)
-       eolstr="\\n"
-       osver=`uname -r`
-       proc_mutex_is_global=1
-       case $osver in
-          5.0.4)
-             file_as_socket="1"
-             ;;
-          *)
-             file_as_socket="0"
-             ;;
-       esac
-       ;;
-   *os390)
-       OSDIR="os390"
-       eolstr="\\n"
-       ;;
-   *os400)
-       OSDIR="as400"
-       eolstr="\\n"
-       ;;
-   *cygwin*)
-       OSDIR="unix"
-       APR_ADDTO(CPPFLAGS,-DCYGWIN)
-       enable_threads="no"
-       eolstr="\\n"
-       ;;
-   *linux*)
-       apr_force_atomic_generic=1
-       case $host_cpu in
-         i486|i586|i686)
-            if test "$nonportable_atomics_enabled" = 1; then
-              apr_force_atomic_generic=0
-            fi
-            ;;
-       esac
-       OSDIR="unix"
-       eolstr="\\n"
-       ;;
-   *hpux10* ) 
-       enable_threads="no"
-       OSDIR="unix"
-       eolstr="\\n"
-       ;;
-   *)
-       OSDIR="unix"
-       eolstr="\\n"
-       ;;
-esac
-
-AC_SUBST(apr_force_atomic_generic)
-AC_SUBST(proc_mutex_is_global)
-AC_SUBST(eolstr)
-AC_SUBST(INSTALL_SUBDIRS)
-
-# For some platforms we need a version string which allows easy numeric
-# comparisons.
-case $host in
-    *freebsd*)
-        if test -x /sbin/sysctl; then
-            os_version=`/sbin/sysctl -n kern.osreldate`
-        else
-            os_version=000000
-        fi
-        ;;
-    *linux*)
-        os_version=`uname -r | sed -e 's/\(.\)\.\(.\)\.\(.\).*/\1\2\3/'`
-        ;;
-    *darwin*)
-        os_version=`uname -r | sed -e 's/\(.\)\.\(.\).*/\1\2/'`
-        ;;
-    *)
-        os_version=OS_VERSION_IS_NOT_SET
-        ;;
-esac
-
-dnl ----------------------------- Checks for Any required Libraries
-dnl Note: Autoconf will always append LIBS with an extra " " in AC_CHECK_LIB.
-dnl It should check for LIBS being empty and set LIBS equal to the new value 
-dnl without the extra " " in that case, but they didn't do that.  So, we
-dnl end up LIBS="-lm -lcrypt -lnsl  -ldl" which is an annoyance.
-AC_CHECK_LIB(resolv, res_init)
-AC_CHECK_LIB(nsl, gethostbyname)
-AC_SEARCH_LIBS(gethostname, nsl)
-AC_CHECK_LIB(socket, socket)
-AC_SEARCH_LIBS(crypt, crypt ufc)
-AC_CHECK_LIB(truerand, main)
-AC_SEARCH_LIBS(modf, m)
-AC_SEARCH_LIBS(sqrt, m)
-
-dnl ----------------------------- Checking for Threads
-echo "${nl}Checking for Threads..."
-
-if test -z "$enable_threads"; then
-	AC_ARG_ENABLE(threads,
-	[  --enable-threads        Enable threading support in APR.],
-	[ enable_threads=$enableval] ,
-	[ APR_CHECK_PTHREADS_H([ enable_threads="pthread" ] ,
-	                       [ enable_threads="no" ] ) ] )
-fi
-
-if test "$enable_threads" = "no"; then
-    threads="0"
-    pthreadh="0"
-    pthreadser="0"
-else
-    if test "$enable_threads" = "pthread"; then
-# We have specified pthreads for our threading library, just make sure
-# that we have everything we need
-      APR_PTHREADS_CHECK_SAVE
-      APR_PTHREADS_CHECK
-      APR_CHECK_PTHREADS_H([
-          threads="1"
-          pthreadh="1"
-          pthreadser="1"
-          AC_DEFINE(USE_THREADS, 1, [Define if APR supports threads]) ], [
-          threads="0"
-          pthreadh="0"
-          pthreadser="0"
-          APR_PTHREADS_CHECK_RESTORE ] )
-    elif test "$enable_threads" = "system_threads"; then
-        threads="1"
-        pthreadh="0"
-        pthreadser="0"
-    else
-# We basically specified that we wanted threads, but not how to implement
-# them.  In this case, just look for pthreads.  In the future, we can check
-# for other threading libraries as well.
-      APR_PTHREADS_CHECK_SAVE
-      APR_PTHREADS_CHECK
-      APR_CHECK_PTHREADS_H([
-          threads="1"
-          pthreadh="1"
-          pthreadser="1"
-          AC_DEFINE(USE_THREADS) ], [
-          threads="0"
-          pthreadser="0"
-          pthreadh="0"
-          APR_PTHREADS_CHECK_RESTORE ] )
-    fi
-    if test "$pthreadh" = "1"; then
-        APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS
-        APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG
-        AC_CHECK_FUNCS(pthread_key_delete pthread_rwlock_init)
-
-        if test "$ac_cv_func_pthread_rwlock_init" = "yes"; then
-            dnl ----------------------------- Checking for pthread_rwlock_t
-            AC_CACHE_CHECK([for pthread_rwlock_t], [apr_cv_type_rwlock_t],
-            AC_TRY_COMPILE([#include <sys/types.h>
-#include <pthread.h>], [pthread_rwlock_t *rwlock;],
-              [apr_cv_type_rwlock_t=yes], [apr_cv_type_rwlock_t=no], 
-              [apr_cv_type_rwlock_t=no]))
-            if test "$apr_cv_type_rwlock_t" = "yes"; then
-               AC_DEFINE(HAVE_PTHREAD_RWLOCKS, 1, [Define if pthread rwlocks are available])
-            fi
-        fi
-        # this might also require -DXOPEN_SOURCE=500, so leave after the
-        # rwlock check.
-        APR_CHECK_PTHREAD_RECURSIVE_MUTEX
-    fi
-fi
-
-ac_cv_define_READDIR_IS_THREAD_SAFE=no
-ac_cv_define_GETHOSTBYNAME_IS_THREAD_SAFE=no
-ac_cv_define_GETHOSTBYADDR_IS_THREAD_SAFE=no
-if test "$threads" = "1"; then
-    echo "APR will use threads"
-    AC_CHECK_LIB(c_r, readdir,
-        AC_DEFINE(READDIR_IS_THREAD_SAFE, 1, 
-                  [Define if readdir is thread safe]))
-    if test "x$apr_gethostbyname_is_thread_safe" = "x"; then
-        AC_CHECK_LIB(c_r, gethostbyname, apr_gethostbyname_is_thread_safe=yes)
-    fi
-    if test "$apr_gethostbyname_is_thread_safe" = "yes"; then
-        AC_DEFINE(GETHOSTBYNAME_IS_THREAD_SAFE, 1,
-                  [Define if gethostbyname is thread safe])
-    fi
-    if test "x$apr_gethostbyaddr_is_thread_safe" = "x"; then
-        AC_CHECK_LIB(c_r, gethostbyaddr, apr_gethostbyaddr_is_thread_safe=yes)
-    fi
-    if test "$apr_gethostbyaddr_is_thread_safe" = "yes"; then
-        AC_DEFINE(GETHOSTBYADDR_IS_THREAD_SAFE, 1, 
-                  [Define if gethostbyaddr is thread safe])
-    fi
-    AC_CHECK_FUNCS(gethostbyname_r gethostbyaddr_r)
-else
-    echo "APR will be non-threaded"
-fi
-
-AC_CHECK_FUNCS(sigsuspend, [ have_sigsuspend="1" ], [ have_sigsuspend="0" ])
-AC_CHECK_FUNCS(sigwait, [ have_sigwait="1" ], [ have_sigwait="0" ]) 
-dnl AC_CHECK_FUNCS doesn't work for this on Tru64 since the function
-dnl is renamed in signal.h.  Todo: Autodetect
-case $host in
-    *alpha*-dec-osf* )
-        have_sigwait="1"
-        ;;
-esac
-
-AC_SUBST(threads)
-AC_SUBST(have_sigsuspend)
-AC_SUBST(have_sigwait)
-
-AC_CHECK_FUNCS(poll)
-
-dnl ----------------------------- Checking for missing POSIX thread functions
-AC_CHECK_FUNCS([getpwnam_r getpwuid_r getgrnam_r getgrgid_r])
-
-dnl ----------------------------- Checking for Shared Memory Support 
-echo "${nl}Checking for Shared Memory Support..."
-
-# The real-time POSIX extensions (e.g. shm_*, sem_*) may only
-# be available if linking against librt.
-AC_SEARCH_LIBS(shm_open, rt)
-
-case $host in
- *-sysv*)
-   ac_includes_default="$ac_includes_default
-#if HAVE_SYS_MUTEX_H /* needed to define lock_t for sys/shm.h */
-# include <sys/mutex.h>
-#endif";;
-esac
-
-AC_CHECK_HEADERS([sys/mman.h sys/ipc.h sys/mutex.h sys/shm.h sys/file.h kernel/OS.h os2.h])
-AC_CHECK_FUNCS([mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \
-                create_area])
-APR_CHECK_DEFINE(MAP_ANON, sys/mman.h)
-AC_CHECK_FILE(/dev/zero)
-
-# Not all systems can mmap /dev/zero (such as HP-UX).  Check for that.
-if test "$ac_cv_func_mmap" = "yes" &&
-   test "$ac_cv_file__dev_zero" = "yes"; then
-    AC_MSG_CHECKING(for mmap that can map /dev/zero)
-    AC_TRY_RUN([
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-    int main()
-    {
-        int fd;
-        void *m;
-        fd = open("/dev/zero", O_RDWR);
-        if (fd < 0) {
-            return 1;
-        }
-        m = mmap(0, sizeof(void*), PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
-        if (m == (void *)-1) {  /* aka MAP_FAILED */
-            return 2;
-        }
-        if (munmap(m, sizeof(void*)) < 0) {
-            return 3;
-        }
-        return 0;
-    }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])
-
-    AC_MSG_RESULT($ac_cv_file__dev_zero)
-fi
-
-# Now we determine which one is our anonymous shmem preference.
-haveshmgetanon="0"
-havemmapzero="0"
-havemmapanon="0"
-APR_BEGIN_DECISION([anonymous shared memory allocation method])
-APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl
-             func:shmget func:shmat func:shmdt func:shmctl,
-             [haveshmgetanon="1"
-              APR_DECIDE(USE_SHMEM_SHMGET_ANON, [SysV IPC shmget()])])
-APR_IFALLYES(header:sys/mman.h func:mmap func:munmap file:/dev/zero,
-             [havemmapzero="1"
-              APR_DECIDE(USE_SHMEM_MMAP_ZERO, 
-                  [SVR4-style mmap() on /dev/zero])])
-APR_IFALLYES(header:sys/mman.h func:mmap func:munmap define:MAP_ANON,
-             [havemmapanon="1"
-              APR_DECIDE(USE_SHMEM_MMAP_ANON, 
-                  [4.4BSD-style mmap() via MAP_ANON])])
-APR_IFALLYES(header:os2.h,
-             [haveos2shm="1"
-              APR_DECIDE(USE_SHMEM_OS2_ANON, [OS/2 DosAllocSharedMem()])])
-APR_IFALLYES(header:kernel/OS.h func:create_area,
-             [havebeosshm="1"
-              APR_DECIDE(USE_SHMEM_BEOS_ANON,
-                         [BeOS areas])])
-case $host in
-    *linux* ) 
-        # Linux has problems with MM_SHMT_MMANON even though it reports
-        # that it has it.
-        # FIXME - find exact 2.3 version that MMANON was fixed in.  It is
-        # confirmed fixed in 2.4 series.
-        if test $os_version -le "240"; then
-            APR_DECISION_OVERRIDE(USE_SHMEM_MMAP_ZERO USE_SHMEM_SHMGET_ANON)
-        fi
-        ;;
-    *hpux11* ) 
-        APR_DECISION_OVERRIDE(USE_SHMEM_SHMGET_ANON)
-        ;;
-esac
-APR_END_DECISION
-AC_DEFINE_UNQUOTED($ac_decision)
-
-useshmgetanon="0"
-usemmapzero="0"
-usemmapanon="0"
-
-case $ac_decision in
-    USE_SHMEM_SHMGET_ANON )
-        useshmgetanon="1"
-        ;;
-    USE_SHMEM_MMAP_ZERO )
-        usemmapzero="1"
-        ;;
-    USE_SHMEM_MMAP_ANON )
-        usemmapanon="1"
-        ;;
-esac
-
-AC_SUBST(useshmgetanon)
-AC_SUBST(usemmapzero)
-AC_SUBST(usemmapanon)
-AC_SUBST(haveshmgetanon)
-AC_SUBST(havemmapzero)
-AC_SUBST(havemmapanon)
-
-# Now we determine which one is our name-based shmem preference.
-havemmaptmp="0"
-havemmapshm="0"
-haveshmget="0"
-havebeosarea="0"
-haveos2shm="0"
-APR_BEGIN_DECISION([namebased memory allocation method])
-APR_IFALLYES(header:sys/mman.h func:mmap func:munmap,
-             [havemmaptmp="1"
-              APR_DECIDE(USE_SHMEM_MMAP_TMP, 
-                  [Classical mmap() on temporary file])])
-APR_IFALLYES(header:sys/mman.h func:mmap func:munmap func:shm_open dnl
-             func:shm_unlink,
-             [havemmapshm="1"
-              APR_DECIDE(USE_SHMEM_MMAP_SHM, 
-                  [mmap() via POSIX.1 shm_open() on temporary file])])
-APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl
-             func:shmget func:shmat func:shmdt func:shmctl,
-             [haveshmget="1"
-              APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])])
-APR_IFALLYES(header:kernel/OS.h func:create_area,
-             [havebeosshm="1"
-              APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])])
-APR_IFALLYES(header:os2.h,
-             [haveos2shm="1"
-              APR_DECIDE(USE_SHMEM_OS2, [OS/2 DosAllocSharedMem()])])
-case $host in
-    *linux* ) 
-        # Linux has problems with MM_SHMT_MMANON even though it reports
-        # that it has it.
-        # FIXME - find exact 2.3 version that MMANON was fixed in.  It is
-        # confirmed fixed in 2.4 series.
-        if test $os_version -le "240"; then
-            APR_DECISION_OVERRIDE(USE_SHMEM_MMAP_TMP USE_SHMEM_MMAP_SHM dnl
-                                  USE_SHMEM_SHMGET)
-        fi
-        ;;
-esac
-APR_END_DECISION
-AC_DEFINE_UNQUOTED($ac_decision)
-
-usemmaptmp="0"
-usemmapshm="0"
-useshmget="0"
-usebeosarea="0"
-useos2shm="0"
-
-case $ac_decision in
-    USE_SHMEM_MMAP_TMP )
-        usemmaptmp="1"
-        ;;
-    USE_SHMEM_MMAP_SHM )
-        usemmapshm="1"
-        ;;
-    USE_SHMEM_SHMGET )
-        useshmget="1"
-        ;;
-    USE_SHMEM_BEOS )
-        usebeosarea="1"
-        ;;
-    USE_SHMEM_OS2 )
-        useos2shm="1"
-        ;;
-esac
-
-# Do we have any shared memory support?
-if test "$usemmaptmp$usemmapshm$usemmapzero$useshmget$usemmapanon$usebeosarea$useos2shm" = "0000000"; then
-  sharedmem="0"
-else
-  sharedmem="1"
-fi
-
-AC_SUBST(usemmaptmp)
-AC_SUBST(usemmapshm)
-AC_SUBST(useshmget)
-AC_SUBST(usebeosarea)
-AC_SUBST(useos2shm)
-AC_SUBST(havemmaptmp)
-AC_SUBST(havemmapshm)
-AC_SUBST(haveshmget)
-AC_SUBST(havebeosarea)
-AC_SUBST(haveos2shm)
-AC_SUBST(sharedmem)
-
-dnl ----------------------------- Checks for Any required Functions
-dnl Checks for library functions. (N.B. poll is further down)
-AC_CHECK_FUNCS(alloca calloc strcasecmp stricmp setsid isinf isnan)
-AC_CHECK_FUNCS(getenv putenv setenv unsetenv)
-AC_CHECK_FUNCS(setrlimit, [ have_setrlimit="1" ], [ have_setrlimit="0" ]) 
-AC_CHECK_FUNCS(getrlimit, [ have_getrlimit="1" ], [ have_getrlimit="0" ]) 
-AC_CHECK_FUNCS(writev)
-sendfile="0"
-AC_CHECK_LIB(sendfile, sendfilev)
-AC_CHECK_FUNCS(sendfile send_file sendfilev, [ sendfile="1" ])
-AC_CHECK_FUNCS(utime utimes)
-
-dnl THIS MUST COME AFTER THE THREAD TESTS - FreeBSD doesn't always have a
-dnl threaded poll() and we don't want to use sendfile on early FreeBSD 
-dnl systems if we are also using threads.
-
-AC_ARG_WITH(sendfile, [  --with-sendfile         Override decision to use sendfile],
-  [ if test "$withval" = "yes"; then
-        sendfile="1"
-    else
-        sendfile="0"
-    fi ], [
-    orig_sendfile=$sendfile
-    case $host in
-        *freebsd*)
-            # FreeBSD < 4.2 has issues with threads+sendfile
-            if test $os_version -le "401999"; then
-                if test "$threads" = "1"; then
-                    sendfile="0"
-                fi
-            fi
-            ;;
-        *alpha*-dec-osf* )
-            sendfile="0"
-            ;;
-        s390-*-linux-gnu)
-            # disable sendfile support for 2.2 on S/390
-            if test $os_version -lt 240; then
-                sendfile="0"
-            fi
-            ;;
-        *aix*)
-            # compiler-independent check for 64-bit build
-            AC_CHECK_SIZEOF(void*, 4)
-            if test "x$ac_cv_sizeof_voidp" = "x8"; then
-                # sendfile not working for 64-bit build
-                sendfile="0"
-            fi
-            ;;
-        *darwin*)
-            # darwin semantics in 9.0.0 appear to be fubar
-            sendfile="0"
-            ;;
-    esac       
-    if test "$orig_sendfile" != "$sendfile"; then
-      echo "sendfile support disabled to avoid system problem"
-    fi ] )
-AC_SUBST(sendfile)
-
-AC_CHECK_FUNCS(sigaction, [ have_sigaction="1" ], [ have_sigaction="0" ]) 
-AC_DECL_SYS_SIGLIST
-
-AC_CHECK_FUNCS(fork, [ fork="1" ], [ fork="0" ])
-APR_CHECK_INET_ADDR
-APR_CHECK_INET_NETWORK
-AC_SUBST(apr_inaddr_none)
-AC_CHECK_FUNC(_getch)
-AC_CHECK_FUNCS(strerror_r, [ strerror_r="1" ], [ strerror_r="0" ])
-if test "$strerror_r" = "1"; then
-  APR_CHECK_STRERROR_R_RC
-fi
-AC_CHECK_FUNCS(crypt_r, [ crypt_r="1" ], [ crypt_r="0" ])
-if test "$crypt_r" = "1"; then
-  APR_CHECK_CRYPT_R_STYLE
-fi
-AC_CHECK_FUNCS(mmap, [ mmap="1" ], [ mmap="0" ])
-if test "$native_mmap_emul" = "1"; then
-    mmap="1"
-fi
-AC_CHECK_FUNCS(memmove, [ have_memmove="1" ], [have_memmove="0" ])
-AC_CHECK_FUNCS([getpass getpassphrase gmtime_r localtime_r hstrerror mkstemp])
-
-AC_SUBST(fork)
-AC_SUBST(have_inet_addr)
-AC_SUBST(tcp_nodelay_inherited)
-AC_SUBST(o_nonblock_inherited)
-AC_SUBST(have_inet_network)
-AC_SUBST(have_sigaction)
-AC_SUBST(have_setrlimit)
-AC_SUBST(have_getrlimit)
-AC_SUBST(mmap)
-AC_SUBST(have_memmove)
-
-APR_CHECK_SIGWAIT_ONE_ARG
-APR_CHECK_DIRENT_INODE
-APR_CHECK_DIRENT_TYPE
-
-dnl ----------------------------- Checks for Any required Headers
-AC_HEADER_STDC
-
-APR_FLAG_HEADERS(
-    alloca.h            \
-    ByteOrder.h		\
-    conio.h		\
-    crypt.h		\
-    ctype.h		\
-    dir.h		\
-    dirent.h		\
-    dl.h		\
-    dlfcn.h		\
-    errno.h		\
-    fcntl.h		\
-    grp.h		\
-    io.h		\
-    limits.h		\
-    mach-o/dyld.h	\
-    malloc.h		\
-    memory.h		\
-    netdb.h		\
-    osreldate.h		\
-    poll.h		\
-    process.h		\
-    pwd.h		\
-    semaphore.h		\
-    signal.h		\
-    stdarg.h		\
-    stddef.h		\
-    stdio.h		\
-    stdlib.h		\
-    string.h		\
-    strings.h		\
-    sysapi.h		\
-    sysgtime.h		\
-    termios.h		\
-    time.h		\
-    tpfeq.h		\
-    tpfio.h		\
-    unistd.h		\
-    unix.h		\
-    arpa/inet.h		\
-    kernel/OS.h		\
-    net/errno.h		\
-    netinet/in.h	\
-    netinet/sctp.h      \
-    netinet/sctp_uio.h  \
-    sys/file.h		\
-    sys/ioctl.h         \
-    sys/mman.h		\
-    sys/poll.h		\
-    sys/resource.h	\
-    sys/select.h	\
-    sys/sem.h		\
-    sys/sendfile.h	\
-    sys/signal.h	\
-    sys/socket.h	\
-    sys/sockio.h	\
-    sys/stat.h          \
-    sys/sysctl.h	\
-    sys/syslimits.h	\
-    sys/time.h		\
-    sys/types.h		\
-    sys/uio.h		\
-    sys/un.h		\
-    sys/wait.h)
-
-# IRIX 6.5 has a problem in <netinet/tcp.h> which prevents it from
-# being included by itself.  Check for <netinet/tcp.h> manually,
-# including another header file first.
-AC_CACHE_CHECK([for netinet/tcp.h], [apr_cv_hdr_netinet_tcp_h],
-[AC_TRY_CPP(
-[#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#include <netinet/tcp.h>
-], [apr_cv_hdr_netinet_tcp_h=yes], [apr_cv_hdr_netinet_tcp_h=no])])
-if test "$apr_cv_hdr_netinet_tcp_h" = "yes"; then
-   netinet_tcph=1
-   AC_DEFINE([HAVE_NETINET_TCP_H], 1, [Defined if netinet/tcp.h is present])
-else
-   netinet_tcph=0
-fi
-
-AC_SUBST(arpa_ineth)
-AC_SUBST(conioh)
-AC_SUBST(ctypeh)
-AC_SUBST(crypth)
-AC_SUBST(errnoh)
-AC_SUBST(direnth)
-AC_SUBST(fcntlh)
-AC_SUBST(ioh)
-AC_SUBST(limitsh)
-AC_SUBST(netdbh)
-AC_SUBST(sys_syslimitsh)
-AC_SUBST(netinet_inh)
-AC_SUBST(netinet_sctph)
-AC_SUBST(netinet_sctp_uioh)
-AC_SUBST(netinet_tcph)
-AC_SUBST(stdargh)
-AC_SUBST(stdioh)
-AC_SUBST(stdlibh)
-AC_SUBST(stringh)
-AC_SUBST(stringsh)
-AC_SUBST(sys_ioctlh)
-AC_SUBST(sys_sendfileh)
-AC_SUBST(sys_signalh)
-AC_SUBST(sys_socketh)
-AC_SUBST(sys_sockioh)
-AC_SUBST(sys_typesh)
-AC_SUBST(sys_timeh)
-AC_SUBST(sys_uioh)
-AC_SUBST(sys_unh)
-AC_SUBST(timeh)
-AC_SUBST(unistdh)
-AC_SUBST(signalh)
-AC_SUBST(sys_waith)
-AC_SUBST(pthreadh)
-AC_SUBST(semaphoreh)
-
-# Checking for h_errno in <netdb.h>
-if test "$netdbh" = "1"; then
-  APR_CHECK_H_ERRNO_FLAG
-  if test "$ac_cv_h_errno_cflags" = "no"; then
-    AC_MSG_ERROR([can not find h_errno in netdb.h])
-  fi
-fi
-
-dnl ----------------------------- Checks for standard typedefs
-AC_TYPE_OFF_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_TYPE_UID_T
-AC_CHECK_TYPE(ssize_t, int)
-AC_C_INLINE
-AC_C_CONST
-AC_TYPE_SIZE_T
-AC_FUNC_SETPGRP
-
-APR_CHECK_SOCKLEN_T
-
-APR_INADDR_NONE
-
-dnl Checks for pointer size
-AC_CHECK_SIZEOF(void*, 4)
-
-if test "x$ac_cv_sizeof_voidp" != "x"; then
-    voidp_size=$ac_cv_sizeof_voidp
-else
-    AC_ERROR([Cannot determine size of void*])
-fi
-
-dnl Checks for integer size
-AC_CHECK_SIZEOF(char, 1)
-AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(long double, 12)
-AC_CHECK_SIZEOF(long long, 8)
-
-if test "$ac_cv_sizeof_short" = "2"; then
-    short_value=short
-fi
-if test "$ac_cv_sizeof_int" = "4"; then
-    int_value=int
-fi
-# Now we need to find what apr_int64_t (sizeof == 8) will be.
-# The first match is our preference.
-if test "$ac_cv_sizeof_int" = "8"; then
-    int64_literal='#define APR_INT64_C(val) (val)'
-    int64_t_fmt='#define APR_INT64_T_FMT "d"'
-    int64_t_fmt_len='#define APR_INT64_T_FMT_LEN 1'
-    uint64_t_fmt='#define APR_UINT64_T_FMT "u"'
-    uint64_t_fmt_len='#define APR_UINT64_T_FMT_LEN 1'
-    uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "x"'
-    int64_value="int"
-    long_value=int
-    int64_strfn="strtoi"
-elif test "$ac_cv_sizeof_long" = "8"; then
-    int64_literal='#define APR_INT64_C(val) (val##L)'
-    int64_t_fmt='#define APR_INT64_T_FMT "ld"'
-    int64_t_fmt_len='#define APR_INT64_T_FMT_LEN 2'
-    uint64_t_fmt='#define APR_UINT64_T_FMT "lu"'
-    uint64_t_fmt_len='#define APR_UINT64_T_FMT_LEN 2'
-    uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "lx"'
-    int64_value="long"
-    long_value=long
-    int64_strfn="strtol"
-elif test "$ac_cv_sizeof_long_long" = "8"; then
-    int64_literal='#define APR_INT64_C(val) (val##LL)'
-    # Linux, Solaris, FreeBSD all support ll with printf.
-    # BSD 4.4 originated 'q'.  Solaris is more popular and 
-    # doesn't support 'q'.  Solaris wins.  Exceptions can
-    # go to the OS-dependent section.
-    int64_t_fmt='#define APR_INT64_T_FMT "lld"'
-    int64_t_fmt_len='#define APR_INT64_T_FMT_LEN 3'
-    uint64_t_fmt='#define APR_UINT64_T_FMT "llu"'
-    uint64_t_fmt_len='#define APR_UINT64_T_FMT_LEN 3'
-    uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "llx"'
-    int64_value="long long"
-    long_value="long long"
-    int64_strfn="strtoll"
-elif test "$ac_cv_sizeof_long_double" = "8"; then
-    int64_literal='#define APR_INT64_C(val) (val##LD)'
-    int64_t_fmt='#define APR_INT64_T_FMT "Ld"'
-    int64_t_fmt_len='#define APR_INT64_T_FMT_LEN 2'
-    uint64_t_fmt='#define APR_UINT64_T_FMT "Lu"'
-    uint64_t_fmt_len='#define APR_UINT64_T_FMT_LEN 2'
-    uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "Lx"'
-    int64_value="long double"
-    long_value="long double"
-    int64_strfn="strtoll"
-elif test "$ac_cv_sizeof_longlong" = "8"; then
-    int64_literal='#define APR_INT64_C(val) (val##LL)'
-    int64_t_fmt='#define APR_INT64_T_FMT "qd"'
-    int64_t_fmt_len='#define APR_INT64_T_FMT_LEN 2'
-    uint64_t_fmt='#define APR_UINT64_T_FMT "qu"'
-    uint64_t_fmt_len='#define APR_UINT64_T_FMT_LEN 2'
-    uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "qx"'
-    int64_value="__int64"
-    long_value="__int64"
-    int64_strfn="strtoll"
-else
-    # int64_literal may be overriden if your compiler thinks you have
-    # a 64-bit value but APR does not agree.
-    int64_literal='#error Can not determine the proper size for apr_int64_t'
-    int64_t_fmt='#error Can not determine the proper size for apr_int64_t'
-    int64_t_fmt_len='#error Can not determine the proper size for apr_int64_t'
-    uint64_t_fmt='#error Can not determine the proper size for apr_int64_t'
-    uint64_t_fmt_len='#error Can not determine the proper size for apr_int64_t'
-    uint64_t_hex_fmt='#error Can not determine the proper size for apr_uint64_t'
-fi
-
-# If present, allow the C99 macro INT64_C to override our conversion.
-#
-# HP-UX's ANSI C compiler provides this without any includes, so we
-# will first look for INT64_C without adding stdint.h
-AC_CACHE_CHECK([for INT64_C], [apr_cv_define_INT64_C], [
-AC_EGREP_CPP(YES_IS_DEFINED,
-[#ifdef INT64_C
-YES_IS_DEFINED
-#endif], [apr_cv_define_INT64_C=yes], [
-    # Now check for INT64_C in stdint.h
-    AC_EGREP_CPP(YES_IS_DEFINED, [#include <stdint.h>
-#ifdef INT64_C
-YES_IS_DEFINED
-#endif], [apr_cv_define_INT64_C=yes], [apr_cv_define_INT64_C=no])])])
-
-if test "$apr_cv_define_INT64_C" = "yes"; then
-    int64_literal='#define APR_INT64_C(val) INT64_C(val)'
-    stdint=1
-else
-    stdint=0
-fi
-
-if test "$ac_cv_type_size_t" = "yes"; then
-    size_t_value="size_t"
-else
-    size_t_value="apr_int32_t"
-fi
-if test "$ac_cv_type_ssize_t" = "yes"; then
-    ssize_t_value="ssize_t"
-else
-    ssize_t_value="apr_int32_t"
-fi
-if test "$ac_cv_socklen_t" = "yes"; then
-    socklen_t_value="socklen_t"
-    case $host in
-        *-hp-hpux*)
-            if test "$ac_cv_sizeof_long" = "8"; then
-                # 64-bit HP-UX requires 32-bit socklens in
-                # kernel, but user-space declarations say
-                # 64-bit (socklen_t == size_t == long).
-                # This will result in many compile warnings,
-                # but we're functionally busted otherwise.
-                socklen_t_value="int"
-            fi
-            ;;
-    esac
-else
-    socklen_t_value="int"
-fi
-
-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8)
-
-if test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_int"; then
-    ssize_t_fmt='#define APR_SSIZE_T_FMT "d"'
-elif test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_long"; then
-    ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
-else
-    ssize_t_fmt='#error Can not determine the proper size for ssize_t'
-fi
-
-APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8)
-
-if test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_int"; then
-    size_t_fmt='#define APR_SIZE_T_FMT "d"'
-elif test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_long"; then
-    size_t_fmt='#define APR_SIZE_T_FMT "ld"'
-else
-    size_t_fmt='#error Can not determine the proper size for size_t'
-fi
-
-if test "$ac_cv_type_off_t" = "yes"; then
-    APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8)
-    AC_MSG_CHECKING([which type to use for apr_off_t])
-    if test "${ac_cv_sizeof_off_t}${ac_cv_sizeof_long}" = "44"; then
-        # Special case: off_t may change size with _FILE_OFFSET_BITS
-        # on 32-bit systems with LFS support.  To avoid compatibility
-        # issues when other packages do define _FILE_OFFSET_BITS,
-        # hard-code apr_off_t to long.
-        off_t_value=long
-        off_t_fmt='#define APR_OFF_T_FMT "ld"'
-    else
-        off_t_value=off_t
-        # off_t is more commonly a long than an int; prefer that case
-        # where int and long are the same size.
-        if test "$ac_cv_sizeof_off_t" = "$ac_cv_sizeof_long"; then
-            off_t_fmt='#define APR_OFF_T_FMT "ld"'
-        elif test "$ac_cv_sizeof_off_t" = "$ac_cv_sizeof_int"; then
-            off_t_fmt='#define APR_OFF_T_FMT "d"'
-        elif test "$ac_cv_sizeof_off_t" = "$ac_cv_sizeof_long_long"; then
-            off_t_fmt='#define APR_OFF_T_FMT APR_INT64_T_FMT'
-        else
-            AC_ERROR([could not determine the size of off_t])
-        fi
-    fi
-    AC_MSG_RESULT([$off_t_value])
-    
-    dnl define apr_ino_t in a manner independent of _FILE_OFFSET_BITS setting
-    dnl default fallback
-    ino_t_value=ino_t
-    APR_CHECK_TYPES_COMPATIBLE(ino_t, unsigned long long, ino_t_value="unsigned long long")
-    APR_CHECK_TYPES_COMPATIBLE(ino_t, unsigned long, ino_t_value="unsigned long")
-    APR_CHECK_TYPES_COMPATIBLE(ino_t, unsigned int, ino_t_value="unsigned int")
-
-else
-    off_t_value='apr_int32_t'
-    off_t_fmt='#define APR_OFF_T_FMT "d"'
-fi
-
-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], pid_t, 8)
-
-if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then
-    pid_t_fmt='#define APR_PID_T_FMT "hd"'
-elif test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_int"; then
-    pid_t_fmt='#define APR_PID_T_FMT "d"'
-elif test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_long"; then
-    pid_t_fmt='#define APR_PID_T_FMT "ld"'
-elif test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_long_long"; then
-    pid_t_fmt='#define APR_PID_T_FMT APR_INT64_T_FMT'
-else
-    pid_t_fmt='#error Can not determine the proper size for pid_t'
-fi
-
-# Basically, we have tried to figure out the correct format strings
-# for APR types which vary between platforms, but we don't always get 
-# it right.  If you find that we don't get it right for your platform, 
-# you can override our decision below.
-case $host in
-   *linux*)
-       case $host in
-           s390*)
-               size_t_fmt='#define APR_SIZE_T_FMT "ld"'
-               ;;
-       esac
-       ;;
-   *os2_emx)
-       size_t_fmt='#define APR_SIZE_T_FMT "lu"'
-       ;;
-   *-solaris*)
-       pid_t_fmt='#define APR_PID_T_FMT "ld"'
-       ;;
-   *aix4*|*aix5*)
-       ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
-       size_t_fmt='#define APR_SIZE_T_FMT "lu"'
-       ;;
-    *beos*)
-        ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
-        size_t_fmt='#define APR_SIZE_T_FMT "ld"'
-        ;;
-    *apple-darwin*)
-        osver=`uname -r`
-        case $osver in
-           [[0-7]].*)
-              ssize_t_fmt='#define APR_SSIZE_T_FMT "d"'
-              ;;
-           *)
-              ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
-              ;;
-        esac
-        size_t_fmt='#define APR_SIZE_T_FMT "lu"'
-        ;;
-esac
-
-AC_SUBST(voidp_size)
-AC_SUBST(short_value)
-AC_SUBST(int_value)
-AC_SUBST(long_value)
-AC_SUBST(int64_value)
-AC_SUBST(off_t_value)
-AC_SUBST(size_t_value)
-AC_SUBST(ssize_t_value)
-AC_SUBST(socklen_t_value)
-AC_SUBST(int64_t_fmt) 
-AC_SUBST(int64_t_fmt_len) 
-AC_SUBST(uint64_t_fmt) 
-AC_SUBST(uint64_t_fmt_len) 
-AC_SUBST(uint64_t_hex_fmt) 
-AC_SUBST(ssize_t_fmt) 
-AC_SUBST(size_t_fmt)
-AC_SUBST(off_t_fmt) 
-AC_SUBST(pid_t_fmt)
-AC_SUBST(int64_literal) 
-AC_SUBST(stdint) 
-AC_SUBST(ino_t_value)
-
-dnl ----------------------------- Checking for string functions
-AC_CHECK_FUNCS(strnicmp, have_strnicmp="1", have_strnicmp="0")
-AC_CHECK_FUNCS(strncasecmp, have_strncasecmp="1", have_strncasecmp="0")
-AC_CHECK_FUNCS(stricmp, have_stricmp="1", have_stricmp="0")
-AC_CHECK_FUNCS(strcasecmp, have_strcasecmp="1", have_strcasecmp="0")
-AC_CHECK_FUNCS(strdup, have_strdup="1", have_strdup="0")
-AC_CHECK_FUNCS(strstr, have_strstr="1", have_strstr="0")
-AC_CHECK_FUNCS(memchr, have_memchr="1", have_memchr="0")
-AC_CHECK_FUNCS($int64_strfn, have_int64_strfn="1", have_int64_strfn="0")
-
-dnl ----------------------------- We have a fallback position
-if test "$have_int64_strfn" = "0" && test "$int64_strfn" = "strtoll"; then
-    int64_strfn="strtoq"
-    AC_CHECK_FUNCS($int64_strfn, have_int64_strfn="1", have_int64_strfn="0")
-fi
-
-AC_SUBST(have_strnicmp)
-AC_SUBST(have_strncasecmp)
-AC_SUBST(have_stricmp)
-AC_SUBST(have_strcasecmp)
-AC_SUBST(have_strdup)
-AC_SUBST(have_strstr)
-AC_SUBST(have_memchr)
-AC_SUBST(have_int64_strfn)
-AC_SUBST(int64_strfn)
-
-dnl ----------------------------- Checking for DSO support
-echo "${nl}Checking for DSO..."
-AC_ARG_ENABLE(dso,
-  [  --disable-dso           Disable DSO support ],
-  [ tempdso=$enableval],
-  [ 
-    AC_CHECK_FUNCS(NSLinkModule, [ tempdso="dyld" ], [ tempdso="no" ])
-    if test "$tempdso" = "no"; then
-      AC_CHECK_LIB(dld, shl_load, [ tempdso="shl" APR_ADDTO(LIBS,-ldld) ],
-                   tempdso="no")
-    fi
-    if test "$tempdso" = "no"; then
-      AC_CHECK_FUNCS(dlopen, [ tempdso="dlfcn" ], [ tempdso="no" ])
-    fi
-    if test "$tempdso" = "no"; then
-      AC_CHECK_LIB(dl, dlopen, [ tempdso="dlfcn" APR_ADDTO(LIBS,-ldl) ], 
-                   tempdso="no")
-    fi
-    if test "$tempdso" = "dlfcn"; then
-        # ReliantUnix has dlopen() in libc but dlsym() in libdl :(
-        AC_CHECK_FUNCS(dlsym, [ tempdso="dlfcn" ], [ tempdso="no" ])
-        if test "$tempdso" = "no"; then
-            AC_CHECK_LIB(dl, dlsym, [ tempdso="dlfcn" APR_ADDTO(LIBS, -ldl) ],
-                         tempdso="no")
-        fi
-        if test "$tempdso" = "no"; then
-            echo "Weird: dlopen() was found but dlsym() was not found!"
-        fi
-    fi
-    if test "$tempdso" = "no"; then
-      AC_CHECK_LIB(root, load_image, tempdso="yes", tempdso="no")
-    fi
-    if test "$tempdso" = "no"; then
-        case $host in
-            *os390|*-os2*|*os400)
-                tempdso="yes"
-                ;;
-        esac
-    fi
- ] )
-
-if test "$tempdso" = "no"; then
-    aprdso="0"
-else
-    case "$tempdso" in
-    dlfcn) AC_DEFINE(DSO_USE_DLFCN, 1, [Define if DSO support uses dlfcn.h]);;
-    shl)   AC_DEFINE(DSO_USE_SHL, 1, [Define if DSO support uses shl_load]);;
-    dyld)  AC_DEFINE(DSO_USE_DYLD, 1, [Define if DSO support uses dyld.h]);;
-    esac
-    aprdso="1"
-    apr_modules="$apr_modules dso"
-fi
-
-AC_SUBST(aprdso)
-
-dnl ----------------------------- Checking for Processes
-echo "${nl}Checking for Processes..."
-
-AC_CHECK_FUNCS(waitpid)
-
-AC_ARG_ENABLE(other-child,
-  [  --enable-other-child    Enable reliable child processes ],
-  [ if test "$enableval" = "yes"; then
-        oc="1"
-    else
-        oc="0"
-    fi ],
-  [ oc=1 ] ) 
-  
-AC_SUBST(oc) 
-
-AC_MSG_CHECKING(for Variable Length Arrays)
-APR_TRY_COMPILE_NO_WARNING([],
-[
-    int foo[argc];
-    foo[0] = 0;
-], vla_msg=yes, vla_msg=no )
-AC_MSG_RESULT([$vla_msg])
-if test "$vla_msg" = "yes"; then
-    AC_DEFINE(HAVE_VLA, 1, [Define if C compiler supports VLA])
-fi
-
-AC_CACHE_CHECK(struct rlimit,ac_cv_struct_rlimit,[
-AC_TRY_RUN([
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-main()
-{
-    struct rlimit limit;
-    limit.rlim_cur = 0;
-    limit.rlim_max = 0;
-    exit(0);
-}], [
-    ac_cv_struct_rlimit=yes ], [
-    ac_cv_struct_rlimit=no ], [
-    ac_cv_struct_rlimit=no ] ) ] )
-struct_rlimit=0
-test "x$ac_cv_struct_rlimit" = xyes && struct_rlimit=1
-AC_SUBST(struct_rlimit)
-
-dnl ----------------------------- Checking for Locking Characteristics 
-echo "${nl}Checking for Locking..."
-
-AC_CHECK_FUNCS(semget semctl flock)
-AC_CHECK_HEADERS(semaphore.h)
-AC_CHECK_FUNCS(sem_close sem_unlink sem_post sem_wait)
-
-# Some systems return ENOSYS from sem_open.
-AC_CACHE_CHECK(for working sem_open,ac_cv_func_sem_open,[
-AC_TRY_RUN([
-#include <errno.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <semaphore.h>
-main()
-{
-    sem_t *psem;
-    const char *sem_name = "/apr_autoconf";
-
-    if (sizeof(int) < sizeof(sem_t *))
-        exit(1);
-    psem = sem_open(sem_name, O_CREAT, 0644, 1);
-    if (psem == (sem_t *)SEM_FAILED) {
-	exit(1);
-    }
-    sem_close(psem);
-    sem_unlink(sem_name);
-    exit(0);
-}], [ac_cv_func_sem_open=yes], [ac_cv_func_sem_open=no],
-[ac_cv_func_sem_open=no])])
-
-# It's stupid, but not all platforms have union semun, even those that need it.
-AC_MSG_CHECKING(for union semun in sys/sem.h)
-AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-],[
-union semun arg;
-semctl(0, 0, 0, arg);
-], [have_union_semun="1" union_semun=yes ]
-msg=yes, [
-have_union_semun="0"
-msg=no ] )
-AC_MSG_RESULT([$msg])
-AC_SUBST(have_union_semun)
-
-dnl Checks for libraries.
-APR_CHECK_DEFINE(LOCK_EX, sys/file.h)
-APR_CHECK_DEFINE(F_SETLK, fcntl.h)
-APR_CHECK_DEFINE(SEM_UNDO, sys/sem.h)
-
-# We are assuming that if the platform doesn't have POLLIN, it doesn't have
-# any POLL definitions.
-APR_CHECK_DEFINE_FILES(POLLIN, poll.h sys/poll.h)
-
-if test "$threads" = "1"; then
-    APR_CHECK_DEFINE(PTHREAD_PROCESS_SHARED, pthread.h)
-    AC_CHECK_FUNCS(pthread_mutexattr_setpshared)
-    # Some systems have setpshared and define PROCESS_SHARED, but don't 
-    # really support PROCESS_SHARED locks.  So, we must validate that we 
-    # can go through the steps without receiving some sort of system error.
-    # Linux and older versions of AIX have this problem.
-    APR_IFALLYES(header:pthread.h define:PTHREAD_PROCESS_SHARED func:pthread_mutexattr_setpshared, [
-      AC_CACHE_CHECK([for working PROCESS_SHARED locks], apr_cv_process_shared_works, [
-      AC_TRY_RUN([
-#include <sys/types.h>
-#include <pthread.h>
-        int main()
-        {
-            pthread_mutex_t mutex;
-            pthread_mutexattr_t attr;
-            if (pthread_mutexattr_init(&attr))
-                exit(1);
-            if (pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED))
-                exit(2);
-            if (pthread_mutex_init(&mutex, &attr))
-                exit(3);
-            if (pthread_mutexattr_destroy(&attr))
-                exit(4);
-            if (pthread_mutex_destroy(&mutex))
-                exit(5);
-            exit(0);
-        }], [apr_cv_process_shared_works=yes], [apr_cv_process_shared_works=no])])
-      # Override detection of pthread_mutexattr_setpshared
-      ac_cv_func_pthread_mutexattr_setpshared=$apr_cv_process_shared_works])
-
-    if test "$ac_cv_func_pthread_mutexattr_setpshared" = "yes"; then
-        APR_CHECK_PTHREAD_ROBUST_SHARED_MUTEX
-    fi
-fi
-
-# See which lock mechanisms we can support on this system.
-APR_IFALLYES(header:semaphore.h func:sem_open func:sem_close dnl
-             func:sem_unlink func:sem_post func:sem_wait,
-             hasposixser="1", hasposixser="0")
-APR_IFALLYES(func:semget func:semctl define:SEM_UNDO, hassysvser="1", 
-             hassysvser="0")
-APR_IFALLYES(func:flock define:LOCK_EX, hasflockser="1", hasflockser="0")
-APR_IFALLYES(header:fcntl.h define:F_SETLK, hasfcntlser="1", hasfcntlser="0")
-# note: the current APR use of shared mutex requires /dev/zero
-APR_IFALLYES(header:pthread.h define:PTHREAD_PROCESS_SHARED dnl
-             func:pthread_mutexattr_setpshared dnl
-             file:/dev/zero,
-             hasprocpthreadser="1", hasprocpthreadser="0")
-APR_IFALLYES(struct:pthread_rw, hasrwlockser="1", hasrwlockser="0")
-
-# See which lock mechanism we'll select by default on this system.
-# The last APR_DECIDE to execute sets the default.
-# At this stage, we match the ordering in Apache 1.3
-# which is (highest to lowest): sysvsem -> fcntl -> flock.
-# POSIX semaphores and cross-process pthread mutexes are not
-# used by default since they have less desirable behaviour when
-# e.g. a process holding the mutex segfaults.
-APR_BEGIN_DECISION([apr_lock implementation method])
-APR_IFALLYES(func:flock define:LOCK_EX,
-            APR_DECIDE(USE_FLOCK_SERIALIZE, [4.2BSD-style flock()]))
-APR_IFALLYES(header:fcntl.h define:F_SETLK,
-            APR_DECIDE(USE_FCNTL_SERIALIZE, [SVR4-style fcntl()]))
-APR_IFALLYES(func:semget func:semctl define:SEM_UNDO,
-            APR_DECIDE(USE_SYSVSEM_SERIALIZE, [SysV IPC semget()]))
-if test "x$apr_lock_method" != "x"; then
-    APR_DECISION_FORCE($apr_lock_method)
-fi
-APR_END_DECISION
-AC_DEFINE_UNQUOTED($ac_decision)
-
-flockser="0"
-sysvser="0"
-posixser="0"
-procpthreadser="0"
-fcntlser="0"
-case $ac_decision in
-    USE_FLOCK_SERIALIZE )
-        flockser="1"
-        ;;
-    USE_FCNTL_SERIALIZE )
-        fcntlser="1"
-        ;;
-    USE_SYSVSEM_SERIALIZE )
-        sysvser="1"
-        ;;
-    USE_POSIXSEM_SERIALIZE )
-        posixser="1"
-        ;;
-    USE_PROC_PTHREAD_SERIALIZE )
-        procpthreadser="1"
-        ;;
-esac
-
-AC_SUBST(hasflockser)
-AC_SUBST(hassysvser)
-AC_SUBST(hasposixser)
-AC_SUBST(hasfcntlser)
-AC_SUBST(hasprocpthreadser)
-AC_SUBST(hasrwlockser)
-AC_SUBST(flockser)
-AC_SUBST(sysvser)
-AC_SUBST(posixser)
-AC_SUBST(fcntlser)
-AC_SUBST(procpthreadser)
-AC_SUBST(pthreadser)
-
-AC_MSG_CHECKING(if all interprocess locks affect threads)
-if test "x$apr_process_lock_is_global" = "xyes"; then
-    proclockglobal="1"
-    AC_MSG_RESULT(yes)
-else
-    proclockglobal="0"
-    AC_MSG_RESULT(no)
-fi
-
-AC_SUBST(proclockglobal)
-
-AC_MSG_CHECKING(if POSIX sems affect threads in the same process)
-if test "x$apr_posixsem_is_global" = "xyes"; then
-  AC_DEFINE(POSIXSEM_IS_GLOBAL, 1, 
-            [Define if POSIX semaphores affect threads within the process])
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-
-AC_MSG_CHECKING(if SysV sems affect threads in the same process)
-if test "x$apr_sysvsem_is_global" = "xyes"; then
-  AC_DEFINE(SYSVSEM_IS_GLOBAL, 1,
-            [Define if SysV semaphores affect threads within the process])
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-
-AC_MSG_CHECKING(if fcntl locks affect threads in the same process)
-if test "x$apr_fcntl_is_global" = "xyes"; then
-  AC_DEFINE(FCNTL_IS_GLOBAL, 1,
-            [Define if fcntl locks affect threads within the process])
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-
-AC_MSG_CHECKING(if flock locks affect threads in the same process)
-if test "x$apr_flock_is_global" = "xyes"; then
-  AC_DEFINE(FLOCK_IS_GLOBAL, 1,
-            [Define if flock locks affect threads within the process])
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
-
-dnl ----------------------------- Checking for /dev/random 
-AC_MSG_CHECKING(for entropy source)
-
-AC_ARG_WITH(egd, 
-  [  --with-egd[[=DIR]]        use EGD-compatible socket],
-  [ AC_DEFINE(HAVE_EGD, 1, [Define if EGD is supported])
-    if test "$withval" = "yes"; then
-        AC_DEFINE_UNQUOTED(EGD_DEFAULT_SOCKET, ["/var/run/egd-pool","/dev/egd-pool","/etc/egd-pool","/etc/entropy"], 
-         [Define to list of paths to EGD sockets])
-    else
-        AC_DEFINE_UNQUOTED(EGD_DEFAULT_SOCKET, ["$withval"])
-    fi
-    AC_MSG_RESULT(EGD-compatible daemon)
-    rand="1"
-  ])
-
-if test "$rand" != "1"; then
-  AC_ARG_WITH(devrandom,
-    [  --with-devrandom[[=DEV]]  use /dev/random or compatible [[searches by default]]],
-    [ apr_devrandom="$withval" ], [ apr_devrandom="yes" ])
-
-  if test "$apr_devrandom" = "yes"; then
-    # /dev/random on OpenBSD doesn't provide random data, so
-    # prefer /dev/arandom, which does; see random(4).
-    for f in /dev/arandom /dev/random /dev/urandom; do
-      if test -r $f; then
-        apr_devrandom=$f
-        rand=1
-        break
-      fi
-    done
-  elif test "$apr_devrandom" != "no"; then
-    if test -r "$apr_devrandom"; then
-      rand="1"
-    else
-      AC_ERROR([$apr_devrandom not found or unreadable.])
-    fi
-  fi
-
-  if test "$rand" = "1"; then
-    AC_DEFINE_UNQUOTED(DEV_RANDOM, ["$apr_devrandom"], [Define to path of random device])
-    AC_MSG_RESULT([$apr_devrandom])
-  fi
-fi
-
-if test "$rand" != "1"; then
-    case $host in
-        # we have built in support for OS/2
-        *-os2*)
-            AC_MSG_RESULT([Using OS/2 builtin random])
-            rand="1"
-            ;;
-        *)
-            if test "$rand" != "1"; then
-              if test "$ac_cv_lib_truerand_main" = "yes"; then
-                AC_DEFINE(HAVE_TRUERAND, 1, [Define if truerand is supported])
-                AC_MSG_RESULT(truerand)
-                rand="1"
-              else
-                AC_MSG_RESULT(not found)
-                rand="0"
-              fi
-            fi
-            ;;
-    esac
-fi
-
-AC_SUBST(rand)
-dnl ----------------------------- Checking for Time Support 
-echo "${nl}Checking for Time Support..."
-AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
-[AC_TRY_COMPILE([#include <sys/types.h>
-#include <time.h>], [struct tm tm; tm.tm_gmtoff;],
-  ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)])
-
-if test "$ac_cv_struct_tm_gmtoff" = "yes"; then
-    AC_DEFINE(HAVE_GMTOFF, 1, [Define if struct tm has a tm_gmtoff field])
-fi
-
-dnl ----------------------------- Checking for Networking Support 
-echo "${nl}Checking for Networking support..."
-AC_MSG_CHECKING(for in_addr in netinet/in.h)
-AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <netinet/in.h>
-],[
-struct in_addr arg;
-arg.s_addr = htonl(INADDR_ANY);
-], [ have_in_addr="1" 
-msg=yes ] , [ have_in_addr="0"
-msg=no ])
-AC_MSG_RESULT([$msg])
-
-AC_MSG_CHECKING([if fd == socket on this platform])
-if test "x$file_as_socket" != "x0" ; then
-    file_as_socket="1";
-    echo "yes"
-else
-    echo "no"
-fi
-
-AC_SUBST(have_in_addr)
-AC_SUBST(file_as_socket)
-
-# Check the types only if we have gethostbyname_r
-if test "$ac_cv_func_gethostbyname_r" = "yes"; then
-    APR_CHECK_GETHOSTBYNAME_R_STYLE
-fi
-
-APR_CHECK_TCP_NODELAY_INHERITED
-APR_CHECK_O_NONBLOCK_INHERITED
-
-# Look for a way of corking TCP...
-APR_CHECK_DEFINE(TCP_CORK, netinet/tcp.h)
-APR_CHECK_DEFINE(TCP_NOPUSH, netinet/tcp.h)
-apr_tcp_nopush_flag="0"
-have_corkable_tcp="0"
-if test "x$ac_cv_define_TCP_CORK" = "xyes"; then
-    apr_tcp_nopush_flag="TCP_CORK"
-    have_corkable_tcp="1"
-else
-    case $host in
-        *linux*)
-            AC_EGREP_CPP(yes,[
-#include <linux/socket.h>
-#ifdef TCP_CORK
-yes
-#endif
-            ],[
-                apr_tcp_nopush_flag="3"
-                have_corkable_tcp="1"
-            ])
-            ;;
-        *)
-            ;;
-    esac
-fi
-if test "x$ac_cv_define_TCP_NOPUSH" = "xyes"; then
-    apr_tcp_nopush_flag="TCP_NOPUSH"
-    have_corkable_tcp="1"
-fi
-
-APR_CHECK_DEFINE(SO_ACCEPTFILTER, sys/socket.h)
-if test "x$ac_cv_define_SO_ACCEPTFILTER" = "xyes"; then
-    acceptfilter="1"
-else
-    acceptfilter="0"
-fi
-
-APR_CHECK_SCTP
-
-AC_SUBST(apr_tcp_nopush_flag)
-AC_SUBST(have_corkable_tcp)
-AC_SUBST(acceptfilter)
-AC_SUBST(have_sctp)
-
-AC_CHECK_FUNCS(set_h_errno)
-APR_CHECK_RESOLV_RETRANS
-
-echo "${nl}Checking for IPv6 Networking support..."
-dnl Start of checking for IPv6 support...
-
-AC_ARG_ENABLE(ipv6,
-  [  --disable-ipv6          Disable IPv6 support in APR.],
-  [ if test "$enableval" = "no"; then
-        user_disabled_ipv6=1
-    fi ],
-  [ user_disabled_ipv6=0 ] )
-
-case $host in
-  *)
-    broken_ipv6=0
-esac
-
-AC_SEARCH_LIBS(getaddrinfo, socket inet6)
-AC_SEARCH_LIBS(gai_strerror, socket inet6)
-AC_SEARCH_LIBS(getnameinfo, socket inet6)
-AC_CHECK_FUNCS(gai_strerror)
-APR_CHECK_WORKING_GETADDRINFO
-APR_CHECK_NEGATIVE_EAI
-APR_CHECK_WORKING_GETNAMEINFO
-APR_CHECK_SOCKADDR_IN6
-
-have_ipv6="0"
-if test "$user_disabled_ipv6" = 1; then
-    ipv6_result="no -- disabled by user"
-else
-    if test "x$broken_ipv6" = "x0"; then
-        if test "x$have_sockaddr_in6" = "x1"; then
-            if test "x$ac_cv_working_getaddrinfo" = "xyes"; then
-                if test "x$ac_cv_working_getnameinfo" = "xyes"; then
-                    have_ipv6="1"
-                    ipv6_result="yes"
-                else
-                    ipv6_result="no -- no getnameinfo"
-                fi
-            else
-                ipv6_result="no -- no working getaddrinfo"
-            fi
-        else
-            ipv6_result="no -- no sockaddr_in6"
-        fi
-    else
-        ipv6_result="no -- the platform has known problems supporting IPv6"
-    fi
-fi
-
-AC_MSG_CHECKING(if APR supports IPv6)
-AC_MSG_RESULT($ipv6_result)
-
-AC_SUBST(have_ipv6)
-
-dnl Check for langinfo support
-
-AC_CHECK_HEADERS(langinfo.h)
-AC_CHECK_FUNCS(nl_langinfo)
-
-dnl Random late checks...
-
-# AC_CHECK_FUNCS is not sufficient since the function may be usable when
-# struct stat64 is not exposed (e.g. HP-UX).  Note that fstat64 only
-# happens to be usable on Linux because -D_GNU_SOURCE is picked up
-# by the earlier crypt_r check.
-AC_CACHE_CHECK([for usable fstat64], [apr_cv_func_fstat64],
- [AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>], [struct stat64 st; fstat64(0, &st);],
-  [apr_cv_func_fstat64=yes], [apr_cv_func_fstat64=no])])
-if test $apr_cv_func_fstat64 = yes; then
-  AC_DEFINE(HAVE_FSTAT64, 1, [Define if fstat64 can be used])
-fi
-
-
-dnl ----------------------------- Finalize the variables
-
-echo "${nl}Restore user-defined environment settings..."
-
-APR_RESTORE_THE_ENVIRONMENT(CPPFLAGS, EXTRA_)
-APR_RESTORE_THE_ENVIRONMENT(CFLAGS, EXTRA_)
-APR_RESTORE_THE_ENVIRONMENT(LDFLAGS, EXTRA_)
-APR_RESTORE_THE_ENVIRONMENT(LIBS, EXTRA_)
-APR_RESTORE_THE_ENVIRONMENT(INCLUDES, EXTRA_)
-AC_SUBST(NOTEST_CPPFLAGS)
-AC_SUBST(NOTEST_CFLAGS)
-AC_SUBST(NOTEST_LDFLAGS)
-AC_SUBST(NOTEST_LIBS)
-AC_SUBST(NOTEST_INCLUDES)
-
-dnl ----------------------------- Construct the files
-
-AC_SUBST(LDLIBS)
-AC_SUBST(AR)
-AC_SUBST(RM)
-AC_SUBST(OSDIR)
-AC_SUBST(DEFAULT_OSDIR)
-AC_SUBST(EXEEXT)
-AC_SUBST(LIBTOOL_LIBS)
-
-echo "${nl}Construct Makefiles and header files."
-MAKEFILE1="Makefile strings/Makefile passwd/Makefile tables/Makefile build/Makefile"
-SUBDIRS="strings passwd tables "
-for dir in $apr_modules
-do
-    test -d $dir || $MKDIR $dir
-    if test -f $srcdir/$dir/$OSDIR/Makefile.in; then
-        MAKEFILE2="$MAKEFILE2 $dir/$OSDIR/Makefile "
-        SUBDIRS="$SUBDIRS $dir/$OSDIR "
-    else
-        MAKEFILE2="$MAKEFILE2 $dir/$DEFAULT_OSDIR/Makefile "
-        SUBDIRS="$SUBDIRS $dir/$DEFAULT_OSDIR "
-    fi
-done
-
-if test -d $srcdir/test; then
-    MAKEFILE3="test/Makefile test/internal/Makefile"
-fi
-AC_SUBST(SUBDIRS)
-
-#
-# BSD/OS (BSDi) needs to use a different include syntax in the Makefiles
-#
-case $host in
-*bsdi*)
-    # Check whether they've installed GNU make
-    if make --version > /dev/null 2>&1; then 
-	INCLUDE_RULES="include $apr_buildout/apr_rules.mk"
-    else
-	# BSDi make
-	INCLUDE_RULES=".include \"$apr_buildout/apr_rules.mk\""
-    fi
-    ;;
-*)
-    INCLUDE_RULES="include $apr_buildout/apr_rules.mk"
-    ;;
-esac
-AC_SUBST(INCLUDE_RULES)
-
-SAVE_FILES="include/apr.h include/arch/unix/apr_private.h"
-
-for i in $SAVE_FILES; do
-  test -r $i && mv $i $i.save
-done
-
-dir=include/arch/unix
-test -d $dir || $MKDIR $dir
-
-AC_OUTPUT([
-	$MAKEFILE1 $MAKEFILE2 $MAKEFILE3
-	include/apr.h
-	build/apr_rules.mk
-	build/pkg/pkginfo
-	apr-config
-],[
-for i in $SAVE_FILES; do
-  if cmp -s $i $i.save 2>/dev/null; then
-    mv $i.save $i
-    echo "$i is unchanged"
-  fi
-  rm -f $i.save
-done
-chmod +x apr-config
-])
-
-dnl ----------------------------- Fixup Makefiles for VPATH support
-
-changequote({,})
-
-if test -n "$USE_VPATH"; then
-  for makefile in $MAKEFILE1 $MAKEFILE2 $MAKEFILE3; do
-    cat $makefile | \
-        sed \
-		-e 's#-I\($(INCDIR[0-9]*)\)#-I\1 -I$(srcdir)/\1#g' \
-		-e 's#-I\($(OSDIR[0-9]*)\)#-I\1 -I$(srcdir)/\1#g' \
-		-e 's#-I\($(DEFOSDIR[0-9]*)\)#-I\1 -I$(srcdir)/\1#g' \
-		> tmp
-    cp tmp $makefile
-  done
-  rm -f tmp
-fi
-
-changequote([,])
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/docs/APRDesign.html b/rubbos/app/httpd-2.0.64/srclib/apr/docs/APRDesign.html
deleted file mode 100644
index 7d1caeb8..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/docs/APRDesign.html
+++ /dev/null
@@ -1,399 +0,0 @@
-<HTML>
-<HEAD><TITLE>APR Design Document</TITLE></HEAD>
-<BODY>
-<h1>Design of APR</h1>
-
-<p>The Apache Portable Run-time libraries have been designed to provide a common
-interface to low level routines across any platform.  The original goal of APR
-was to combine all code in Apache to one common code base.  This is not the
-correct approach however, so the goal of APR has changed.  There are places 
-where common code is not a good thing.  For example, how to map requests 
-to either threads or processes should be platform specific.  APR's place 
-is now to combine any code that can be safely combined without sacrificing 
-performance.</p>
-
-<p>To this end we have created a set of operations that are required for cross
-platform development.  There may be other types that are desired and those
-will be implemented in the future.</p>
-
-<p>This document will discuss the structure of APR, and how best to contribute
-code to the effort.</p>
-
-<h2>APR On Windows and Netware</h2>
-
-<p>APR on Windows and Netware is different from APR on all other systems, 
-because those platforms don't use autoconf. On Unix, apr_private.h (private to 
-APR) and apr.h (public, used by applications that use APR) are generated by 
-autoconf from acconfig.h and apr.h.in respectively. On Windows (and Netware), 
-apr_private.h and apr.h are created from apr_private.hw (apr_private.hwn) 
-and apr.hw (apr.hwn) respectively.</p>
-
-<p> <strong>
-        If you add code to acconfig.h or tests to configure.in or aclocal.m4,
-        please give some thought to whether or not Windows and Netware need 
-	these additions as well.  A general rule of thumb, is that if it is 
-	a feature macro, such as APR_HAS_THREADS, Windows and Netware need it.
-	In other words, if the definition is going to be used in a public APR 
-	header file, such as apr_general.h, Windows needs it.
-        
-        The only time it is safe to add a macro or test without also adding 
-        the macro to apr*.h[n]w, is if the macro tells APR how to build.  For
-        example, a test for a header file does not need to be added to Windows.
-</strong></p>
-
-<h2>APR Features</h2>
-
-<p>One of the goals of APR is to provide a common set of features across all 
-platforms.  This is an admirable goal, it is also not realistic.  We cannot
-expect to be able to implement ALL features on ALL platforms.  So we are
-going to do the next best thing.  Provide a common interface to ALL APR 
-features on MOST platforms.</p>
-
-<p>APR developers should create FEATURE MACROS for any feature that is not
-available on ALL platforms.  This should be a simple definition which has
-the form:</p>
-
-<code>APR_HAS_FEATURE</code>
-
-<p>This macro should evaluate to true if APR has this feature on this platform.
-For example, Linux and Windows have mmap'ed files, and APR is providing an
-interface for mmapp'ing a file.  On both Linux and Windows, APR_HAS_MMAP
-should evaluate to one, and the ap_mmap_* functions should map files into
-memory and return the appropriate status codes.</p>
-
-<p>If your OS of choice does not have mmap'ed files, APR_HAS_MMAP should 
-evaluate to zero, and all ap_mmap_* functions should not be defined.  The 
-second step is a precaution that will allow us to break at compile time if a 
-programmer tries to use unsupported functions.</p>
-
-<h2>APR types</h2>
-
-<p>The base types in APR</p>
-
-<ul>
-<li>dso<br>
-	Shared library routines
-<li>mmap<br>
-	Memory-mapped files
-<li>poll<br>
-	Polling I/O
-<li>time<br>
-	Time
-<li>user<br>
-	Users and groups
-<li>locks<br>
-	Process and thread locks (critical sections)
-<li>shmem<br>
-	Shared memory
-<li>file_io<br>
-	File I/O, including pipes
-<li>atomic<br>
-	Atomic integer operations
-<li>strings<br>
-	String handling routines
-<li>memory<br>
-	Pool-based memory allocation
-<li>passwd<br>
-	Reading passwords from the terminal
-<li>tables<br>
-	Tables and hashes
-<li>network_io<br>
-	Network I/O
-<li>threadproc<br>
-	Threads and processes
-<li>misc<br>
-	Any APR type which doesn't have any other place to belong.  This
-	should be used sparingly.
-<li>support<br>
-	Functions meant to be used across multiple APR types.  This area
-	is for internal functions only.  If a function is exposed, it should
-	not be put here.
-</ul>
-
-<h2>Directory Structure</h2>
-
-<p>Each type has a base directory.  Inside this base directory, are
-subdirectories, which contain the actual code.  These subdirectories are named
-after the platforms the are compiled on.  Unix is also used as a common
-directory.  If the code you are writing is POSIX based, you should look at the
-code in the unix directory.  A good rule of thumb, is that if more than half
-your code needs to be ifdef'ed out, and the structures required for your code
-are substantively different from the POSIX code, you should create a new
-directory.</p>
-
-<p>Currently, the APR code is written for Unix, BeOS, Windows, and OS/2.  An
-example of the directory structure is the file I/O directory:</p>
-
-<pre>
-apr
-  |
-   ->  file_io
-          |
-           -> unix            The Unix and common base code
-          |
-           -> win32           The Windows code
-          | 
-           -> os2             The OS/2 code
-</pre>
-
-<p>Obviously, BeOS does not have a directory.  This is because BeOS is currently
-using the Unix directory for it's file_io.</p>
-
-<p>There are a few special top level directories.  These are test and include.
-Test is a directory which stores all test programs.  It is expected
-that if a new type is developed, there will also be a new test program, to
-help people port this new type to different platforms.  A small document
-describing how to create new tests that integrate with the test suite can be
-found in the test/ directory.  Include is a directory which stores all 
-required APR header files for external use.</p>
-
-<h2>Creating an APR Type</h2>
-
-<p>The current design of APR requires that most APR types be incomplete.  
-It is not possible to write flexible portable code if programs can access 
-the internals of APR types.  This is because different platforms are 
-likely to define different native types.  There are only two execptions to
-this rule:</p>
-
-<ul>
-<li>The first exception to this rule is if the type can only reasonably be 
-implemented one way.  For example, time is a complete type because there 
-is only one reasonable time implementation.
-
-<li>The second exception to the incomplete type rule can be found in 
-apr_portable.h.  This file defines the native types for each platform.  
-Using these types, it is possible to extract native types for any APR type.</p>
-</ul>
-
-<p>For this reason, each platform defines a structure in their own directories. 
-Those structures are then typedef'ed in an external header file.  For example
-in file_io/unix/fileio.h:</p>
-
-<pre>
-    struct ap_file_t {
-        apr_pool_t *cntxt;
-        int filedes;
-        FILE *filehand;
-        ...
-    }
-</pre>
-
-<p>In include/apr_file_io.h:</p>
-    </pre>
-    typedef struct ap_file_t    ap_file_t;
-    </pre>
-
-<p> This will cause a compiler error if somebody tries to access the filedes 
-field in this structure.  Windows does not have a filedes field, so obviously, 
-it is important that programs not be able to access these.</p>
-
-<p>You may notice the apr_pool_t field.  Most APR types have this field.  This
-type is used to allocate memory within APR.  Because every APR type has a pool,
-any APR function can allocate memory if it needs to.  This is very important
-and it is one of the reasons that APR works.  If you create a new type, you
-must add a pool to it.  If you do not, then all functions that operate on that
-type will need a pool argument.</p>
-
-<h2>New Function</h2>
-
-<p>When creating a new function, please try to adhere to these rules.</p>
-
-<ul>
-<li>  Result arguments should be the first arguments.
-<li>  If a function needs a pool, it should be the last argument.
-<li>  These rules are flexible, especially if it makes the code easier
-      to understand because it mimics a standard function.
-</ul>
-
-<h2>Documentation</h2>
-
-<p>Whenever a new function is added to APR, it MUST be documented.  New 
-functions will not be committed unless there are docs to go along with them.
-The documentation should be a comment block above the function in the header
-file.</p>
-
-<p>The format for the comment block is:</p>
-
-<pre>
-    /**
-     * Brief description of the function
-     * @param parma_1_name explanation
-     * @param parma_2_name explanation
-     * @param parma_n_name explanation
-     * @tip Any extra information people should know.
-     * @deffunc function prototype if required
-     */ 
-</pre>
-
-<p>For an actual example, look at any file in the include directory.  The 
-reason the docs are in the header files is to ensure that the docs always
-reflect the current code.  If you change paramters or return values for a 
-function, please be sure to update the documentation.</p>
-
-<h2>APR Error reporting</h2>
-
-<p>Most APR functions should return an ap_status_t type.  The only time an
-APR function does not return an ap_status_t is if it absolutely CAN NOT
-fail.  Examples of this would be filling out an array when you know you are
-not beyond the array's range.  If it cannot fail on your platform, but it
-could conceivably fail on another platform, it should return an ap_status_t.
-Unless you are sure, return an ap_status_t.</p>
-
-<strong>
-        This includes functions that return TRUE/FALSE values.  How that 
-        is handled is discussed below
-</strong>
-
-<p>All platforms return errno values unchanged.  Each platform can also have
-one system error type, which can be returned after an offset is added.  
-There are five types of error values in APR, each with it's own offset.</p>
-
-<!--  This should be turned into a table, but I am lazy today -->
-<pre>
-    Name			Purpose
-0) 			This is 0 for all platforms and isn't really defined
- 			anywhere, but it is the offset for errno values.
-			(This has no name because it isn't actually defined, 
-                        but for completeness we are discussing it here).
-
-1) APR_OS_START_ERROR	This is platform dependent, and is the offset at which
-			APR errors start to be defined.  Error values are 
-			defined as anything which caused the APR function to 
-			fail.  APR errors in this range should be named 
-			APR_E* (i.e. APR_ENOSOCKET)
-
-2) APR_OS_START_STATUS	This is platform dependent, and is the offset at which
-			APR status values start.  Status values do not indicate
-			success or failure, and should be returned if 
-			APR_SUCCESS does not make sense.  APR status codes in 
-			this range should be name APR_* (i.e. APR_DETACH)
-
-4) APR_OS_START_USEERR	This is platform dependent, and is the offset at which
-			APR apps can begin to add their own error codes.
-
-3) APR_OS_START_SYSERR	This is platform dependent, and is the offset at which
-			system error values begin.
-</pre>
-
-<strong>The difference in naming between APR_OS_START_ERROR and 
-APR_OS_START_STATUS mentioned above allows programmers to easily determine if
-the error code indicates an error condition or a status codition.</strong>
-
-<p>If your function has multiple return codes that all indicate success, but
-with different results, or if your function can only return PASS/FAIL, you 
-should still return an apr_status_t.  In the first case, define one
-APR status code for each return value, an example of this is
-<code>apr_proc_wait</code>, which can only return APR_CHILDDONE, 
-APR_CHILDNOTDONE, or an error code.  In the second case, please return 
-APR_SUCCESS for PASS, and define a new APR status code for failure, an 
-example of this is <code>apr_compare_users</code>, which can only return
-APR_SUCCESS, APR_EMISMATCH, or an error code.</p>
-
-<p>All of these definitions can be found in apr_errno.h for all platforms.  When
-an error occurs in an APR function, the function must return an error code.
-If the error occurred in a system call and that system call uses errno to
-report an error, then the code is returned unchanged.  For example: </p>
-
-<pre>
-    if (open(fname, oflags, 0777) < 0)
-        return errno;
-</pre>
-
-<p>The next place an error can occur is a system call that uses some error value
-other than the primary error value on a platform.  This can also be handled
-by APR applications.  For example:</p>
-
-<pre>
-    if (CreateFile(fname, oflags, sharemod, NULL, 
-                   createflags, attributes, 0) == INVALID_HANDLE_VALUE
-        return (GetLAstError() + APR_OS_START_SYSERR);
-</pre>
-
-<p>These two examples implement the same function for two different platforms.
-Obviously even if the underlying problem is the same on both platforms, this
-will result in two different error codes being returned.  This is OKAY, and
-is correct for APR.  APR relies on the fact that most of the time an error
-occurs, the program logs the error and continues, it does not try to
-programatically solve the problem.  This does not mean we have not provided
-support for programmatically solving the problem, it just isn't the default
-case.  We'll get to how this problem is solved in a little while.</p>
-
-<p>If the error occurs in an APR function but it is not due to a system call,
-but it is actually an APR error or just a status code from APR, then the
-appropriate code should be returned.  These codes are defined in apr_errno.h
-and should be self explanatory.</p>
-
-<p>No APR code should ever return a code between APR_OS_START_USEERR and 
-APR_OS_START_SYSERR, those codes are reserved for APR applications.</p>
-
-<p>To programmatically correct an error in a running application, the error 
-codes need to be consistent across platforms.  This should make sense.  APR
-has provided macros to test for status code equivalency.  For example, to
-determine if the code that you received from the APR function means EOF, you
-would use the macro APR_STATUS_IS_EOF().</p>
-
-<p>Why did APR take this approach?  There are two ways to deal with error 
-codes portably.</p>
-
-<ol type=1>
-<li>  Return the same error code across all platforms.
-<li>  Return platform specific error codes and convert them when necessary.  
-</ol>
-
-<p>The problem with option number one is that it takes time to convert error 
-codes to a common code, and most of the time programs want to just output 
-an error string.  If we convert all errors to a common subset, we have four 
-steps to output an error string:</p>
-
-<p>The seocnd problem with option 1, is that it is a lossy conversion.  For
-example, Windows and OS/2 have a couple hundred error codes, but POSIX errno
-only defines about 50 errno values.  This means that if we convert to a
-canonical error value immediately, there is no way for the programmer to
-get the actual system error.</p>
-
-<pre>
-    make syscall that fails
-        convert to common error code                 step 1
-        return common error code
-            check for success
-            call error output function               step 2
-                convert back to system error         step 3
-                output error string                  step 4
-</pre>
-
-<p>By keeping the errors platform specific, we can output error strings in two
-steps.</p>
-
-<pre>
-    make syscall that fails
-        return error code
-            check for success
-            call error output function               step 1
-                output error string                  step 2
-</pre>
-
-<p>Less often, programs change their execution based on what error was returned.
-This is no more expensive using option 2 than it is using option 1, but we
-put the onus of converting the error code on the programmer themselves.
-For example, using option 1:</p>
-
-<pre>
-    make syscall that fails
-        convert to common error code
-        return common error code
-            decide execution based on common error code
-</pre>
-
-<p>Using option 2:</p>
-    
-<pre>
-    make syscall that fails
-        return error code
-            convert to common error code (using ap_canonical_error)
-            decide execution based on common error code
-</pre>
-
-<p>Finally, there is one more operation on error codes.  You can get a string
-that explains in human readable form what has happened.  To do this using 
-APR, call ap_strerror().</p>
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/docs/canonical_filenames.html b/rubbos/app/httpd-2.0.64/srclib/apr/docs/canonical_filenames.html
deleted file mode 100644
index 10867d37..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/docs/canonical_filenames.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<HTML>
-<HEAD><TITLE>APR Canonical Filenames</TITLE></HEAD>
-<BODY>
-<h1>APR Canonical Filename</h1>
-
-<h2>Requirements</h2>
-
-<p>APR porters need to address the underlying discrepancies between
-file systems.  To achieve a reasonable degree of security, the
-program depending upon APR needs to know that two paths may be
-compared, and that a mismatch is guarenteed to reflect that the
-two paths do not return the same resource</p>.
-
-<p>The first discrepancy is in volume roots.  Unix and pure deriviates
-have only one root path, "/".  Win32 and OS2 share root paths of
-the form "D:/", D: is the volume designation.  However, this can
-be specified as "//./D:/" as well, indicating D: volume of the 
-'this' machine.  Win32 and OS2 also may employ a UNC root path,
-of the form "//server/share/" where share is a share-point of the
-specified network server.  Finally, NetWare root paths are of the
-form "server/volume:/", or the simpler "volume:/" syntax for 'this'
-machine.  All these non-Unix file systems accept volume:path,
-without a slash following the colon, as a path relative to the
-current working directory, which APR will treat as ambigious, that
-is, neither an absolute nor a relative path per se.</p>
-
-<p>The second discrepancy is in the meaning of the 'this' directory.
-In general, 'this' must be eliminated from the path where it occurs.
-The syntax "path/./" and "path/" are both aliases to path.  However,
-this isn't file system independent, since the double slash "//" has
-a special meaning on OS2 and Win32 at the start of the path name,
-and is invalid on those platforms before the "//server/share/" UNC
-root path is completed.  Finally, as noted above, "//./volume/" is
-legal root syntax on WinNT, and perhaps others.</p>
-
-<p>The third discrepancy is in the context of the 'parent' directory.
-When "parent/path/.." occurs, the path must be unwound to "parent".
-It's also critical to simply truncate leading "/../" paths to "/",
-since the parent of the root is root.  This gets tricky on the
-Win32 and OS2 platforms, since the ".." element is invalid before
-the "//server/share/" is complete, and the "//server/share/../"
-seqence is the complete UNC root "//server/share/".  In relative
-paths, leading ".." elements are significant, until they are merged
-with an absolute path.  The relative form must only retain the ".."
-segments as leading segments, to be resolved once merged to another
-relative or an absolute path.</p>
-
-<p>The fourth discrepancy occurs with acceptance of alternate character
-codes for the same element.  Path seperators are not retained within
-the APR canonical forms.  The OS filesystem and APR (slashed) forms
-can both be returned as strings, to be used in the proper context.
-Unix, Win32 and Netware all accept slashes and backslashes as the
-same path seperator symbol, although unix strictly accepts slashes.
-While the APR form of the name strictly uses slashes, always consider
-that there could be a platform that actually accepts slashes as a
-character within a segment name.</p>
-
-<p>The fifth and worst discrepancy plauges Win32, OS2, Netware, and some
-filesystems mounted in Unix.  Case insensitivity can permit the same
-file to slip through in both it's proper case and alternate cases.
-Simply changing the case is insufficient for any character set beyond
-ASCII, since various dilectic forms of characters suffer from one to
-many or many to one translations.  An example would be u-umlaut, which
-might be accepted as a single character u-umlaut, a two character
-sequence u and the zero-width umlaut, the upper case form of the same,
-or perhaps even a captial U alone.  This can be handled in different
-ways depending on the purposes of the APR based program, but the one
-requirement is that the path must be absolute in order to resolve these
-ambiguities.  Methods employed include comparison of device and inode
-file uniqifiers, which is a fairly fast operation, or quering the OS
-for the true form of the name, which can be much slower.  Only the
-acknowledgement of the file names by the OS can validate the equality
-of two different cases of the same filename.</p>
-
-<p>The sixth discrepancy, illegal or insignificant characters, is especially 
-significant in non-unix file systems.  Trailing periods are accepted
-but never stored, therefore trailing periods must be ignored for any
-form of comparison.  And all OS's have certain expectations of what
-characters are illegal (or undesireable due to confusion.)</p>
-
-<p>A final warning, canonical functions don't transform or resolve case
-or character ambiguity issues until they are resolved into an absolute
-path.  The relative canonical path, while useful, while useful for URL
-or similar identifiers, cannot be used for testing or comparison of file 
-system objects.</p>
-
-<hr>
-
-<h2>Canonical API</h2>
-
-Functions to manipulate the apr_canon_file_t (an opaque type) include:
-
-<ul>
-<li>Create canon_file_t (from char* path and canon_file_t parent path)
-<li>Merged canon_file_t (from path and parent, both canon_file_t)
-<li>Get char* path of all or some segments
-<li>Get path flags of IsRelative, IsVirtualRoot, and IsAbsolute
-<li>Compare two canon_file_t structures for file equality
-</ul>
-
-<p>The path is corrected to the file system case only if is in absolute 
-form.  The apr_canon_file_t should be preserved as long as possible and 
-used as the parent to create child entries to reduce the number of expensive 
-stat and case canonicalization calls to the OS.</p>
-
-<p>The comparison operation provides that the APR can postpone correction
-of case by simply relying upon the device and inode for equivilance.  The
-stat implementation provides that two files are the same, while their
-strings are not equivilant, and eliminates the need for the operating
-system to return the proper form of the name.</p>
-
-<p>In any case, returning the char* path, with a flag to request the proper
-case, forces the OS calls to resolve the true names of each segment.  Where
-there is a penality for this operation and the stat device and inode test
-is faster, case correction is postponed until the char* result is requested.
-On platforms that identify the inode, device, or proper name interchangably
-with no penalities, this may occur when the name is initially processed.</p>
-
-<hr>
-
-<h2>Unix Example</h2>
-
-<p>First the simplest case:</p>
-
-<pre>
-Parse Canonical Name 
-accepts parent path as canonical_t
-        this path as string
-
-Split this path Segments on '/'
-
-For each of this path Segments
-  If first Segment
-    If this Segment is Empty ([nothing]/)
-      Append this Root Segment (don't merge)
-      Continue to next Segment
-    Else is relative
-      Append parent Segments (to merge)
-      Continue with this Segment
-  If Segment is '.' or empty (2 slashes)
-    Discard this Segment
-    Continue with next Segment
-  If Segment is '..'
-    If no previous Segment or previous Segment is '..'
-      Append this Segment
-      Continue with next Segment
-    If previous Segment and previous is not Root Segment
-      Discard previous Segment
-    Discard this Segment
-    Continue with next Segment
-  Append this Relative Segment
-  Continue with next Segment        
-</pre>
-
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/docs/doxygen.conf b/rubbos/app/httpd-2.0.64/srclib/apr/docs/doxygen.conf
deleted file mode 100644
index 2efb5547..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/docs/doxygen.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-PROJECT_NAME="Apache Portable Runtime"
-
-INPUT=.
-QUIET=YES
-RECURSIVE=YES
-FILE_PATTERNS=*.h
-
-OUTPUT_DIRECTORY=docs/dox
-
-MACRO_EXPANSION=YES
-EXPAND_ONLY_PREDEF=YES
-#EXPAND_AS_DEFINED=
-# not sure why this doesn't work as EXPAND_AS_DEFINED, it should!
-PREDEFINED="APR_DECLARE(x)=x" \
-           "APR_DECLARE_NONSTD(x)=x" \
-           "APR_DECLARE_DATA" \
-           "APR_POOL_DECLARE_ACCESSOR(x)=apr_pool_t* apr_##x##_pool_get (const apr_##x##_t *the##x)" \
-           "APR_DECLARE_INHERIT_SET(x)=apr_status_t apr_##x##_inherit_set(apr_##x##_t *the##x)" \
-           "APR_DECLARE_INHERIT_UNSET(x)=apr_status_t apr_##x##_inherit_unset(apr_##x##_t *the##x)" \
-           "APR_HAS_THREADS" \
-           "__attribute__(x)=" \
-           DOXYGEN=
-
-OPTIMIZE_OUTPUT_FOR_C=YES
-
-FULL_PATH_NAMES=NO
-# some autoconf guru needs to make configure set this correctly...
-# in the meantime, simply listing the headers should be alright
-STRIP_FROM_PATH=/buildpath/apr
-
-EXCLUDE_PATTERNS="*/acconfig.h" \
-                 "*/test/*" \
-                 "*/arch/*"
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/docs/incomplete_types b/rubbos/app/httpd-2.0.64/srclib/apr/docs/incomplete_types
deleted file mode 100644
index cbed7774..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/docs/incomplete_types
+++ /dev/null
@@ -1,84 +0,0 @@
-The question has been asked multiple times, "Why is APR using Incomplete
-types?"  This document will try to explain that.
-
-Incomplete types are used in APR because they can enforce portability, and
-they make the APR developers job easier, as well as allowing APR to use native
-types on all platforms.  Imagine a scenario where APR wasn't using incomplete
-types.  The ap_file_t type would have to be defined as:
-
-typedef struct ap_file_t {
-    ap_pool_t *pool
-    char *fname;
-    int eof_hit;
-    int pipe;
-    ap_interval_time_t timeout;
-#ifdef WIN32
-    HANDLE file_handle;
-    DWORD dwFileAttributes;
-#elif defined(OS2)
-    HFILE filedes;
-    HEV PipeSem
-#else
-    int filedes;
-    int ungetchar;
-#endif
-
-#ifndef WIN32
-    int buffered;
-    ap_int32_flags
-    int isopen;
-   
-    /* Stuff for buffered mode */
-    char *buffer;
-    int bufpos;
-    unsigned long dataRead;
-    int direction;
-    unsigned long filePtr;
-    ap_lock_t *mutex; 
-#endif
-} ap_file_t;
-
-This captures the essense of what is currently being defined for ap_file_t
-using incomplete types.  However, using this structure leads developers to
-believe that they are safe accessing any of the fields in this structure.
-This is not true.  On some platforms, such as Windows, about half of the
-structure disappears.  We could combine some of these definitions with
-macros, for example:
-
-#ifdef WIN32
-#define filetype HANDLE
-#elif OS2
-#define filetype HFILE
-#else
-#define filetype int
-#endif
-
-And then in the defintion for ap_file_t, we could say:
-    filetype filedes;
-
-This gets rid of some of the complexity, by moving it off to the side, but
-it is still not safe for a programmers to access the filedes field directly 
-outside of APR, because the programmer has no way of knowing what the actual 
-type is.  So for example printing the filedes using printf would yield wildly 
-varying results on Windows and OS2 when compared to Unix.
-
-Another option also presents itself.  Stick strictly to POSIX.  This means
-that all code can be shared on any POSIX compliant platform.  The problem
-with this is performance.  One of the benefits to APR, is that it allows
-developers to easily use native types on all platforms with the same code.
-This has proven to provide a substantial performance boost on most non-Unix
-platforms.
-
-Having said all of that, sometimes incomplete types just don't make sense.
-For example, the first implementation of time functions used incomplete types,
-which added a layer of complexity that turned out to be unnecessary.  If
-a platform cannot provide a simple number that represents the number of seconds
-elapsed since a specifed date and time, then APR doesn't really want to 
-provide support for that platform.
-
-APR is trying hard to provide a balance of incomplete and complete types, 
-but like all things, sometimes the developers make mistakes.  If you are
-using APR and find that there is an incomplete type that doesn't need to be
-an incomplete type, please let us know, we are more than willing to listen
-and design parts of APR that do not use incomplete types.
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/docs/non_apr_programs b/rubbos/app/httpd-2.0.64/srclib/apr/docs/non_apr_programs
deleted file mode 100644
index 5003a8bd..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/docs/non_apr_programs
+++ /dev/null
@@ -1,47 +0,0 @@
-How do I use APR'ized programs in connection with programs that don't
-use APR?  These darn incomplete types don't let me fill out the APR types.
-
-The APR developers acknowledge that most programs are not using APR, and
-we don't expect them to migrate to using APR just because APR has been
-released.  So, we have provided a way for non-APR'ized programs to interact
-very cleanly with APR.
-
-There are a set of functions, all documented in apr_portable.h, which allow
-a programmer to either get a native type from an APR type, or to setup an
-APR type from a native type.
-
-For example, if you are writing an add-on to another program that does not use
-APR for file I/O, but you (in your infinite wisdom) want to use APR to make
-sure your section is portable.  Assume the program provides a type foo_t with
-a file descriptor in it (fd).
-
-void function_using_apr(foo_t non_apr_struct, ap_pool_t *p)
-{
-    ap_file_t *apr_file = NULL;
-
-    ap_put_os_file(&apr_file, &non_apr_struct->fd, p);
-
-    ...
-}
-
-There are portable functions for each APR incomplete type.  They are all 
-called ap_put_os_foobar(), and they each take the same basic arguments, a
-pointer to a pointer to the incomplete type (the last pointer in that list 
-should be NULL), a pointer to the native type, and a pool.  Each of these can
-be found in apr_portable.h.
-
-If you have to do the exact opposite (take an APR type and convert it to a 
-native type, there are functions for that too.  For example:
-
-void function_not_using_apr(apr_file_t *apr_file)
-{
-    int unix_file_desc;
-
-    ap_get_os_file(&unix_file_desc, apr_file);
-   
-    ...
-}
-
-For each ap_put_os_foobar, there is a corresponding ap_get_os_file.  These are
-also documented in apr_portable.h.
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/docs/pool-design.html b/rubbos/app/httpd-2.0.64/srclib/apr/docs/pool-design.html
deleted file mode 100644
index d862ff9c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/docs/pool-design.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head>
-    <title>Using APR Pools</title>
-  </head>
-  <body>
-    <div align="right">
-      Last modified at [$Date: 2004-11-24 23:02:04 +0000 (Wed, 24 Nov 2004) $]
-    </div>
-
-    <h1>Using APR Pools</h1>
-
-    <p>
-      From <a href="http://subversion.tigris.org/">Subversion</a>, we
-      have learned a <em>lot</em> about how to use pools in a heavily
-      structured/object-based environment.
-      <a href="http://httpd.apache.org/">Apache httpd</a> is a
-      completely different beast: "allocate a request pool. use
-      it. destroy it."
-    </p>
-
-    <p>
-      In a complex app, that request-style of behavior is not
-      present. Luckily, the "proper" use of pools can be described in
-      just a few rules:
-    </p>
-
-    <ul>
-      <li>
-        Objects should not have their own pools. An object is
-        allocated into a pool defined by the constructor's caller. The
-        <strong>caller</strong> knows the lifetime of the object and
-        will manage it via the pool. Generally, this also means that
-        objects will not have a "close" or a "free" since those
-        operations will happen implicitly as part of the destruction
-        of the pool the objects live within.
-      </li>
-
-      <li>
-        <p>
-          Functions should not create/destroy pools for their
-          operation; they should use a pool provided by the
-          caller. Again, the <strong>caller</strong> knows more about
-          how the function will be used, how often, how many times,
-          etc. Thus, it should be in charge of the function's memory
-          usage.
-        </p>
-        <p>
-          As an example, the caller might know that the app will exit
-          upon the function's return. Thus, the function would be
-          creating extra work if it built and destroyed a
-          pool. Instead, it should use the passed-in pool, which the
-          caller is going to be tossing as part of app-exit anyways.
-        </p>
-      </li>
-
-      <li>
-        <p>
-          Whenever an unbounded iteration occurs, a subpool should be
-          used. The general pattern is:
-        </p>
-        <blockquote>
-          <pre>
-subpool = apr_create_subpool(pool);
-for (i = 0; i < n; ++i) {
-  apr_pool_clear(subpool);
-
-  do_operation(..., subpool);
-}
-apr_pool_destroy(subpool);</pre>
-        </blockquote>
-        <p>
-          This pattern prevents the 'pool' from growing unbounded and
-          consuming all of memory. Note that it is slightly more
-          optimal to clear the pool on loop-entry. This pattern also
-          allows for a '<tt>continue</tt>' to occur within the loop,
-          yet still ensure the pool will be cleared.
-        </p>
-      </li>
-
-      <li>
-        Given all of the above, it is pretty well mandatory to pass a
-        pool to <em>every</em> function. Since objects are not
-        recording pools for themselves, and the caller is always
-        supposed to be managing memory, then each function needs a
-        pool, rather than relying on some hidden magic pool. In
-        limited cases, objects may record the pool used for their
-        construction so that they can construct sub-parts, but these
-        cases should be examined carefully. Internal pools can lead to
-        unbounded pool usage if the object is not careful.
-      </li>
-    </ul>
-
-    <hr>
-    <address>Greg Stein</address>
-    <!-- Created: Wed Jun 25 14:39:57 PDT 2003 -->
-    <!-- hhmts start -->
-Last modified: Wed Jun 25 14:50:19 PDT 2003
-<!-- hhmts end -->
-
-</body></html>
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/docs/win32_builds.html b/rubbos/app/httpd-2.0.64/srclib/apr/docs/win32_builds.html
deleted file mode 100644
index ad57d8e1..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/docs/win32_builds.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<HTML>
-<HEAD><TITLE>APR Win32 Builds and Debugging</TITLE></HEAD>
-<BODY>
-<h1>APR Win32 Builds and Debugging</h1>
-
-<h2>Configuration and Flavors</h2>
-
-<p>The Win32 APR Developer Studio projects consist of</p>
-
-<dl>
-  <dt>apr/apr.dsp</dt>
-    <dd>Builds the static apr.lib library (-D APR_DECLARE_STATIC)</dd>
-  <dt>apr/libapr.dsp</dt>
-    <dd>Builds the dynamic libapr.dll library (no define required)</dd>
-  <dt>apr-util/aprutil.dsp</dt>
-    <dd>Builds the static aprutil.lib library (-D APU_DECLARE_STATIC)</dd>
-  <dt>apr-util/libaprutil.dsp</dt>
-    <dd>Builds the dynamic libaprutil.dll library (no define required)</dd>
-  <dt>apr-iconv/apriconv.dsp</dt>
-    <dd>Builds the static apriconv.lib library (-D API_DECLARE_STATIC)</dd>
-  <dt>apr-iconv/libapriconv.dsp</dt>
-    <dd>Builds the dynamic libapriconv.dll library (no define required)</dd>
-</dl>
-
-<p>In order to prepare to use one of the <em>static</em> libraries above, 
-   your application must be compiled with the define shown above, so that the
-   correct linkage is created.  The APR authors intended the use of dynamic
-   libraries by default, so application authors do not need any special
-   defines in order to link to the dynamic library flavors.</p>
-
-<p>In order to build APR, you must use the proper dependencies.  A good
-   example of those dependencies is given in the apr-util/aprutil.dsw
-   Developer Studio workspace.  You can borrow the parts of that structure
-   your application needs, that workspace defines both the dynamic and static
-   library dependencies.</p>
-
-<p>The APR libraries (dynamic and static) are compiled with debugging symbols,
-   even in Release builds.  The dynamic library symbols are always usable,
-   simply keep the correspond .pdb file in the same path as the library .dll.
-   (E.g. both libapr.dll and libapr.pdb should be copied to the same path.)</p>
-
-<p>The static symbols will only be fully usable if your application does <em>not<em>
-   link with the /pdbtype:sept flag!  At the time your application links to
-   an APR library, the corresponding _src.pdb file should exist in the original
-   path the library was built, or it may be sufficient to keep the _src.pdb file
-   in the same path as the library file.  (E.g. apr.lib and apr_src.pdb should
-   reside together in your lib directory.)  The later option is unconfirmed.</p>
-
-<p>In order to keep the symbols compiled into the static library, your application
-   must use the linker's /debug flag.  If you do not want the application to be
-   debuggable with its corresponding .pdb file, omit the /debug flag and all debug
-   symbolic information is discarded.  Note that your application can only be
-   debugged with the corresponding .pdb file created by the linker, unless you use
-   /debugtype:coff or /debugtype:both in your link options.</p>
-
-</BODY>
-</HTML>
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/dso/aix/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/dso/aix/Makefile.in
deleted file mode 100644
index 7d42bded..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/dso/aix/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = dso.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/@OSDIR@
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/dso/aix/dso.c b/rubbos/app/httpd-2.0.64/srclib/apr/dso/aix/dso.c
deleted file mode 100644
index 25f6262a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/dso/aix/dso.c
+++ /dev/null
@@ -1,714 +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.
- */
-
-/*
- *  dso.c -- DSO system function emulation for AIX
- *
- *  This is *only* intended for AIX < 4.3.
- */
-
-/*
- *  Based on libdl (dlfcn.c/dlfcn.h) which is
- *  Copyright (c) 1992,1993,1995,1996,1997,1988
- *  Jens-Uwe Mager, Helios Software GmbH, Hannover, Germany.
- *
- *  Not derived from licensed software.
- *
- *  Permission is granted to freely use, copy, modify, and redistribute
- *  this software, provided that the author is not construed to be liable
- *  for any results of using the software, alterations are clearly marked
- *  as such, and this notice is not modified.
- *
- *  Changes marked with `--jwe' were made on April 7 1996 by
- *  John W. Eaton <jwe@bevo.che.wisc.edu> to support g++ 
- *
- *  Bundled, stripped and adjusted on April 1998 as one single source file 
- *  for inclusion into the Apache HTTP server by 
- *  Ralf S. Engelschall <rse@apache.org>
- *
- *  Added to APR by David Reid April 2000
- */
-
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/ldr.h>
-#include <a.out.h>
-#include "apr_arch_dso.h"
-#include "apr_portable.h"
-
-#if APR_HAS_DSO
-
-#undef FREAD
-#undef FWRITE
-#include <ldfcn.h>
-
-/*
- * AIX 4.3 does remove some useful definitions from ldfcn.h. Define
- * these here to compensate for that lossage.
- */
-#ifndef BEGINNING
-#define BEGINNING SEEK_SET
-#endif
-#ifndef FSEEK
-#define FSEEK(ldptr,o,p)   fseek(IOPTR(ldptr),(p==BEGINNING)?(OFFSET(ldptr) +o):o,p)
-#endif
-#ifndef FREAD
-#define FREAD(p,s,n,ldptr) fread(p,s,n,IOPTR(ldptr))
-#endif
-
-/*
- * Mode flags for the dlopen routine.
- */
-#undef  RTLD_LAZY
-#define RTLD_LAZY	1	/* lazy function call binding */
-#undef  RTLD_NOW
-#define RTLD_NOW	2	/* immediate function call binding */
-#undef  RTLD_GLOBAL
-#define RTLD_GLOBAL	0x100	/* allow symbols to be global */
-
-/*
- * To be able to initialize, a library may provide a dl_info structure
- * that contains functions to be called to initialize and terminate.
- */
-struct dl_info {
-    void (*init) (void);
-    void (*fini) (void);
-};
-
-/* APR functions...
- *
- * As the AIX functions have been declared in the header file we just
- * add the basic "wrappers" here.
- */
-
-APR_DECLARE(apr_status_t) apr_os_dso_handle_put(apr_dso_handle_t **aprdso,
-                                                apr_os_dso_handle_t osdso,
-                                                apr_pool_t *pool)
-{
-    *aprdso = apr_pcalloc(pool, sizeof **aprdso);
-    (*aprdso)->handle = osdso;
-    (*aprdso)->pool = pool;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_dso_handle_get(apr_os_dso_handle_t *osdso,
-                                                apr_dso_handle_t *aprdso)
-{
-    *osdso = aprdso->handle;
-    return APR_SUCCESS;
-}
-
-static apr_status_t dso_cleanup(void *thedso)
-{
-    apr_dso_handle_t *dso = thedso;
-
-    if (dso->handle != NULL && dlclose(dso->handle) != 0)
-        return APR_EINIT;
-    dso->handle = NULL;
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, 
-                                       const char *path, apr_pool_t *ctx)
-{
-    void *os_handle = dlopen((char *)path, RTLD_NOW | RTLD_GLOBAL);
-
-    *res_handle = apr_pcalloc(ctx, sizeof(*res_handle));
-
-    if(os_handle == NULL) {
-        (*res_handle)->errormsg = dlerror();       
-        return APR_EDSOOPEN;
-    }
-
-    (*res_handle)->handle = (void*)os_handle;
-    (*res_handle)->pool = ctx;
-    (*res_handle)->errormsg = NULL;
-
-    apr_pool_cleanup_register(ctx, *res_handle, dso_cleanup, apr_pool_cleanup_null);
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle)
-{
-    return apr_pool_cleanup_run(handle->pool, handle, dso_cleanup);
-}
-
-APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, 
-                                      apr_dso_handle_t *handle, 
-                                      const char *symname)
-{
-    void *retval = dlsym(handle->handle, symname);
-
-    if (retval == NULL) {
-        handle->errormsg = dlerror();
-        return APR_ESYMNOTFOUND;
-    }
-
-    *ressym = retval;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *dso, char *buffer, apr_size_t buflen)
-{
-    if (dso->errormsg) {
-        apr_cpystrn(buffer, dso->errormsg, buflen);
-        return dso->errormsg;
-    }
-    return "No Error";
-}
-
-
-
-/*
- * We simulate dlopen() et al. through a call to load. Because AIX has
- * no call to find an exported symbol we read the loader section of the
- * loaded module and build a list of exported symbols and their virtual
- * address.
- */
-
-typedef struct {
-    char *name;			/* the symbols's name */
-    void *addr;			/* its relocated virtual address */
-} Export, *ExportPtr;
-
-/*
- * xlC uses the following structure to list its constructors and
- * destructors. This is gleaned from the output of munch.
- */
-typedef struct {
-    void (*init) (void);	/* call static constructors */
-    void (*term) (void);	/* call static destructors */
-} Cdtor, *CdtorPtr;
-
-typedef void (*GccCDtorPtr) (void);
-
-/*
- * The void * handle returned from dlopen is actually a ModulePtr.
- */
-typedef struct Module {
-    struct Module *next;
-    char *name;			/* module name for refcounting */
-    int refCnt;			/* the number of references */
-    void *entry;		/* entry point from load */
-    struct dl_info *info;	/* optional init/terminate functions */
-    CdtorPtr cdtors;		/* optional C++ constructors */
-    GccCDtorPtr gcc_ctor;	/* g++ constructors  --jwe */
-    GccCDtorPtr gcc_dtor;	/* g++ destructors  --jwe */
-    int nExports;		/* the number of exports found */
-    ExportPtr exports;		/* the array of exports */
-} Module, *ModulePtr;
-
-/*
- * We keep a list of all loaded modules to be able to call the fini
- * handlers and destructors at atexit() time.
- */
-static ModulePtr modList;
-
-/*
- * The last error from one of the dl* routines is kept in static
- * variables here. Each error is returned only once to the caller.
- */
-static char errbuf[BUFSIZ];
-static int errvalid;
-
-/*
- * The `fixed' gcc header files on AIX 3.2.5 provide a prototype for
- * strdup().  --jwe
- */
-extern char *strdup(const char *);
-static void caterr(char *);
-static int readExports(ModulePtr);
-static void terminate(void);
-static void *findMain(void);
-
-void *dlopen(const char *path, int mode)
-{
-    register ModulePtr mp;
-    static void *mainModule;
-
-    /*
-     * Upon the first call register a terminate handler that will
-     * close all libraries. Also get a reference to the main module
-     * for use with loadbind.
-     */
-    if (!mainModule) {
-	if ((mainModule = findMain()) == NULL)
-	    return NULL;
-	atexit(terminate);
-    }
-    /*
-     * Scan the list of modules if we have the module already loaded.
-     */
-    for (mp = modList; mp; mp = mp->next)
-	if (strcmp(mp->name, path) == 0) {
-	    mp->refCnt++;
-	    return mp;
-	}
-    if ((mp = (ModulePtr) calloc(1, sizeof(*mp))) == NULL) {
-	errvalid++;
-	strcpy(errbuf, "calloc: ");
-	strcat(errbuf, strerror(errno));
-	return NULL;
-    }
-    if ((mp->name = strdup(path)) == NULL) {
-	errvalid++;
-	strcpy(errbuf, "strdup: ");
-	strcat(errbuf, strerror(errno));
-	free(mp);
-	return NULL;
-    }
-    /*
-     * load should be declared load(const char *...). Thus we
-     * cast the path to a normal char *. Ugly.
-     */
-    if ((mp->entry = (void *) loadAndInit((char *) path, L_NOAUTODEFER, NULL)) == NULL) {
-	free(mp->name);
-	free(mp);
-	errvalid++;
-	strcpy(errbuf, "dlopen: ");
-	strcat(errbuf, path);
-	strcat(errbuf, ": ");
-	/*
-	 * If AIX says the file is not executable, the error
-	 * can be further described by querying the loader about
-	 * the last error.
-	 */
-	if (errno == ENOEXEC) {
-	    char *tmp[BUFSIZ / sizeof(char *)];
-	    if (loadquery(L_GETMESSAGES, tmp, sizeof(tmp)) == -1)
-		strcpy(errbuf, strerror(errno));
-	    else {
-		char **p;
-		for (p = tmp; *p; p++)
-		    caterr(*p);
-	    }
-	}
-	else
-	    strcat(errbuf, strerror(errno));
-	return NULL;
-    }
-    mp->refCnt = 1;
-    mp->next = modList;
-    modList = mp;
-    if (loadbind(0, mainModule, mp->entry) == -1) {
-	dlclose(mp);
-	errvalid++;
-	strcpy(errbuf, "loadbind: ");
-	strcat(errbuf, strerror(errno));
-	return NULL;
-    }
-    /*
-     * If the user wants global binding, loadbind against all other
-     * loaded modules.
-     */
-    if (mode & RTLD_GLOBAL) {
-	register ModulePtr mp1;
-	for (mp1 = mp->next; mp1; mp1 = mp1->next)
-	    if (loadbind(0, mp1->entry, mp->entry) == -1) {
-		dlclose(mp);
-		errvalid++;
-		strcpy(errbuf, "loadbind: ");
-		strcat(errbuf, strerror(errno));
-		return NULL;
-	    }
-    }
-    if (readExports(mp) == -1) {
-	dlclose(mp);
-	return NULL;
-    }
-    /*
-     * If there is a dl_info structure, call the init function.
-     */
-    if (mp->info = (struct dl_info *) dlsym(mp, "dl_info")) {
-	if (mp->info->init)
-	    (*mp->info->init) ();
-    }
-    else
-	errvalid = 0;
-    /*
-     * If the shared object was compiled using xlC we will need
-     * to call static constructors (and later on dlclose destructors).
-     */
-    if (mp->cdtors = (CdtorPtr) dlsym(mp, "__cdtors")) {
-	CdtorPtr cp = mp->cdtors;
-	while (cp->init || cp->term) {
-	    if (cp->init && cp->init != (void (*)(void)) 0xffffffff)
-		(*cp->init) ();
-	    cp++;
-	}
-	/*
-	 * If the shared object was compiled using g++, we will need
-	 * to call global constructors using the _GLOBAL__DI function,
-	 * and later, global destructors using the _GLOBAL_DD
-	 * funciton.  --jwe
-	 */
-    }
-    else if (mp->gcc_ctor = (GccCDtorPtr) dlsym(mp, "_GLOBAL__DI")) {
-	(*mp->gcc_ctor) ();
-	mp->gcc_dtor = (GccCDtorPtr) dlsym(mp, "_GLOBAL__DD");
-    }
-    else
-	errvalid = 0;
-    return mp;
-}
-
-/*
- * Attempt to decipher an AIX loader error message and append it
- * to our static error message buffer.
- */
-static void caterr(char *s)
-{
-    register char *p = s;
-
-    while (*p >= '0' && *p <= '9')
-	p++;
-    switch (atoi(s)) {
-    case L_ERROR_TOOMANY:
-	strcat(errbuf, "to many errors");
-	break;
-    case L_ERROR_NOLIB:
-	strcat(errbuf, "can't load library");
-	strcat(errbuf, p);
-	break;
-    case L_ERROR_UNDEF:
-	strcat(errbuf, "can't find symbol");
-	strcat(errbuf, p);
-	break;
-    case L_ERROR_RLDBAD:
-	strcat(errbuf, "bad RLD");
-	strcat(errbuf, p);
-	break;
-    case L_ERROR_FORMAT:
-	strcat(errbuf, "bad exec format in");
-	strcat(errbuf, p);
-	break;
-    case L_ERROR_ERRNO:
-	strcat(errbuf, strerror(atoi(++p)));
-	break;
-    default:
-	strcat(errbuf, s);
-	break;
-    }
-}
-
-void *dlsym(void *handle, const char *symbol)
-{
-    register ModulePtr mp = (ModulePtr) handle;
-    register ExportPtr ep;
-    register int i;
-
-    /*
-     * Could speed up the search, but I assume that one assigns
-     * the result to function pointers anyways.
-     */
-    for (ep = mp->exports, i = mp->nExports; i; i--, ep++)
-	if (strcmp(ep->name, symbol) == 0)
-	    return ep->addr;
-    errvalid++;
-    strcpy(errbuf, "dlsym: undefined symbol ");
-    strcat(errbuf, symbol);
-    return NULL;
-}
-
-const char *dlerror(void)
-{
-    if (errvalid) {
-	errvalid = 0;
-	return errbuf;
-    }
-    return NULL;
-}
-
-int dlclose(void *handle)
-{
-    register ModulePtr mp = (ModulePtr) handle;
-    int result;
-    register ModulePtr mp1;
-
-    if (--mp->refCnt > 0)
-	return 0;
-    if (mp->info && mp->info->fini)
-	(*mp->info->fini) ();
-    if (mp->cdtors) {
-	CdtorPtr cp = mp->cdtors;
-	while (cp->init || cp->term) {
-	    if (cp->term && cp->init != (void (*)(void)) 0xffffffff)
-		(*cp->term) ();
-	    cp++;
-	}
-	/*
-	 * If the function to handle global destructors for g++
-	 * exists, call it.  --jwe
-	 */
-    }
-    else if (mp->gcc_dtor) {
-	(*mp->gcc_dtor) ();
-    }
-    result = unload(mp->entry);
-    if (result == -1) {
-	errvalid++;
-	strcpy(errbuf, strerror(errno));
-    }
-    if (mp->exports) {
-	register ExportPtr ep;
-	register int i;
-	for (ep = mp->exports, i = mp->nExports; i; i--, ep++)
-	    if (ep->name)
-		free(ep->name);
-	free(mp->exports);
-    }
-    if (mp == modList)
-	modList = mp->next;
-    else {
-	for (mp1 = modList; mp1; mp1 = mp1->next)
-	    if (mp1->next == mp) {
-		mp1->next = mp->next;
-		break;
-	    }
-    }
-    free(mp->name);
-    free(mp);
-    return result;
-}
-
-static void terminate(void)
-{
-    while (modList)
-	dlclose(modList);
-}
-
-/*
- * Build the export table from the XCOFF .loader section.
- */
-static int readExports(ModulePtr mp)
-{
-    LDFILE *ldp = NULL;
-    SCNHDR sh, shdata;
-    LDHDR *lhp;
-    char *ldbuf;
-    LDSYM *ls;
-    int i;
-    ExportPtr ep;
-    struct ld_info *lp;
-    char *buf;
-    int size = 4 * 1024;
-    void *dataorg;
-
-    /*
-     * The module might be loaded due to the LIBPATH
-     * environment variable. Search for the loaded
-     * module using L_GETINFO.
-     */
-    if ((buf = malloc(size)) == NULL) {
-	errvalid++;
-	strcpy(errbuf, "readExports: ");
-	strcat(errbuf, strerror(errno));
-	return -1;
-    }
-    while ((i = loadquery(L_GETINFO, buf, size)) == -1 && errno == ENOMEM) {
-	free(buf);
-	size += 4 * 1024;
-	if ((buf = malloc(size)) == NULL) {
-	    errvalid++;
-	    strcpy(errbuf, "readExports: ");
-	    strcat(errbuf, strerror(errno));
-	    return -1;
-	}
-    }
-    if (i == -1) {
-	errvalid++;
-	strcpy(errbuf, "readExports: ");
-	strcat(errbuf, strerror(errno));
-	free(buf);
-	return -1;
-    }
-    /*
-     * Traverse the list of loaded modules. The entry point
-     * returned by load() does actually point to the TOC
-     * entry contained in the data segment.
-     */
-    lp = (struct ld_info *) buf;
-    while (lp) {
-	if ((unsigned long) mp->entry >= (unsigned long) lp->ldinfo_dataorg &&
-	    (unsigned long) mp->entry < (unsigned long) lp->ldinfo_dataorg +
-	    lp->ldinfo_datasize) {
-	    dataorg = lp->ldinfo_dataorg;
-	    ldp = ldopen(lp->ldinfo_filename, ldp);
-	    break;
-	}
-	if (lp->ldinfo_next == 0)
-	    lp = NULL;
-	else
-	    lp = (struct ld_info *) ((char *) lp + lp->ldinfo_next);
-    }
-    free(buf);
-    if (!ldp) {
-	errvalid++;
-	strcpy(errbuf, "readExports: ");
-	strcat(errbuf, strerror(errno));
-	return -1;
-    }
-    if (TYPE(ldp) != U802TOCMAGIC) {
-	errvalid++;
-	strcpy(errbuf, "readExports: bad magic");
-	while (ldclose(ldp) == FAILURE);
-	return -1;
-    }
-    /*
-     * Get the padding for the data section. This is needed for
-     * AIX 4.1 compilers. This is used when building the final
-     * function pointer to the exported symbol.
-     */
-    if (ldnshread(ldp, _DATA, &shdata) != SUCCESS) {
-	errvalid++;
-	strcpy(errbuf, "readExports: cannot read data section header");
-	while (ldclose(ldp) == FAILURE);
-	return -1;
-    }
-    if (ldnshread(ldp, _LOADER, &sh) != SUCCESS) {
-	errvalid++;
-	strcpy(errbuf, "readExports: cannot read loader section header");
-	while (ldclose(ldp) == FAILURE);
-	return -1;
-    }
-    /*
-     * We read the complete loader section in one chunk, this makes
-     * finding long symbol names residing in the string table easier.
-     */
-    if ((ldbuf = (char *) malloc(sh.s_size)) == NULL) {
-	errvalid++;
-	strcpy(errbuf, "readExports: ");
-	strcat(errbuf, strerror(errno));
-	while (ldclose(ldp) == FAILURE);
-	return -1;
-    }
-    if (FSEEK(ldp, sh.s_scnptr, BEGINNING) != OKFSEEK) {
-	errvalid++;
-	strcpy(errbuf, "readExports: cannot seek to loader section");
-	free(ldbuf);
-	while (ldclose(ldp) == FAILURE);
-	return -1;
-    }
-    if (FREAD(ldbuf, sh.s_size, 1, ldp) != 1) {
-	errvalid++;
-	strcpy(errbuf, "readExports: cannot read loader section");
-	free(ldbuf);
-	while (ldclose(ldp) == FAILURE);
-	return -1;
-    }
-    lhp = (LDHDR *) ldbuf;
-    ls = (LDSYM *) (ldbuf + LDHDRSZ);
-    /*
-     * Count the number of exports to include in our export table.
-     */
-    for (i = lhp->l_nsyms; i; i--, ls++) {
-	if (!LDR_EXPORT(*ls))
-	    continue;
-	mp->nExports++;
-    }
-    if ((mp->exports = (ExportPtr) calloc(mp->nExports, sizeof(*mp->exports))) == NULL) {
-	errvalid++;
-	strcpy(errbuf, "readExports: ");
-	strcat(errbuf, strerror(errno));
-	free(ldbuf);
-	while (ldclose(ldp) == FAILURE);
-	return -1;
-    }
-    /*
-     * Fill in the export table. All entries are relative to
-     * the beginning of the data origin.
-     */
-    ep = mp->exports;
-    ls = (LDSYM *) (ldbuf + LDHDRSZ);
-    for (i = lhp->l_nsyms; i; i--, ls++) {
-	char *symname;
-	char tmpsym[SYMNMLEN + 1];
-	if (!LDR_EXPORT(*ls))
-	    continue;
-	if (ls->l_zeroes == 0)
-	    symname = ls->l_offset + lhp->l_stoff + ldbuf;
-	else {
-	    /*
-	     * The l_name member is not zero terminated, we
-	     * must copy the first SYMNMLEN chars and make
-	     * sure we have a zero byte at the end.
-	     */
-	    strncpy(tmpsym, ls->l_name, SYMNMLEN);
-	    tmpsym[SYMNMLEN] = '\0';
-	    symname = tmpsym;
-	}
-	ep->name = strdup(symname);
-	ep->addr = (void *) ((unsigned long) dataorg +
-			     ls->l_value - shdata.s_vaddr);
-	ep++;
-    }
-    free(ldbuf);
-    while (ldclose(ldp) == FAILURE);
-    return 0;
-}
-
-/*
- * Find the main modules data origin. This is used as export pointer
- * for loadbind() to be able to resolve references to the main part.
- */
-static void *findMain(void)
-{
-    struct ld_info *lp;
-    char *buf;
-    int size = 4 * 1024;
-    int i;
-    void *ret;
-
-    if ((buf = malloc(size)) == NULL) {
-	errvalid++;
-	strcpy(errbuf, "findMain: ");
-	strcat(errbuf, strerror(errno));
-	return NULL;
-    }
-    while ((i = loadquery(L_GETINFO, buf, size)) == -1 && errno == ENOMEM) {
-	free(buf);
-	size += 4 * 1024;
-	if ((buf = malloc(size)) == NULL) {
-	    errvalid++;
-	    strcpy(errbuf, "findMain: ");
-	    strcat(errbuf, strerror(errno));
-	    return NULL;
-	}
-    }
-    if (i == -1) {
-	errvalid++;
-	strcpy(errbuf, "findMain: ");
-	strcat(errbuf, strerror(errno));
-	free(buf);
-	return NULL;
-    }
-    /*
-     * The first entry is the main module. The data segment
-     * starts with the TOC entries for all exports, so the
-     * data segment origin works as argument for loadbind.
-     */
-    lp = (struct ld_info *) buf;
-    ret = lp->ldinfo_dataorg;
-    free(buf);
-    return ret;
-}
-
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/dso/beos/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/dso/beos/Makefile.in
deleted file mode 100644
index 02326f80..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/dso/beos/Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = dso.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/dso/beos/dso.c b/rubbos/app/httpd-2.0.64/srclib/apr/dso/beos/dso.c
deleted file mode 100644
index 832d860e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/dso/beos/dso.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "beos/apr_arch_dso.h"
-#include "apr_portable.h"
-
-#if APR_HAS_DSO
-
-static apr_status_t dso_cleanup(void *thedso)
-{
-    apr_dso_handle_t *dso = thedso;
-
-    if (dso->handle > 0 && unload_add_on(dso->handle) < B_NO_ERROR)
-        return APR_EINIT;
-    dso->handle = -1;
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, 
-                                       const char *path, apr_pool_t *pool)
-{
-    image_id newid;
-
-    if((newid = load_add_on(path)) < B_NO_ERROR)
-        return APR_EDSOOPEN;
-
-    *res_handle = apr_pcalloc(pool, sizeof(*res_handle));
-    (*res_handle)->handle = newid;
-    (*res_handle)->pool = pool;
-
-    apr_pool_cleanup_register(pool, *res_handle, dso_cleanup, apr_pool_cleanup_null);
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle)
-{
-    return apr_pool_cleanup_run(handle->pool, handle, dso_cleanup);
-}
-
-APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, apr_dso_handle_t *handle,
-               const char *symname)
-{
-    int err;
-
-    if (symname == NULL)
-        return APR_ESYMNOTFOUND;
-
-    err = get_image_symbol(handle->handle, symname, B_SYMBOL_TYPE_ANY, 
-			 ressym);
-
-    if(err != B_OK)
-        return APR_ESYMNOTFOUND;
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *dso, char *buffer, apr_size_t buflen)
-{
-    strncpy(buffer, strerror(errno), buflen);
-    return buffer;
-}
-
-APR_DECLARE(apr_status_t) apr_os_dso_handle_put(apr_dso_handle_t **aprdso,
-                                                apr_os_dso_handle_t osdso,
-                                                apr_pool_t *pool)
-{
-    *aprdso = apr_pcalloc(pool, sizeof **aprdso);
-    (*aprdso)->handle = osdso;
-    (*aprdso)->pool = pool;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_dso_handle_get(apr_os_dso_handle_t *osdso,
-                                                apr_dso_handle_t *aprdso)
-{
-    *osdso = aprdso->handle;
-    return APR_SUCCESS;
-}
-
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/dso/netware/dso.c b/rubbos/app/httpd-2.0.64/srclib/apr/dso/netware/dso.c
deleted file mode 100644
index 4cd2ad61..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/dso/netware/dso.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_dso.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-
-#include <library.h>
-#include <unistd.h>
-
-APR_DECLARE(apr_status_t) apr_os_dso_handle_put(apr_dso_handle_t **aprdso,
-                                                apr_os_dso_handle_t osdso,
-                                                apr_pool_t *pool)
-{
-    *aprdso = apr_pcalloc(pool, sizeof **aprdso);
-    (*aprdso)->handle = osdso;
-    (*aprdso)->pool = pool;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_dso_handle_get(apr_os_dso_handle_t *osdso,
-                                                apr_dso_handle_t *aprdso)
-{
-    *osdso = aprdso->handle;
-    return APR_SUCCESS;
-}
-
-static apr_status_t dso_cleanup(void *thedso)
-{
-    apr_dso_handle_t *dso = thedso;
-    sym_list *symbol = NULL;
-    void *NLMHandle = getnlmhandle();
-
-    if (dso->handle == NULL)
-        return APR_SUCCESS;
-
-    if (dso->symbols != NULL) {
-        symbol = dso->symbols;
-        while (symbol) {
-            UnImportPublicObject(NLMHandle, symbol->symbol);
-            symbol = symbol->next;
-        }
-    }
-
-    if (dlclose(dso->handle) != 0)
-        return APR_EINIT;
-
-    dso->handle = NULL;
-    dso->symbols = NULL;
-    dso->path = NULL;
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, 
-                                       const char *path, apr_pool_t *pool)
-{
-
-    void *os_handle = NULL;
-    char *fullpath = NULL;
-    apr_status_t rv;
-
-    if ((rv = apr_filepath_merge(&fullpath, NULL, path, 
-                                 APR_FILEPATH_NATIVE, pool)) != APR_SUCCESS) {
-        return rv;
-    }
-
-    os_handle = dlopen(fullpath, RTLD_NOW | RTLD_LOCAL);
-
-    *res_handle = apr_pcalloc(pool, sizeof(**res_handle));
-
-    if(os_handle == NULL) {
-        (*res_handle)->errormsg = dlerror();
-        return APR_EDSOOPEN;
-    }
-
-    (*res_handle)->handle = (void*)os_handle;
-    (*res_handle)->pool = pool;
-    (*res_handle)->errormsg = NULL;
-    (*res_handle)->symbols = NULL;
-    (*res_handle)->path = apr_pstrdup(pool, fullpath);
-
-    apr_pool_cleanup_register(pool, *res_handle, dso_cleanup, apr_pool_cleanup_null);
-
-    return APR_SUCCESS;
-}
-    
-APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle)
-{
-    return apr_pool_cleanup_run(handle->pool, handle, dso_cleanup);
-}
-
-APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, 
-                                      apr_dso_handle_t *handle, 
-                                      const char *symname)
-{
-    sym_list *symbol = NULL;
-    void *retval = dlsym(handle->handle, symname);
-
-    if (retval == NULL) {
-        handle->errormsg = dlerror();
-        return APR_ESYMNOTFOUND;
-    }
-
-    symbol = apr_pcalloc(handle->pool, sizeof(sym_list));
-    symbol->next = handle->symbols;
-    handle->symbols = symbol;
-    symbol->symbol = apr_pstrdup(handle->pool, symname);
-
-    *ressym = retval;
-    
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *dso, char *buffer, 
-                                        apr_size_t buflen)
-{
-    if (dso->errormsg) {
-        apr_cpystrn(buffer, dso->errormsg, buflen);
-        return dso->errormsg;
-    }
-    return "No Error";
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/dso/os2/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/dso/os2/Makefile.in
deleted file mode 100644
index 7d42bded..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/dso/os2/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = dso.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/@OSDIR@
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/dso/os2/dso.c b/rubbos/app/httpd-2.0.64/srclib/apr/dso/os2/dso.c
deleted file mode 100644
index 1a7f7de8..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/dso/os2/dso.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_dso.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include <stdio.h>
-#include <string.h>
-
-#if APR_HAS_DSO
-
-static apr_status_t dso_cleanup(void *thedso)
-{
-    apr_dso_handle_t *dso = thedso;
-    int rc;
-
-    if (dso->handle == 0)
-        return APR_SUCCESS;
-       
-    rc = DosFreeModule(dso->handle);
-
-    if (rc == 0)
-        dso->handle = 0;
-
-    return APR_FROM_OS_ERROR(rc);
-}
-
-
-APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, const char *path, apr_pool_t *ctx)
-{
-    char failed_module[200];
-    HMODULE handle;
-    int rc;
-
-    *res_handle = apr_pcalloc(ctx, sizeof(**res_handle));
-    (*res_handle)->cont = ctx;
-    (*res_handle)->load_error = APR_SUCCESS;
-    (*res_handle)->failed_module = NULL;
-
-    if ((rc = DosLoadModule(failed_module, sizeof(failed_module), path, &handle)) != 0) {
-        (*res_handle)->load_error = APR_FROM_OS_ERROR(rc);
-        (*res_handle)->failed_module = apr_pstrdup(ctx, failed_module);
-        return APR_FROM_OS_ERROR(rc);
-    }
-
-    (*res_handle)->handle  = handle;
-    apr_pool_cleanup_register(ctx, *res_handle, dso_cleanup, apr_pool_cleanup_null);
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle)
-{
-    return apr_pool_cleanup_run(handle->cont, handle, dso_cleanup);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, 
-                                      apr_dso_handle_t *handle, 
-                                      const char *symname)
-{
-    PFN func;
-    int rc;
-
-    if (symname == NULL || ressym == NULL)
-        return APR_ESYMNOTFOUND;
-
-    if ((rc = DosQueryProcAddr(handle->handle, 0, symname, &func)) != 0) {
-        handle->load_error = APR_FROM_OS_ERROR(rc);
-        return handle->load_error;
-    }
-
-    *ressym = func;
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *dso, char *buffer, apr_size_t buflen)
-{
-    char message[200];
-    apr_strerror(dso->load_error, message, sizeof(message));
-
-    if (dso->failed_module != NULL) {
-        strcat(message, " (");
-        strcat(message, dso->failed_module);
-        strcat(message, ")");
-    }
-
-    apr_cpystrn(buffer, message, buflen);
-    return buffer;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_os_dso_handle_put(apr_dso_handle_t **aprdso,
-                                                apr_os_dso_handle_t osdso,
-                                                apr_pool_t *pool)
-{
-    *aprdso = apr_pcalloc(pool, sizeof **aprdso);
-    (*aprdso)->handle = osdso;
-    (*aprdso)->cont = pool;
-    (*aprdso)->load_error = APR_SUCCESS;
-    (*aprdso)->failed_module = NULL;
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_os_dso_handle_get(apr_os_dso_handle_t *osdso,
-                                                apr_dso_handle_t *aprdso)
-{
-    *osdso = aprdso->handle;
-    return APR_SUCCESS;
-}
-
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/dso/os390/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/dso/os390/Makefile.in
deleted file mode 100644
index 7d42bded..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/dso/os390/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = dso.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/@OSDIR@
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/dso/os390/dso.c b/rubbos/app/httpd-2.0.64/srclib/apr/dso/os390/dso.c
deleted file mode 100644
index 9344c71a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/dso/os390/dso.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_portable.h"
-#include "apr_strings.h"
-#include "apr_arch_dso.h"
-#include <errno.h>
-#include <string.h>
-
-#if APR_HAS_DSO
-
-APR_DECLARE(apr_status_t) apr_os_dso_handle_put(apr_dso_handle_t **aprdso,
-                                                apr_os_dso_handle_t osdso,
-                                                apr_pool_t *pool)
-{   
-    *aprdso = apr_pcalloc(pool, sizeof **aprdso);
-    (*aprdso)->handle = osdso;
-    (*aprdso)->pool = pool;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_dso_handle_get(apr_os_dso_handle_t *osdso,
-                                                apr_dso_handle_t *aprdso)
-{
-    *osdso = aprdso->handle;
-    return APR_SUCCESS;
-}
-
-static apr_status_t dso_cleanup(void *thedso)
-{
-    apr_dso_handle_t *dso = thedso;
-    int rc;
-
-    if (dso->handle == 0)
-        return APR_SUCCESS;
-       
-    rc = dllfree(dso->handle);
-
-    if (rc == 0) {
-        dso->handle = 0;
-        return APR_SUCCESS;
-    }
-    dso->failing_errno = errno;
-    return errno;
-}
-
-APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, 
-                                       const char *path, apr_pool_t *ctx)
-{
-    dllhandle *handle;
-    int rc;
-
-    *res_handle = apr_pcalloc(ctx, sizeof(**res_handle));
-    (*res_handle)->pool = ctx;
-    if ((handle = dllload(path)) != NULL) {
-        (*res_handle)->handle  = handle;
-        apr_pool_cleanup_register(ctx, *res_handle, dso_cleanup, apr_pool_cleanup_null);
-        return APR_SUCCESS;
-    }
-
-    (*res_handle)->failing_errno = errno;
-    return APR_EDSOOPEN;
-}
-
-APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle)
-{
-    return apr_pool_cleanup_run(handle->pool, handle, dso_cleanup);
-}
-
-APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, 
-                                      apr_dso_handle_t *handle, 
-                                      const char *symname)
-{
-    void *func_ptr;
-    void *var_ptr; 
-
-    if ((var_ptr = dllqueryvar(handle->handle, symname)) != NULL) {
-        *ressym = var_ptr;
-        return APR_SUCCESS;
-    }
-    if ((func_ptr = (void *)dllqueryfn(handle->handle, symname)) != NULL) {
-        *ressym = func_ptr;
-        return APR_SUCCESS;
-    }
-    handle->failing_errno = errno;
-    return APR_ESYMNOTFOUND;
-}
-
-APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *handle, char *buffer, 
-                          apr_size_t buflen)
-{
-    apr_cpystrn(buffer, strerror(handle->failing_errno), buflen);
-    return buffer;
-}
-
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/dso/unix/.libs/dso.o b/rubbos/app/httpd-2.0.64/srclib/apr/dso/unix/.libs/dso.o
deleted file mode 100644
index 0835f739..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/dso/unix/.libs/dso.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/dso/unix/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/dso/unix/Makefile
deleted file mode 100644
index 786f8829..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/dso/unix/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-srcdir = .
-
-
-TARGETS = dso.lo
-
-# bring in rules.mk for standard functionality
-include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
-
-INCDIR=../../include
-INCDIR2=$(INCDIR)/arch
-INCDIR3=$(INCDIR)/arch/unix
-INCLUDES=-I$(INCDIR) -I$(INCDIR2) -I$(INCDIR3)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/dso/unix/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/dso/unix/Makefile.in
deleted file mode 100644
index 89c6b25b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/dso/unix/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = dso.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-INCDIR2=$(INCDIR)/arch
-INCDIR3=$(INCDIR)/arch/unix
-INCLUDES=-I$(INCDIR) -I$(INCDIR2) -I$(INCDIR3)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/dso/unix/dso.c b/rubbos/app/httpd-2.0.64/srclib/apr/dso/unix/dso.c
deleted file mode 100644
index bbe87c6c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/dso/unix/dso.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_dso.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-
-#if APR_HAS_DSO
-
-#if !defined(DSO_USE_DLFCN) && !defined(DSO_USE_SHL) && !defined(DSO_USE_DYLD)
-#error No DSO implementation specified.
-#endif
-
-#ifdef HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-#if APR_HAVE_STDLIB_H
-#include <stdlib.h> /* malloc(), free() */
-#endif
-#if APR_HAVE_STRING_H
-#include <string.h> /* for strerror() on HP-UX */
-#endif
-
-#if defined(DSO_USE_DYLD)
-#define DYLD_LIBRARY_HANDLE (void *)-1
-#endif
-
-APR_DECLARE(apr_status_t) apr_os_dso_handle_put(apr_dso_handle_t **aprdso,
-                                                apr_os_dso_handle_t osdso,
-                                                apr_pool_t *pool)
-{
-    *aprdso = apr_pcalloc(pool, sizeof **aprdso);
-    (*aprdso)->handle = osdso;
-    (*aprdso)->pool = pool;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_dso_handle_get(apr_os_dso_handle_t *osdso,
-                                                apr_dso_handle_t *aprdso)
-{
-    *osdso = aprdso->handle;
-    return APR_SUCCESS;
-}
-
-static apr_status_t dso_cleanup(void *thedso)
-{
-    apr_dso_handle_t *dso = thedso;
-
-    if (dso->handle == NULL)
-        return APR_SUCCESS;
-
-#if defined(DSO_USE_SHL)
-    shl_unload((shl_t)dso->handle);
-#elif defined(DSO_USE_DYLD)
-    if (dso->handle != DYLD_LIBRARY_HANDLE) {
-        NSUnLinkModule(dso->handle, FALSE);
-    }
-#elif defined(DSO_USE_DLFCN)
-    if (dlclose(dso->handle) != 0)
-        return APR_EINIT;
-#endif
-    dso->handle = NULL;
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, 
-                                       const char *path, apr_pool_t *pool)
-{
-#if defined(DSO_USE_SHL)
-    shl_t os_handle = shl_load(path, BIND_IMMEDIATE, 0L);
-
-#elif defined(DSO_USE_DYLD)
-    NSObjectFileImage image;
-    NSModule os_handle = NULL;
-    NSObjectFileImageReturnCode dsoerr;
-    const char* err_msg = NULL;
-    dsoerr = NSCreateObjectFileImageFromFile(path, &image);
-
-    if (dsoerr == NSObjectFileImageSuccess) {
-#if defined(NSLINKMODULE_OPTION_RETURN_ON_ERROR) && defined(NSLINKMODULE_OPTION_NONE)
-        os_handle = NSLinkModule(image, path,
-                                 NSLINKMODULE_OPTION_RETURN_ON_ERROR |
-                                 NSLINKMODULE_OPTION_NONE);
-        /* If something went wrong, get the errors... */
-        if (!os_handle) {
-            NSLinkEditErrors errors;
-            int errorNumber;
-            const char *fileName;
-            NSLinkEditError(&errors, &errorNumber, &fileName, &err_msg);
-        }
-#else
-        os_handle = NSLinkModule(image, path, FALSE);
-#endif
-        NSDestroyObjectFileImage(image);
-    }
-    else if ((dsoerr == NSObjectFileImageFormat ||
-             dsoerr == NSObjectFileImageInappropriateFile) &&
-             NSAddLibrary(path) == TRUE) {
-        os_handle = (NSModule)DYLD_LIBRARY_HANDLE;
-    }
-    else {
-        err_msg = "cannot create object file image or add library";
-    }
-
-#elif defined(DSO_USE_DLFCN)
-#if defined(OSF1) || defined(SEQUENT) || defined(SNI) ||\
-    (defined(__FreeBSD_version) && (__FreeBSD_version >= 220000))
-    void *os_handle = dlopen((char *)path, RTLD_NOW | RTLD_GLOBAL);
-
-#else
-    int flags = RTLD_NOW | RTLD_GLOBAL;
-    void *os_handle;
-#ifdef _AIX
-    if (strchr(path + 1, '(') && path[strlen(path) - 1] == ')')
-    {
-        /* This special archive.a(dso.so) syntax is required for
-         * the way libtool likes to build shared libraries on AIX.
-         * dlopen() support for such a library requires that the
-         * RTLD_MEMBER flag be enabled.
-         */
-        flags |= RTLD_MEMBER;
-    }
-#endif
-    os_handle = dlopen(path, flags);
-#endif    
-#endif /* DSO_USE_x */
-
-    *res_handle = apr_pcalloc(pool, sizeof(**res_handle));
-
-    if(os_handle == NULL) {
-#if defined(DSO_USE_SHL)
-        (*res_handle)->errormsg = strerror(errno);
-        return APR_EDSOOPEN;
-#elif defined(DSO_USE_DYLD)
-        (*res_handle)->errormsg = (err_msg) ? err_msg : "link failed";
-        return APR_EDSOOPEN;
-#elif defined(DSO_USE_DLFCN)
-        (*res_handle)->errormsg = dlerror();
-        return APR_EDSOOPEN;
-#endif
-    }
-
-    (*res_handle)->handle = (void*)os_handle;
-    (*res_handle)->pool = pool;
-    (*res_handle)->errormsg = NULL;
-
-    apr_pool_cleanup_register(pool, *res_handle, dso_cleanup, apr_pool_cleanup_null);
-
-    return APR_SUCCESS;
-}
-    
-APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle)
-{
-    return apr_pool_cleanup_run(handle->pool, handle, dso_cleanup);
-}
-
-APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, 
-                                      apr_dso_handle_t *handle, 
-                                      const char *symname)
-{
-#if defined(DSO_USE_SHL)
-    void *symaddr = NULL;
-    int status;
-
-    errno = 0;
-    status = shl_findsym((shl_t *)&handle->handle, symname, TYPE_PROCEDURE, &symaddr);
-    if (status == -1 && errno == 0) /* try TYPE_DATA instead */
-        status = shl_findsym((shl_t *)&handle->handle, symname, TYPE_DATA, &symaddr);
-    if (status == -1)
-        return APR_ESYMNOTFOUND;
-    *ressym = symaddr;
-    return APR_SUCCESS;
-
-#elif defined(DSO_USE_DYLD)
-    void *retval = NULL;
-    NSSymbol symbol;
-    char *symname2 = (char*)malloc(sizeof(char)*(strlen(symname)+2));
-    sprintf(symname2, "_%s", symname);
-#ifdef NSLINKMODULE_OPTION_PRIVATE
-    if (handle->handle == DYLD_LIBRARY_HANDLE) {
-        symbol = NSLookupAndBindSymbol(symname2);
-    }
-    else {
-        symbol = NSLookupSymbolInModule((NSModule)handle->handle, symname2);
-    }
-#else
-    symbol = NSLookupAndBindSymbol(symname2);
-#endif
-    free(symname2);
-    if (symbol == NULL) {
-        handle->errormsg = "undefined symbol";
-	return APR_ESYMNOTFOUND;
-    }
-    retval = NSAddressOfSymbol(symbol);
-    if (retval == NULL) {
-        handle->errormsg = "cannot resolve symbol";
-	return APR_ESYMNOTFOUND;
-    }
-    *ressym = retval;
-    return APR_SUCCESS;
-#elif defined(DSO_USE_DLFCN)
-
-#if defined(DLSYM_NEEDS_UNDERSCORE)
-    void *retval;
-    char *symbol = (char*)malloc(sizeof(char)*(strlen(symname)+2));
-    sprintf(symbol, "_%s", symname);
-    retval = dlsym(handle->handle, symbol);
-    free(symbol);
-#elif defined(SEQUENT) || defined(SNI)
-    void *retval = dlsym(handle->handle, (char *)symname);
-#else
-    void *retval = dlsym(handle->handle, symname);
-#endif /* DLSYM_NEEDS_UNDERSCORE */
-
-    if (retval == NULL) {
-        handle->errormsg = dlerror();
-        return APR_ESYMNOTFOUND;
-    }
-
-    *ressym = retval;
-    
-    return APR_SUCCESS;
-#endif /* DSO_USE_x */
-}
-
-APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *dso, char *buffer, 
-                                        apr_size_t buflen)
-{
-    if (dso->errormsg) {
-        apr_cpystrn(buffer, dso->errormsg, buflen);
-        return dso->errormsg;
-    }
-    return "No Error";
-}
-
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/dso/unix/dso.lo b/rubbos/app/httpd-2.0.64/srclib/apr/dso/unix/dso.lo
deleted file mode 100644
index 96207a16..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/dso/unix/dso.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# dso.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/dso.o'
-
-# Name of the non-PIC object.
-non_pic_object='dso.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/dso/unix/dso.o b/rubbos/app/httpd-2.0.64/srclib/apr/dso/unix/dso.o
deleted file mode 100644
index 7ac432e7..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/dso/unix/dso.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/dso/win32/dso.c b/rubbos/app/httpd-2.0.64/srclib/apr/dso/win32/dso.c
deleted file mode 100644
index d4a68938..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/dso/win32/dso.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_dso.h"
-#include "apr_strings.h"
-#include "apr_private.h"
-#include "apr_arch_file_io.h"
-#include "apr_arch_utf8.h"
-
-#if APR_HAS_DSO
-
-APR_DECLARE(apr_status_t) apr_os_dso_handle_put(apr_dso_handle_t **aprdso,
-                                                apr_os_dso_handle_t osdso,
-                                                apr_pool_t *pool)
-{
-    *aprdso = apr_pcalloc(pool, sizeof **aprdso);
-    (*aprdso)->handle = osdso;
-    (*aprdso)->cont = pool;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_dso_handle_get(apr_os_dso_handle_t *osdso,
-                                                apr_dso_handle_t *aprdso)
-{
-    *osdso = aprdso->handle;
-    return APR_SUCCESS;
-}
-
-static apr_status_t dso_cleanup(void *thedso)
-{
-    apr_dso_handle_t *dso = thedso;
-
-    if (dso->handle != NULL && !FreeLibrary(dso->handle)) {
-        return apr_get_os_error();
-    }
-    dso->handle = NULL;
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_dso_load(struct apr_dso_handle_t **res_handle, 
-                                       const char *path, apr_pool_t *ctx)
-{
-    HINSTANCE os_handle;
-    apr_status_t rv;
-#ifndef _WIN32_WCE
-    UINT em;
-#endif
-
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE 
-    {
-        apr_wchar_t wpath[APR_PATH_MAX];
-        if ((rv = utf8_to_unicode_path(wpath, sizeof(wpath) 
-                                            / sizeof(apr_wchar_t), path))
-                != APR_SUCCESS) {
-            *res_handle = apr_pcalloc(ctx, sizeof(**res_handle));
-            return ((*res_handle)->load_error = rv);
-        }
-        /* Prevent ugly popups from killing our app */
-#ifndef _WIN32_WCE
-        em = SetErrorMode(SEM_FAILCRITICALERRORS);
-#endif
-        os_handle = LoadLibraryExW(wpath, NULL, 0);
-        if (!os_handle)
-            os_handle = LoadLibraryExW(wpath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-        if (!os_handle)
-            rv = apr_get_os_error();
-#ifndef _WIN32_WCE
-        SetErrorMode(em);
-#endif
-    }
-#endif /* APR_HAS_UNICODE_FS */
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-    {
-        char fspec[APR_PATH_MAX], *p = fspec;
-        /* Must convert path from / to \ notation.
-         * Per PR2555, the LoadLibraryEx function is very picky about slashes.
-         * Debugging on NT 4 SP 6a reveals First Chance Exception within NTDLL.
-         * LoadLibrary in the MS PSDK also reveals that it -explicitly- states
-         * that backslashes must be used for the LoadLibrary family of calls.
-         */
-        apr_cpystrn(fspec, path, sizeof(fspec));
-        while ((p = strchr(p, '/')) != NULL)
-            *p = '\\';
-        
-        /* Prevent ugly popups from killing our app */
-        em = SetErrorMode(SEM_FAILCRITICALERRORS);
-        os_handle = LoadLibraryEx(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-        if (!os_handle)
-            os_handle = LoadLibraryEx(path, NULL, 0);
-        if (!os_handle)
-            rv = apr_get_os_error();
-        else
-            rv = APR_SUCCESS;
-        SetErrorMode(em);
-    }
-#endif
-
-    *res_handle = apr_pcalloc(ctx, sizeof(**res_handle));
-    (*res_handle)->cont = ctx;
-
-    if (rv) {
-        return ((*res_handle)->load_error = rv);
-    }
-
-    (*res_handle)->handle = (void*)os_handle;
-    (*res_handle)->load_error = APR_SUCCESS;
-
-    apr_pool_cleanup_register(ctx, *res_handle, dso_cleanup, apr_pool_cleanup_null);
-
-    return APR_SUCCESS;
-}
-    
-APR_DECLARE(apr_status_t) apr_dso_unload(struct apr_dso_handle_t *handle)
-{
-    return apr_pool_cleanup_run(handle->cont, handle, dso_cleanup);
-}
-
-APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, 
-                         struct apr_dso_handle_t *handle, 
-                         const char *symname)
-{
-#ifdef _WIN32_WCE
-    apr_size_t symlen = strlen(symname) + 1;
-    apr_size_t wsymlen = 256;
-    apr_wchar_t wsymname[256];
-    apr_status_t rv;
-
-    rv = apr_conv_utf8_to_ucs2(wsymname, &wsymlen, symname, &symlen);
-    if (rv != APR_SUCCESS) {
-        return rv;
-    }
-    else if (symlen) {
-        return APR_ENAMETOOLONG;
-    }
-
-    *ressym = (apr_dso_handle_sym_t)GetProcAddressW(handle->handle, wsymname);
-#else
-    *ressym = (apr_dso_handle_sym_t)GetProcAddress(handle->handle, symname);
-#endif
-    if (!*ressym) {
-        return apr_get_os_error();
-    }
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *dso, char *buf, apr_size_t bufsize)
-{
-    return apr_strerror(dso->load_error, buf, bufsize);
-}
-
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/export_vars.c b/rubbos/app/httpd-2.0.64/srclib/apr/export_vars.c
deleted file mode 100644
index 65708e36..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/export_vars.c
+++ /dev/null
@@ -1,2 +0,0 @@
-apr_month_snames
-apr_day_snames
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/exports.c b/rubbos/app/httpd-2.0.64/srclib/apr/exports.c
deleted file mode 100644
index ef452009..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/exports.c
+++ /dev/null
@@ -1,659 +0,0 @@
-/*
- * THIS FILE WAS AUTOGENERATED BY make_exports.awk
- *
- * This is an ugly hack that needs to be here, so
- * that libtool will link all of the APR functions
- * into server regardless of whether the base server
- * uses them.
- */
-
-#define CORE_PRIVATE
-
-#include "apr_allocator.h"
-#include "apr_atomic.h"
-#include "apr_compat.h"
-#include "apr_dso.h"
-#include "apr_env.h"
-#include "apr_errno.h"
-#include "apr_file_info.h"
-#include "apr_file_io.h"
-#include "apr_fnmatch.h"
-#include "apr_general.h"
-#include "apr_getopt.h"
-#include "apr_global_mutex.h"
-#include "apr.h"
-#include "apr_hash.h"
-#include "apr_inherit.h"
-#include "apr_lib.h"
-#include "apr_mmap.h"
-#include "apr_network_io.h"
-#include "apr_poll.h"
-#include "apr_pools.h"
-#include "apr_portable.h"
-#include "apr_proc_mutex.h"
-#include "apr_ring.h"
-#include "apr_shm.h"
-#include "apr_signal.h"
-#include "apr_strings.h"
-#include "apr_support.h"
-#include "apr_tables.h"
-#include "apr_thread_cond.h"
-#include "apr_thread_mutex.h"
-#include "apr_thread_proc.h"
-#include "apr_thread_rwlock.h"
-#include "apr_time.h"
-#include "apr_user.h"
-#include "apr_version.h"
-#include "apr_want.h"
-
-const void *ap_ugly_hack = NULL;
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_allocator.h
- */
-const void *ap_hack_apr_allocator_create = (const void *)apr_allocator_create;
-const void *ap_hack_apr_allocator_destroy = (const void *)apr_allocator_destroy;
-const void *ap_hack_apr_allocator_alloc = (const void *)apr_allocator_alloc;
-const void *ap_hack_apr_allocator_free = (const void *)apr_allocator_free;
-const void *ap_hack_apr_allocator_owner_set = (const void *)apr_allocator_owner_set;
-const void *ap_hack_apr_allocator_set_owner = (const void *)apr_allocator_set_owner;
-const void *ap_hack_apr_allocator_owner_get = (const void *)apr_allocator_owner_get;
-const void *ap_hack_apr_allocator_get_owner = (const void *)apr_allocator_get_owner;
-const void *ap_hack_apr_allocator_max_free_set = (const void *)apr_allocator_max_free_set;
-const void *ap_hack_apr_allocator_set_max_free = (const void *)apr_allocator_set_max_free;
-#if APR_HAS_THREADS
-const void *ap_hack_apr_allocator_mutex_set = (const void *)apr_allocator_mutex_set;
-const void *ap_hack_apr_allocator_set_mutex = (const void *)apr_allocator_set_mutex;
-const void *ap_hack_apr_allocator_mutex_get = (const void *)apr_allocator_mutex_get;
-const void *ap_hack_apr_allocator_get_mutex = (const void *)apr_allocator_get_mutex;
-#endif /* APR_HAS_THREADS */
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_dso.h
- */
-#if APR_HAS_DSO || defined(DOXYGEN)
-const void *ap_hack_apr_dso_load = (const void *)apr_dso_load;
-const void *ap_hack_apr_dso_unload = (const void *)apr_dso_unload;
-const void *ap_hack_apr_dso_sym = (const void *)apr_dso_sym;
-const void *ap_hack_apr_dso_error = (const void *)apr_dso_error;
-#endif /* APR_HAS_DSO */
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_env.h
- */
-const void *ap_hack_apr_env_get = (const void *)apr_env_get;
-const void *ap_hack_apr_env_set = (const void *)apr_env_set;
-const void *ap_hack_apr_env_delete = (const void *)apr_env_delete;
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_errno.h
- */
-const void *ap_hack_apr_strerror = (const void *)apr_strerror;
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_file_info.h
- */
-const void *ap_hack_apr_stat = (const void *)apr_stat;
-const void *ap_hack_apr_lstat = (const void *)apr_lstat;
-const void *ap_hack_apr_dir_open = (const void *)apr_dir_open;
-const void *ap_hack_apr_dir_close = (const void *)apr_dir_close;
-const void *ap_hack_apr_dir_read = (const void *)apr_dir_read;
-const void *ap_hack_apr_dir_rewind = (const void *)apr_dir_rewind;
-const void *ap_hack_apr_filepath_root = (const void *)apr_filepath_root;
-const void *ap_hack_apr_filepath_merge = (const void *)apr_filepath_merge;
-const void *ap_hack_apr_filepath_list_split = (const void *)apr_filepath_list_split;
-const void *ap_hack_apr_filepath_list_merge = (const void *)apr_filepath_list_merge;
-const void *ap_hack_apr_filepath_get = (const void *)apr_filepath_get;
-const void *ap_hack_apr_filepath_set = (const void *)apr_filepath_set;
-const void *ap_hack_apr_filepath_encoding = (const void *)apr_filepath_encoding;
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_file_io.h
- */
-const void *ap_hack_apr_file_open = (const void *)apr_file_open;
-const void *ap_hack_apr_file_close = (const void *)apr_file_close;
-const void *ap_hack_apr_file_remove = (const void *)apr_file_remove;
-const void *ap_hack_apr_file_rename = (const void *)apr_file_rename;
-const void *ap_hack_apr_file_copy = (const void *)apr_file_copy;
-const void *ap_hack_apr_file_append = (const void *)apr_file_append;
-const void *ap_hack_apr_file_eof = (const void *)apr_file_eof;
-const void *ap_hack_apr_file_open_stderr = (const void *)apr_file_open_stderr;
-const void *ap_hack_apr_file_open_stdout = (const void *)apr_file_open_stdout;
-const void *ap_hack_apr_file_open_stdin = (const void *)apr_file_open_stdin;
-const void *ap_hack_apr_file_read = (const void *)apr_file_read;
-const void *ap_hack_apr_file_write = (const void *)apr_file_write;
-const void *ap_hack_apr_file_writev = (const void *)apr_file_writev;
-const void *ap_hack_apr_file_read_full = (const void *)apr_file_read_full;
-const void *ap_hack_apr_file_write_full = (const void *)apr_file_write_full;
-const void *ap_hack_apr_file_putc = (const void *)apr_file_putc;
-const void *ap_hack_apr_file_getc = (const void *)apr_file_getc;
-const void *ap_hack_apr_file_ungetc = (const void *)apr_file_ungetc;
-const void *ap_hack_apr_file_gets = (const void *)apr_file_gets;
-const void *ap_hack_apr_file_puts = (const void *)apr_file_puts;
-const void *ap_hack_apr_file_flush = (const void *)apr_file_flush;
-const void *ap_hack_apr_file_dup = (const void *)apr_file_dup;
-const void *ap_hack_apr_file_dup2 = (const void *)apr_file_dup2;
-const void *ap_hack_apr_file_setaside = (const void *)apr_file_setaside;
-const void *ap_hack_apr_file_seek = (const void *)apr_file_seek;
-const void *ap_hack_apr_file_pipe_create = (const void *)apr_file_pipe_create;
-const void *ap_hack_apr_file_namedpipe_create = (const void *)apr_file_namedpipe_create;
-const void *ap_hack_apr_file_pipe_timeout_get = (const void *)apr_file_pipe_timeout_get;
-const void *ap_hack_apr_file_pipe_timeout_set = (const void *)apr_file_pipe_timeout_set;
-const void *ap_hack_apr_file_lock = (const void *)apr_file_lock;
-const void *ap_hack_apr_file_unlock = (const void *)apr_file_unlock;
-const void *ap_hack_apr_file_name_get = (const void *)apr_file_name_get;
-const void *ap_hack_apr_file_data_get = (const void *)apr_file_data_get;
-const void *ap_hack_apr_file_data_set = (const void *)apr_file_data_set;
-const void *ap_hack_apr_file_printf = (const void *)apr_file_printf;
-const void *ap_hack_apr_file_perms_set = (const void *)apr_file_perms_set;
-const void *ap_hack_apr_file_attrs_set = (const void *)apr_file_attrs_set;
-const void *ap_hack_apr_file_mtime_set = (const void *)apr_file_mtime_set;
-const void *ap_hack_apr_dir_make = (const void *)apr_dir_make;
-const void *ap_hack_apr_dir_make_recursive = (const void *)apr_dir_make_recursive;
-const void *ap_hack_apr_dir_remove = (const void *)apr_dir_remove;
-const void *ap_hack_apr_file_info_get = (const void *)apr_file_info_get;
-const void *ap_hack_apr_file_trunc = (const void *)apr_file_trunc;
-const void *ap_hack_apr_file_flags_get = (const void *)apr_file_flags_get;
-const void *ap_hack_apr_file_pool_get = (const void *)apr_file_pool_get;
-const void *ap_hack_apr_file_inherit_set = (const void *)apr_file_inherit_set;
-const void *ap_hack_apr_file_set_inherit = (const void *)apr_file_set_inherit;
-const void *ap_hack_apr_file_inherit_unset = (const void *)apr_file_inherit_unset;
-const void *ap_hack_apr_file_unset_inherit = (const void *)apr_file_unset_inherit;
-const void *ap_hack_apr_file_mktemp = (const void *)apr_file_mktemp;
-const void *ap_hack_apr_temp_dir_get = (const void *)apr_temp_dir_get;
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_fnmatch.h
- */
-const void *ap_hack_apr_fnmatch = (const void *)apr_fnmatch;
-const void *ap_hack_apr_fnmatch_test = (const void *)apr_fnmatch_test;
-const void *ap_hack_apr_is_fnmatch = (const void *)apr_is_fnmatch;
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_general.h
- */
-const void *ap_hack_apr_initialize = (const void *)apr_initialize;
-const void *ap_hack_apr_app_initialize = (const void *)apr_app_initialize;
-const void *ap_hack_apr_terminate = (const void *)apr_terminate;
-const void *ap_hack_apr_terminate2 = (const void *)apr_terminate2;
-#if APR_HAS_RANDOM || defined(DOXYGEN)
-#ifdef APR_ENABLE_FOR_1_0
-const void *ap_hack_apr_generate_random_bytes = (const void *)apr_generate_random_bytes;
-#else
-const void *ap_hack_apr_generate_random_bytes = (const void *)apr_generate_random_bytes;
-#endif
-#endif
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_getopt.h
- */
-const void *ap_hack_apr_getopt_init = (const void *)apr_getopt_init;
-const void *ap_hack_apr_getopt = (const void *)apr_getopt;
-const void *ap_hack_apr_getopt_long = (const void *)apr_getopt_long;
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_global_mutex.h
- */
-#if !APR_PROC_MUTEX_IS_GLOBAL || defined(DOXYGEN)
-const void *ap_hack_apr_global_mutex_create = (const void *)apr_global_mutex_create;
-const void *ap_hack_apr_global_mutex_child_init = (const void *)apr_global_mutex_child_init;
-const void *ap_hack_apr_global_mutex_lock = (const void *)apr_global_mutex_lock;
-const void *ap_hack_apr_global_mutex_trylock = (const void *)apr_global_mutex_trylock;
-const void *ap_hack_apr_global_mutex_unlock = (const void *)apr_global_mutex_unlock;
-const void *ap_hack_apr_global_mutex_destroy = (const void *)apr_global_mutex_destroy;
-const void *ap_hack_apr_global_mutex_pool_get = (const void *)apr_global_mutex_pool_get;
-#else /* APR_PROC_MUTEX_IS_GLOBAL */
-#endif
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_hash.h
- */
-const void *ap_hack_apr_hash_make = (const void *)apr_hash_make;
-const void *ap_hack_apr_hash_copy = (const void *)apr_hash_copy;
-const void *ap_hack_apr_hash_set = (const void *)apr_hash_set;
-const void *ap_hack_apr_hash_get = (const void *)apr_hash_get;
-const void *ap_hack_apr_hash_first = (const void *)apr_hash_first;
-const void *ap_hack_apr_hash_next = (const void *)apr_hash_next;
-const void *ap_hack_apr_hash_this = (const void *)apr_hash_this;
-const void *ap_hack_apr_hash_count = (const void *)apr_hash_count;
-const void *ap_hack_apr_hash_overlay = (const void *)apr_hash_overlay;
-const void *ap_hack_apr_hash_merge = (const void *)apr_hash_merge;
-const void *ap_hack_apr_hash_pool_get = (const void *)apr_hash_pool_get;
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_lib.h
- */
-const void *ap_hack_apr_filepath_name_get = (const void *)apr_filepath_name_get;
-const void *ap_hack_apr_filename_of_pathname = (const void *)apr_filename_of_pathname;
-const void *ap_hack_apr_vformatter = (const void *)apr_vformatter;
-const void *ap_hack_apr_password_get = (const void *)apr_password_get;
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_mmap.h
- */
-#if APR_HAS_MMAP || defined(DOXYGEN)
-const void *ap_hack_apr_mmap_create = (const void *)apr_mmap_create;
-const void *ap_hack_apr_mmap_dup = (const void *)apr_mmap_dup;
-#if defined(DOXYGEN)
-const void *ap_hack_apr_mmap_setaside = (const void *)apr_mmap_setaside;
-#else
-#endif /* DOXYGEN */
-const void *ap_hack_apr_mmap_delete = (const void *)apr_mmap_delete;
-const void *ap_hack_apr_mmap_offset = (const void *)apr_mmap_offset;
-#endif /* APR_HAS_MMAP */
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_network_io.h
- */
-const void *ap_hack_apr_socket_create = (const void *)apr_socket_create;
-const void *ap_hack_apr_socket_create_ex = (const void *)apr_socket_create_ex;
-const void *ap_hack_apr_socket_shutdown = (const void *)apr_socket_shutdown;
-const void *ap_hack_apr_shutdown = (const void *)apr_shutdown;
-const void *ap_hack_apr_socket_close = (const void *)apr_socket_close;
-const void *ap_hack_apr_socket_bind = (const void *)apr_socket_bind;
-const void *ap_hack_apr_bind = (const void *)apr_bind;
-const void *ap_hack_apr_socket_listen = (const void *)apr_socket_listen;
-const void *ap_hack_apr_listen = (const void *)apr_listen;
-const void *ap_hack_apr_socket_accept = (const void *)apr_socket_accept;
-const void *ap_hack_apr_accept = (const void *)apr_accept;
-const void *ap_hack_apr_socket_connect = (const void *)apr_socket_connect;
-const void *ap_hack_apr_connect = (const void *)apr_connect;
-const void *ap_hack_apr_sockaddr_info_get = (const void *)apr_sockaddr_info_get;
-const void *ap_hack_apr_getnameinfo = (const void *)apr_getnameinfo;
-const void *ap_hack_apr_parse_addr_port = (const void *)apr_parse_addr_port;
-const void *ap_hack_apr_gethostname = (const void *)apr_gethostname;
-const void *ap_hack_apr_socket_data_get = (const void *)apr_socket_data_get;
-const void *ap_hack_apr_socket_data_set = (const void *)apr_socket_data_set;
-const void *ap_hack_apr_socket_send = (const void *)apr_socket_send;
-const void *ap_hack_apr_send = (const void *)apr_send;
-const void *ap_hack_apr_socket_sendv = (const void *)apr_socket_sendv;
-const void *ap_hack_apr_sendv = (const void *)apr_sendv;
-const void *ap_hack_apr_socket_sendto = (const void *)apr_socket_sendto;
-const void *ap_hack_apr_sendto = (const void *)apr_sendto;
-const void *ap_hack_apr_socket_recvfrom = (const void *)apr_socket_recvfrom;
-const void *ap_hack_apr_recvfrom = (const void *)apr_recvfrom;
-#if APR_HAS_SENDFILE || defined(DOXYGEN)
-const void *ap_hack_apr_socket_sendfile = (const void *)apr_socket_sendfile;
-const void *ap_hack_apr_sendfile = (const void *)apr_sendfile;
-#endif /* APR_HAS_SENDFILE */
-const void *ap_hack_apr_socket_recv = (const void *)apr_socket_recv;
-const void *ap_hack_apr_recv = (const void *)apr_recv;
-const void *ap_hack_apr_socket_opt_set = (const void *)apr_socket_opt_set;
-const void *ap_hack_apr_setsocketopt = (const void *)apr_setsocketopt;
-const void *ap_hack_apr_socket_timeout_set = (const void *)apr_socket_timeout_set;
-const void *ap_hack_apr_socket_opt_get = (const void *)apr_socket_opt_get;
-const void *ap_hack_apr_getsocketopt = (const void *)apr_getsocketopt;
-const void *ap_hack_apr_socket_timeout_get = (const void *)apr_socket_timeout_get;
-const void *ap_hack_apr_socket_atmark = (const void *)apr_socket_atmark;
-const void *ap_hack_apr_socket_addr_get = (const void *)apr_socket_addr_get;
-const void *ap_hack_apr_sockaddr_port_set = (const void *)apr_sockaddr_port_set;
-const void *ap_hack_apr_sockaddr_port_get = (const void *)apr_sockaddr_port_get;
-const void *ap_hack_apr_sockaddr_ip_set = (const void *)apr_sockaddr_ip_set;
-const void *ap_hack_apr_sockaddr_ip_get = (const void *)apr_sockaddr_ip_get;
-const void *ap_hack_apr_sockaddr_equal = (const void *)apr_sockaddr_equal;
-#if APR_FILES_AS_SOCKETS || defined(DOXYGEN)
-const void *ap_hack_apr_socket_from_file = (const void *)apr_socket_from_file;
-#endif /* APR_FILES_AS_SOCKETS */
-const void *ap_hack_apr_getservbyname = (const void *)apr_getservbyname;
-const void *ap_hack_apr_ipsubnet_create = (const void *)apr_ipsubnet_create;
-const void *ap_hack_apr_ipsubnet_test = (const void *)apr_ipsubnet_test;
-const void *ap_hack_apr_socket_protocol_get = (const void *)apr_socket_protocol_get;
-const void *ap_hack_apr_socket_inherit_set = (const void *)apr_socket_inherit_set;
-const void *ap_hack_apr_socket_set_inherit = (const void *)apr_socket_set_inherit;
-const void *ap_hack_apr_socket_inherit_unset = (const void *)apr_socket_inherit_unset;
-const void *ap_hack_apr_socket_unset_inherit = (const void *)apr_socket_unset_inherit;
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_poll.h
- */
-const void *ap_hack_apr_poll_setup = (const void *)apr_poll_setup;
-const void *ap_hack_apr_poll = (const void *)apr_poll;
-const void *ap_hack_apr_poll_socket_add = (const void *)apr_poll_socket_add;
-const void *ap_hack_apr_poll_socket_mask = (const void *)apr_poll_socket_mask;
-const void *ap_hack_apr_poll_socket_remove = (const void *)apr_poll_socket_remove;
-const void *ap_hack_apr_poll_socket_clear = (const void *)apr_poll_socket_clear;
-const void *ap_hack_apr_poll_revents_get = (const void *)apr_poll_revents_get;
-const void *ap_hack_apr_pollset_create = (const void *)apr_pollset_create;
-const void *ap_hack_apr_pollset_destroy = (const void *)apr_pollset_destroy;
-const void *ap_hack_apr_pollset_add = (const void *)apr_pollset_add;
-const void *ap_hack_apr_pollset_remove = (const void *)apr_pollset_remove;
-const void *ap_hack_apr_pollset_poll = (const void *)apr_pollset_poll;
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_pools.h
- */
-const void *ap_hack_apr_pool_initialize = (const void *)apr_pool_initialize;
-const void *ap_hack_apr_pool_terminate = (const void *)apr_pool_terminate;
-const void *ap_hack_apr_pool_create_ex = (const void *)apr_pool_create_ex;
-const void *ap_hack_apr_pool_create_ex_debug = (const void *)apr_pool_create_ex_debug;
-#if defined(DOXYGEN)
-const void *ap_hack_apr_pool_create = (const void *)apr_pool_create;
-#else
-#endif
-const void *ap_hack_apr_pool_allocator_get = (const void *)apr_pool_allocator_get;
-const void *ap_hack_apr_pool_clear = (const void *)apr_pool_clear;
-const void *ap_hack_apr_pool_clear_debug = (const void *)apr_pool_clear_debug;
-const void *ap_hack_apr_pool_destroy = (const void *)apr_pool_destroy;
-const void *ap_hack_apr_pool_destroy_debug = (const void *)apr_pool_destroy_debug;
-const void *ap_hack_apr_palloc = (const void *)apr_palloc;
-const void *ap_hack_apr_palloc_debug = (const void *)apr_palloc_debug;
-#if defined(DOXYGEN)
-const void *ap_hack_apr_pcalloc = (const void *)apr_pcalloc;
-#elif !APR_POOL_DEBUG
-#endif
-const void *ap_hack_apr_pcalloc_debug = (const void *)apr_pcalloc_debug;
-const void *ap_hack_apr_pool_abort_set = (const void *)apr_pool_abort_set;
-const void *ap_hack_apr_pool_set_abort = (const void *)apr_pool_set_abort;
-const void *ap_hack_apr_pool_abort_get = (const void *)apr_pool_abort_get;
-const void *ap_hack_apr_pool_get_abort = (const void *)apr_pool_get_abort;
-const void *ap_hack_apr_pool_parent_get = (const void *)apr_pool_parent_get;
-const void *ap_hack_apr_pool_get_parent = (const void *)apr_pool_get_parent;
-const void *ap_hack_apr_pool_is_ancestor = (const void *)apr_pool_is_ancestor;
-const void *ap_hack_apr_pool_tag = (const void *)apr_pool_tag;
-const void *ap_hack_apr_pool_userdata_set = (const void *)apr_pool_userdata_set;
-const void *ap_hack_apr_pool_userdata_setn = (const void *)apr_pool_userdata_setn;
-const void *ap_hack_apr_pool_userdata_get = (const void *)apr_pool_userdata_get;
-const void *ap_hack_apr_pool_cleanup_register = (const void *)apr_pool_cleanup_register;
-const void *ap_hack_apr_pool_cleanup_kill = (const void *)apr_pool_cleanup_kill;
-const void *ap_hack_apr_pool_child_cleanup_set = (const void *)apr_pool_child_cleanup_set;
-const void *ap_hack_apr_pool_cleanup_run = (const void *)apr_pool_cleanup_run;
-const void *ap_hack_apr_pool_cleanup_null = (const void *)apr_pool_cleanup_null;
-const void *ap_hack_apr_pool_cleanup_for_exec = (const void *)apr_pool_cleanup_for_exec;
-#if APR_POOL_DEBUG || defined(DOXYGEN)
-const void *ap_hack_apr_pool_join = (const void *)apr_pool_join;
-const void *ap_hack_apr_pool_find = (const void *)apr_pool_find;
-const void *ap_hack_apr_pool_num_bytes = (const void *)apr_pool_num_bytes;
-const void *ap_hack_apr_pool_lock = (const void *)apr_pool_lock;
-#else /* APR_POOL_DEBUG or DOXYGEN */
-#endif /* APR_POOL_DEBUG or DOXYGEN */
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_portable.h
- */
-#if APR_PROC_MUTEX_IS_GLOBAL || defined(DOXYGEN)
-#else
-const void *ap_hack_apr_os_global_mutex_get = (const void *)apr_os_global_mutex_get;
-#endif
-const void *ap_hack_apr_os_file_get = (const void *)apr_os_file_get;
-const void *ap_hack_apr_os_dir_get = (const void *)apr_os_dir_get;
-const void *ap_hack_apr_os_sock_get = (const void *)apr_os_sock_get;
-const void *ap_hack_apr_os_proc_mutex_get = (const void *)apr_os_proc_mutex_get;
-const void *ap_hack_apr_os_exp_time_get = (const void *)apr_os_exp_time_get;
-const void *ap_hack_apr_os_imp_time_get = (const void *)apr_os_imp_time_get;
-const void *ap_hack_apr_os_shm_get = (const void *)apr_os_shm_get;
-#if APR_HAS_THREADS || defined(DOXYGEN)
-const void *ap_hack_apr_os_thread_get = (const void *)apr_os_thread_get;
-const void *ap_hack_apr_os_threadkey_get = (const void *)apr_os_threadkey_get;
-const void *ap_hack_apr_os_thread_put = (const void *)apr_os_thread_put;
-const void *ap_hack_apr_os_threadkey_put = (const void *)apr_os_threadkey_put;
-const void *ap_hack_apr_os_thread_current = (const void *)apr_os_thread_current;
-const void *ap_hack_apr_os_thread_equal = (const void *)apr_os_thread_equal;
-#endif /* APR_HAS_THREADS */
-const void *ap_hack_apr_os_file_put = (const void *)apr_os_file_put;
-const void *ap_hack_apr_os_pipe_put = (const void *)apr_os_pipe_put;
-const void *ap_hack_apr_os_pipe_put_ex = (const void *)apr_os_pipe_put_ex;
-const void *ap_hack_apr_os_dir_put = (const void *)apr_os_dir_put;
-const void *ap_hack_apr_os_sock_put = (const void *)apr_os_sock_put;
-const void *ap_hack_apr_os_sock_make = (const void *)apr_os_sock_make;
-const void *ap_hack_apr_os_proc_mutex_put = (const void *)apr_os_proc_mutex_put;
-const void *ap_hack_apr_os_imp_time_put = (const void *)apr_os_imp_time_put;
-const void *ap_hack_apr_os_exp_time_put = (const void *)apr_os_exp_time_put;
-const void *ap_hack_apr_os_shm_put = (const void *)apr_os_shm_put;
-#if APR_HAS_DSO || defined(DOXYGEN)
-const void *ap_hack_apr_os_dso_handle_put = (const void *)apr_os_dso_handle_put;
-const void *ap_hack_apr_os_dso_handle_get = (const void *)apr_os_dso_handle_get;
-#if APR_HAS_OS_UUID
-const void *ap_hack_apr_os_uuid_get = (const void *)apr_os_uuid_get;
-#endif
-#endif /* APR_HAS_DSO */
-const void *ap_hack_apr_os_default_encoding = (const void *)apr_os_default_encoding;
-const void *ap_hack_apr_os_locale_encoding = (const void *)apr_os_locale_encoding;
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_proc_mutex.h
- */
-const void *ap_hack_apr_proc_mutex_create = (const void *)apr_proc_mutex_create;
-const void *ap_hack_apr_proc_mutex_child_init = (const void *)apr_proc_mutex_child_init;
-const void *ap_hack_apr_proc_mutex_lock = (const void *)apr_proc_mutex_lock;
-const void *ap_hack_apr_proc_mutex_trylock = (const void *)apr_proc_mutex_trylock;
-const void *ap_hack_apr_proc_mutex_unlock = (const void *)apr_proc_mutex_unlock;
-const void *ap_hack_apr_proc_mutex_destroy = (const void *)apr_proc_mutex_destroy;
-const void *ap_hack_apr_proc_mutex_cleanup = (const void *)apr_proc_mutex_cleanup;
-const void *ap_hack_apr_proc_mutex_lockfile = (const void *)apr_proc_mutex_lockfile;
-const void *ap_hack_apr_proc_mutex_name = (const void *)apr_proc_mutex_name;
-const void *ap_hack_apr_proc_mutex_defname = (const void *)apr_proc_mutex_defname;
-const void *ap_hack_apr_proc_mutex_pool_get = (const void *)apr_proc_mutex_pool_get;
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_shm.h
- */
-const void *ap_hack_apr_shm_create = (const void *)apr_shm_create;
-const void *ap_hack_apr_shm_destroy = (const void *)apr_shm_destroy;
-const void *ap_hack_apr_shm_attach = (const void *)apr_shm_attach;
-const void *ap_hack_apr_shm_detach = (const void *)apr_shm_detach;
-const void *ap_hack_apr_shm_baseaddr_get = (const void *)apr_shm_baseaddr_get;
-const void *ap_hack_apr_shm_size_get = (const void *)apr_shm_size_get;
-const void *ap_hack_apr_shm_pool_get = (const void *)apr_shm_pool_get;
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_signal.h
- */
-#if APR_HAVE_SIGACTION || defined(DOXYGEN)
-const void *ap_hack_apr_signal = (const void *)apr_signal;
-#else /* !APR_HAVE_SIGACTION */
-#endif
-const void *ap_hack_apr_signal_description_get = (const void *)apr_signal_description_get;
-const void *ap_hack_apr_signal_get_description = (const void *)apr_signal_get_description;
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_strings.h
- */
-const void *ap_hack_apr_strnatcmp = (const void *)apr_strnatcmp;
-const void *ap_hack_apr_strnatcasecmp = (const void *)apr_strnatcasecmp;
-const void *ap_hack_apr_pstrdup = (const void *)apr_pstrdup;
-const void *ap_hack_apr_pstrmemdup = (const void *)apr_pstrmemdup;
-const void *ap_hack_apr_pstrndup = (const void *)apr_pstrndup;
-const void *ap_hack_apr_pmemdup = (const void *)apr_pmemdup;
-const void *ap_hack_apr_pstrcat = (const void *)apr_pstrcat;
-const void *ap_hack_apr_pstrcatv = (const void *)apr_pstrcatv;
-const void *ap_hack_apr_pvsprintf = (const void *)apr_pvsprintf;
-const void *ap_hack_apr_psprintf = (const void *)apr_psprintf;
-const void *ap_hack_apr_cpystrn = (const void *)apr_cpystrn;
-const void *ap_hack_apr_collapse_spaces = (const void *)apr_collapse_spaces;
-const void *ap_hack_apr_tokenize_to_argv = (const void *)apr_tokenize_to_argv;
-const void *ap_hack_apr_strtok = (const void *)apr_strtok;
-const void *ap_hack_apr_snprintf = (const void *)apr_snprintf;
-const void *ap_hack_apr_vsnprintf = (const void *)apr_vsnprintf;
-const void *ap_hack_apr_itoa = (const void *)apr_itoa;
-const void *ap_hack_apr_ltoa = (const void *)apr_ltoa;
-const void *ap_hack_apr_off_t_toa = (const void *)apr_off_t_toa;
-const void *ap_hack_apr_strtoi64 = (const void *)apr_strtoi64;
-const void *ap_hack_apr_atoi64 = (const void *)apr_atoi64;
-const void *ap_hack_apr_strfsize = (const void *)apr_strfsize;
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_tables.h
- */
-const void *ap_hack_apr_table_elts = (const void *)apr_table_elts;
-const void *ap_hack_apr_is_empty_table = (const void *)apr_is_empty_table;
-const void *ap_hack_apr_is_empty_array = (const void *)apr_is_empty_array;
-const void *ap_hack_apr_array_make = (const void *)apr_array_make;
-const void *ap_hack_apr_array_push = (const void *)apr_array_push;
-const void *ap_hack_apr_array_pop = (const void *)apr_array_pop;
-const void *ap_hack_apr_array_cat = (const void *)apr_array_cat;
-const void *ap_hack_apr_array_copy = (const void *)apr_array_copy;
-const void *ap_hack_apr_array_copy_hdr = (const void *)apr_array_copy_hdr;
-const void *ap_hack_apr_array_append = (const void *)apr_array_append;
-const void *ap_hack_apr_array_pstrcat = (const void *)apr_array_pstrcat;
-const void *ap_hack_apr_table_make = (const void *)apr_table_make;
-const void *ap_hack_apr_table_copy = (const void *)apr_table_copy;
-const void *ap_hack_apr_table_clear = (const void *)apr_table_clear;
-const void *ap_hack_apr_table_get = (const void *)apr_table_get;
-const void *ap_hack_apr_table_set = (const void *)apr_table_set;
-const void *ap_hack_apr_table_setn = (const void *)apr_table_setn;
-const void *ap_hack_apr_table_unset = (const void *)apr_table_unset;
-const void *ap_hack_apr_table_merge = (const void *)apr_table_merge;
-const void *ap_hack_apr_table_mergen = (const void *)apr_table_mergen;
-const void *ap_hack_apr_table_add = (const void *)apr_table_add;
-const void *ap_hack_apr_table_addn = (const void *)apr_table_addn;
-const void *ap_hack_apr_table_overlay = (const void *)apr_table_overlay;
-const void *ap_hack_apr_table_do = (const void *)apr_table_do;
-const void *ap_hack_apr_table_vdo = (const void *)apr_table_vdo;
-const void *ap_hack_apr_table_overlap = (const void *)apr_table_overlap;
-const void *ap_hack_apr_table_compress = (const void *)apr_table_compress;
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_thread_cond.h
- */
-#if APR_HAS_THREADS || defined(DOXYGEN)
-const void *ap_hack_apr_thread_cond_create = (const void *)apr_thread_cond_create;
-const void *ap_hack_apr_thread_cond_wait = (const void *)apr_thread_cond_wait;
-const void *ap_hack_apr_thread_cond_timedwait = (const void *)apr_thread_cond_timedwait;
-const void *ap_hack_apr_thread_cond_signal = (const void *)apr_thread_cond_signal;
-const void *ap_hack_apr_thread_cond_broadcast = (const void *)apr_thread_cond_broadcast;
-const void *ap_hack_apr_thread_cond_destroy = (const void *)apr_thread_cond_destroy;
-const void *ap_hack_apr_thread_cond_pool_get = (const void *)apr_thread_cond_pool_get;
-#endif /* APR_HAS_THREADS */
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_thread_mutex.h
- */
-#if APR_HAS_THREADS || defined(DOXYGEN)
-const void *ap_hack_apr_thread_mutex_create = (const void *)apr_thread_mutex_create;
-const void *ap_hack_apr_thread_mutex_lock = (const void *)apr_thread_mutex_lock;
-const void *ap_hack_apr_thread_mutex_trylock = (const void *)apr_thread_mutex_trylock;
-const void *ap_hack_apr_thread_mutex_unlock = (const void *)apr_thread_mutex_unlock;
-const void *ap_hack_apr_thread_mutex_destroy = (const void *)apr_thread_mutex_destroy;
-const void *ap_hack_apr_thread_mutex_pool_get = (const void *)apr_thread_mutex_pool_get;
-#endif /* APR_HAS_THREADS */
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_thread_proc.h
- */
-#if APR_HAS_THREADS
-const void *ap_hack_apr_threadattr_create = (const void *)apr_threadattr_create;
-const void *ap_hack_apr_threadattr_detach_set = (const void *)apr_threadattr_detach_set;
-const void *ap_hack_apr_threadattr_detach_get = (const void *)apr_threadattr_detach_get;
-const void *ap_hack_apr_threadattr_stacksize_set = (const void *)apr_threadattr_stacksize_set;
-const void *ap_hack_apr_thread_create = (const void *)apr_thread_create;
-const void *ap_hack_apr_thread_exit = (const void *)apr_thread_exit;
-const void *ap_hack_apr_thread_join = (const void *)apr_thread_join;
-const void *ap_hack_apr_thread_yield = (const void *)apr_thread_yield;
-const void *ap_hack_apr_thread_once_init = (const void *)apr_thread_once_init;
-const void *ap_hack_apr_thread_once = (const void *)apr_thread_once;
-const void *ap_hack_apr_thread_detach = (const void *)apr_thread_detach;
-const void *ap_hack_apr_thread_data_get = (const void *)apr_thread_data_get;
-const void *ap_hack_apr_thread_data_set = (const void *)apr_thread_data_set;
-const void *ap_hack_apr_threadkey_private_create = (const void *)apr_threadkey_private_create;
-const void *ap_hack_apr_threadkey_private_get = (const void *)apr_threadkey_private_get;
-const void *ap_hack_apr_threadkey_private_set = (const void *)apr_threadkey_private_set;
-const void *ap_hack_apr_threadkey_private_delete = (const void *)apr_threadkey_private_delete;
-const void *ap_hack_apr_threadkey_data_get = (const void *)apr_threadkey_data_get;
-const void *ap_hack_apr_threadkey_data_set = (const void *)apr_threadkey_data_set;
-#endif
-const void *ap_hack_apr_procattr_create = (const void *)apr_procattr_create;
-const void *ap_hack_apr_procattr_io_set = (const void *)apr_procattr_io_set;
-const void *ap_hack_apr_procattr_child_in_set = (const void *)apr_procattr_child_in_set;
-const void *ap_hack_apr_procattr_child_out_set = (const void *)apr_procattr_child_out_set;
-const void *ap_hack_apr_procattr_child_err_set = (const void *)apr_procattr_child_err_set;
-const void *ap_hack_apr_procattr_dir_set = (const void *)apr_procattr_dir_set;
-const void *ap_hack_apr_procattr_cmdtype_set = (const void *)apr_procattr_cmdtype_set;
-const void *ap_hack_apr_procattr_detach_set = (const void *)apr_procattr_detach_set;
-#if APR_HAVE_STRUCT_RLIMIT
-const void *ap_hack_apr_procattr_limit_set = (const void *)apr_procattr_limit_set;
-#endif
-const void *ap_hack_apr_procattr_child_errfn_set = (const void *)apr_procattr_child_errfn_set;
-const void *ap_hack_apr_procattr_error_check_set = (const void *)apr_procattr_error_check_set;
-const void *ap_hack_apr_procattr_addrspace_set = (const void *)apr_procattr_addrspace_set;
-#if APR_HAS_FORK
-const void *ap_hack_apr_proc_fork = (const void *)apr_proc_fork;
-#endif
-const void *ap_hack_apr_proc_create = (const void *)apr_proc_create;
-const void *ap_hack_apr_proc_wait = (const void *)apr_proc_wait;
-const void *ap_hack_apr_proc_wait_all_procs = (const void *)apr_proc_wait_all_procs;
-const void *ap_hack_apr_proc_detach = (const void *)apr_proc_detach;
-const void *ap_hack_apr_proc_other_child_register = (const void *)apr_proc_other_child_register;
-const void *ap_hack_apr_proc_other_child_unregister = (const void *)apr_proc_other_child_unregister;
-const void *ap_hack_apr_proc_other_child_alert = (const void *)apr_proc_other_child_alert;
-const void *ap_hack_apr_proc_other_child_refresh = (const void *)apr_proc_other_child_refresh;
-const void *ap_hack_apr_proc_other_child_refresh_all = (const void *)apr_proc_other_child_refresh_all;
-const void *ap_hack_apr_proc_other_child_check = (const void *)apr_proc_other_child_check;
-const void *ap_hack_apr_proc_other_child_read = (const void *)apr_proc_other_child_read;
-const void *ap_hack_apr_proc_kill = (const void *)apr_proc_kill;
-const void *ap_hack_apr_pool_note_subprocess = (const void *)apr_pool_note_subprocess;
-#if APR_HAS_THREADS 
-#if (APR_HAVE_SIGWAIT || APR_HAVE_SIGSUSPEND) && !defined(OS2)
-const void *ap_hack_apr_setup_signal_thread = (const void *)apr_setup_signal_thread;
-const void *ap_hack_apr_signal_thread = (const void *)apr_signal_thread;
-#endif /* (APR_HAVE_SIGWAIT || APR_HAVE_SIGSUSPEND) && !defined(OS2) */
-const void *ap_hack_apr_thread_pool_get = (const void *)apr_thread_pool_get;
-#endif /* APR_HAS_THREADS */
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_thread_rwlock.h
- */
-#if APR_HAS_THREADS
-const void *ap_hack_apr_thread_rwlock_create = (const void *)apr_thread_rwlock_create;
-const void *ap_hack_apr_thread_rwlock_rdlock = (const void *)apr_thread_rwlock_rdlock;
-const void *ap_hack_apr_thread_rwlock_tryrdlock = (const void *)apr_thread_rwlock_tryrdlock;
-const void *ap_hack_apr_thread_rwlock_wrlock = (const void *)apr_thread_rwlock_wrlock;
-const void *ap_hack_apr_thread_rwlock_trywrlock = (const void *)apr_thread_rwlock_trywrlock;
-const void *ap_hack_apr_thread_rwlock_unlock = (const void *)apr_thread_rwlock_unlock;
-const void *ap_hack_apr_thread_rwlock_destroy = (const void *)apr_thread_rwlock_destroy;
-const void *ap_hack_apr_thread_rwlock_pool_get = (const void *)apr_thread_rwlock_pool_get;
-#endif  /* APR_HAS_THREADS */
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_time.h
- */
-const void *ap_hack_apr_time_now = (const void *)apr_time_now;
-const void *ap_hack_apr_time_ansi_put = (const void *)apr_time_ansi_put;
-const void *ap_hack_apr_time_exp_tz = (const void *)apr_time_exp_tz;
-const void *ap_hack_apr_explode_time = (const void *)apr_explode_time;
-const void *ap_hack_apr_time_exp_gmt = (const void *)apr_time_exp_gmt;
-const void *ap_hack_apr_time_exp_lt = (const void *)apr_time_exp_lt;
-const void *ap_hack_apr_explode_localtime = (const void *)apr_explode_localtime;
-const void *ap_hack_apr_time_exp_get = (const void *)apr_time_exp_get;
-const void *ap_hack_apr_time_exp_gmt_get = (const void *)apr_time_exp_gmt_get;
-const void *ap_hack_apr_implode_gmt = (const void *)apr_implode_gmt;
-const void *ap_hack_apr_sleep = (const void *)apr_sleep;
-const void *ap_hack_apr_rfc822_date = (const void *)apr_rfc822_date;
-const void *ap_hack_apr_ctime = (const void *)apr_ctime;
-const void *ap_hack_apr_strftime = (const void *)apr_strftime;
-const void *ap_hack_apr_time_clock_hires = (const void *)apr_time_clock_hires;
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_user.h
- */
-#if APR_HAS_USER 
-const void *ap_hack_apr_uid_current = (const void *)apr_uid_current;
-const void *ap_hack_apr_current_userid = (const void *)apr_current_userid;
-const void *ap_hack_apr_uid_name_get = (const void *)apr_uid_name_get;
-const void *ap_hack_apr_get_username = (const void *)apr_get_username;
-const void *ap_hack_apr_uid_get = (const void *)apr_uid_get;
-const void *ap_hack_apr_get_userid = (const void *)apr_get_userid;
-const void *ap_hack_apr_uid_homepath_get = (const void *)apr_uid_homepath_get;
-const void *ap_hack_apr_get_home_directory = (const void *)apr_get_home_directory;
-#if defined(WIN32)
-const void *ap_hack_apr_uid_compare = (const void *)apr_uid_compare;
-const void *ap_hack_apr_compare_users = (const void *)apr_compare_users;
-#else
-#endif
-const void *ap_hack_apr_gid_name_get = (const void *)apr_gid_name_get;
-const void *ap_hack_apr_group_name_get = (const void *)apr_group_name_get;
-const void *ap_hack_apr_get_groupname = (const void *)apr_get_groupname;
-const void *ap_hack_apr_gid_get = (const void *)apr_gid_get;
-const void *ap_hack_apr_get_groupid = (const void *)apr_get_groupid;
-#if defined(WIN32)
-const void *ap_hack_apr_gid_compare = (const void *)apr_gid_compare;
-const void *ap_hack_apr_compare_groups = (const void *)apr_compare_groups;
-#else
-#endif
-#endif  /* ! APR_HAS_USER */
-
-/*
- * /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_version.h
- */
-const void *ap_hack_apr_version = (const void *)apr_version;
-const void *ap_hack_apr_version_string = (const void *)apr_version_string;
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/netware/filepath.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/netware/filepath.c
deleted file mode 100644
index e4bb3f36..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/netware/filepath.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* NetWare & Win32 have much in common with regards to file names (both are 
- * DOSish) so it makes sense to share some code 
- */
-#include "../win32/filepath.c"
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/netware/filestat.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/netware/filestat.c
deleted file mode 100644
index def63b7e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/netware/filestat.c
+++ /dev/null
@@ -1,421 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_file_io.h"
-#include "fsio.h"
-#include "nks/dirio.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_strings.h"
-#include "apr_errno.h"
-#include "apr_hash.h"
-#include "apr_thread_rwlock.h"
-
-#ifdef HAVE_UTIME_H
-#include <utime.h>
-#endif
-
-#define APR_HAS_PSA
-
-static apr_filetype_e filetype_from_mode(mode_t mode)
-{
-    apr_filetype_e type = APR_NOFILE;
-
-    if (S_ISREG(mode))
-        type = APR_REG;
-    else if (S_ISDIR(mode))
-        type = APR_DIR;
-    else if (S_ISCHR(mode))
-        type = APR_CHR;
-    else if (S_ISBLK(mode))
-        type = APR_BLK;
-    else if (S_ISFIFO(mode))
-        type = APR_PIPE;
-    else if (S_ISLNK(mode))
-        type = APR_LNK;
-    else if (S_ISSOCK(mode))
-        type = APR_SOCK;
-    else
-        type = APR_UNKFILE;
-    return type;
-}
-
-static void fill_out_finfo(apr_finfo_t *finfo, struct stat *info,
-                           apr_int32_t wanted)
-{ 
-    finfo->valid = APR_FINFO_MIN | APR_FINFO_IDENT | APR_FINFO_NLINK 
-                    | APR_FINFO_OWNER | APR_FINFO_PROT;
-    finfo->protection = apr_unix_mode2perms(info->st_mode);
-    finfo->filetype = filetype_from_mode(info->st_mode);
-    finfo->user = info->st_uid;
-    finfo->group = info->st_gid;
-    finfo->size = info->st_size;
-    finfo->inode = info->st_ino;
-    finfo->device = info->st_dev;
-    finfo->nlink = info->st_nlink;
-    apr_time_ansi_put(&finfo->atime, info->st_atime.tv_sec);
-    apr_time_ansi_put(&finfo->mtime, info->st_mtime.tv_sec);
-    apr_time_ansi_put(&finfo->ctime, info->st_ctime.tv_sec);
-    /* ### needs to be revisited  
-     * if (wanted & APR_FINFO_CSIZE) {
-     *   finfo->csize = info->st_blocks * 512;
-     *   finfo->valid |= APR_FINFO_CSIZE;
-     * }
-     */
-}
-
-apr_status_t apr_file_info_get_locked(apr_finfo_t *finfo, 
-                                      apr_int32_t wanted,
-                                      apr_file_t *thefile)
-{
-    struct stat info;
-
-    if (thefile->buffered) {
-        apr_status_t rv = apr_file_flush_locked(thefile);
-        if (rv != APR_SUCCESS)
-            return rv;
-    }
-
-    if (fstat(thefile->filedes, &info) == 0) {
-        finfo->pool = thefile->pool;
-        finfo->fname = thefile->fname;
-        fill_out_finfo(finfo, &info, wanted);
-        return (wanted & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS;
-    }
-    else {
-        return errno;
-    }
-}
-
-APR_DECLARE(apr_status_t) apr_file_info_get(apr_finfo_t *finfo, 
-                                            apr_int32_t wanted,
-                                            apr_file_t *thefile)
-{
-    struct stat info;
-
-    if (thefile->buffered) {
-        apr_status_t rv = apr_file_flush(thefile);
-        if (rv != APR_SUCCESS)
-            return rv;
-    }
-
-    if (fstat(thefile->filedes, &info) == 0) {
-        finfo->pool = thefile->pool;
-        finfo->fname = thefile->fname;
-        fill_out_finfo(finfo, &info, wanted);
-        return (wanted & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS;
-    }
-    else {
-        return errno;
-    }
-}
-
-APR_DECLARE(apr_status_t) apr_file_perms_set(const char *fname, 
-                                             apr_fileperms_t perms)
-{
-    mode_t mode = apr_unix_perms2mode(perms);
-
-    if (chmod(fname, mode) == -1)
-        return errno;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_file_attrs_set(const char *fname,
-                                             apr_fileattrs_t attributes,
-                                             apr_fileattrs_t attr_mask,
-                                             apr_pool_t *pool)
-{
-    apr_status_t status;
-    apr_finfo_t finfo;
-
-    /* Don't do anything if we can't handle the requested attributes */
-    if (!(attr_mask & (APR_FILE_ATTR_READONLY
-                       | APR_FILE_ATTR_EXECUTABLE)))
-        return APR_SUCCESS;
-
-    status = apr_stat(&finfo, fname, APR_FINFO_PROT, pool);
-    if (!APR_STATUS_IS_SUCCESS(status))
-        return status;
-
-    /* ### TODO: should added bits be umask'd? */
-    if (attr_mask & APR_FILE_ATTR_READONLY)
-    {
-        if (attributes & APR_FILE_ATTR_READONLY)
-        {
-            finfo.protection &= ~APR_UWRITE;
-            finfo.protection &= ~APR_GWRITE;
-            finfo.protection &= ~APR_WWRITE;
-        }
-        else
-        {
-            /* ### umask this! */
-            finfo.protection |= APR_UWRITE;
-            finfo.protection |= APR_GWRITE;
-            finfo.protection |= APR_WWRITE;
-        }
-    }
-
-    if (attr_mask & APR_FILE_ATTR_EXECUTABLE)
-    {
-        if (attributes & APR_FILE_ATTR_EXECUTABLE)
-        {
-            /* ### umask this! */
-            finfo.protection |= APR_UEXECUTE;
-            finfo.protection |= APR_GEXECUTE;
-            finfo.protection |= APR_WEXECUTE;
-        }
-        else
-        {
-            finfo.protection &= ~APR_UEXECUTE;
-            finfo.protection &= ~APR_GEXECUTE;
-            finfo.protection &= ~APR_WEXECUTE;
-        }
-    }
-
-    return apr_file_perms_set(fname, finfo.protection);
-}
-
-#ifndef APR_HAS_PSA
-static apr_status_t stat_cache_cleanup(void *data)
-{
-    apr_pool_t *p = (apr_pool_t *)getGlobalPool();
-    apr_hash_index_t *hi;
-    apr_hash_t *statCache = (apr_hash_t*)data;
-	char *key;
-    apr_ssize_t keylen;
-    NXPathCtx_t pathctx;
-
-    for (hi = apr_hash_first(p, statCache); hi; hi = apr_hash_next(hi)) {
-        apr_hash_this(hi, (const void**)&key, &keylen, (void**)&pathctx);
-
-        if (pathctx) {
-            NXFreePathContext(pathctx);
-        }
-    }
-
-    return APR_SUCCESS;
-}
-
-int cstat (NXPathCtx_t ctx, char *path, struct stat *buf, unsigned long requestmap, apr_pool_t *p)
-{
-    apr_pool_t *gPool = (apr_pool_t *)getGlobalPool();
-    apr_hash_t *statCache = NULL;
-    apr_thread_rwlock_t *rwlock = NULL;
-
-    NXPathCtx_t pathctx = 0;
-    char *ptr = NULL, *tr;
-    int len = 0, x;
-    char *ppath;
-    char *pinfo;
-
-    if (ctx == 1) {
-
-        /* If there isn't a global pool then just stat the file
-           and return */
-        if (!gPool) {
-            char poolname[50];
-    
-            if (apr_pool_create(&gPool, NULL) != APR_SUCCESS) {
-                return getstat(ctx, path, buf, requestmap);
-            }
-    
-            setGlobalPool(gPool);
-            apr_pool_tag(gPool, apr_pstrdup(gPool, "cstat_mem_pool"));
-    
-            statCache = apr_hash_make(gPool);
-            apr_pool_userdata_set ((void*)statCache, "STAT_CACHE", stat_cache_cleanup, gPool);
-
-            apr_thread_rwlock_create(&rwlock, gPool);
-            apr_pool_userdata_set ((void*)rwlock, "STAT_CACHE_LOCK", apr_pool_cleanup_null, gPool);
-        }
-        else {
-            apr_pool_userdata_get((void**)&statCache, "STAT_CACHE", gPool);
-            apr_pool_userdata_get((void**)&rwlock, "STAT_CACHE_LOCK", gPool);
-        }
-
-        if (!gPool || !statCache || !rwlock) {
-            return getstat(ctx, path, buf, requestmap);
-        }
-    
-        for (x = 0,tr = path;*tr != '\0';tr++,x++) {
-            if (*tr == '\\' || *tr == '/') {
-                ptr = tr;
-                len = x;
-            }
-            if (*tr == ':') {
-                ptr = "\\";
-                len = x;
-            }
-        }
-    
-        if (ptr) {
-            ppath = apr_pstrndup (p, path, len);
-            strlwr(ppath);
-            if (ptr[1] != '\0') {
-                ptr++;
-            }
-            /* If the path ended in a trailing slash then our result path
-               will be a single slash. To avoid stat'ing the root with a
-               slash, we need to make sure we stat the current directory
-               with a dot */
-            if (((*ptr == '/') || (*ptr == '\\')) && (*(ptr+1) == '\0')) {
-                pinfo = apr_pstrdup (p, ".");
-            }
-            else {
-                pinfo = apr_pstrdup (p, ptr);
-            }
-        }
-    
-        /* If we have a statCache then try to pull the information
-           from the cache.  Otherwise just stat the file and return.*/
-        if (statCache) {
-            apr_thread_rwlock_rdlock(rwlock);
-            pathctx = (NXPathCtx_t) apr_hash_get(statCache, ppath, APR_HASH_KEY_STRING);
-            apr_thread_rwlock_unlock(rwlock);
-            if (pathctx) {
-                return getstat(pathctx, pinfo, buf, requestmap);
-            }
-            else {
-                int err;
-
-                err = NXCreatePathContext(0, ppath, 0, NULL, &pathctx);
-                if (!err) {
-                    apr_thread_rwlock_wrlock(rwlock);
-                    apr_hash_set(statCache, apr_pstrdup(gPool,ppath) , APR_HASH_KEY_STRING, (void*)pathctx);
-                    apr_thread_rwlock_unlock(rwlock);
-                    return getstat(pathctx, pinfo, buf, requestmap);
-                }
-            }
-        }
-    }
-    return getstat(ctx, path, buf, requestmap);
-}
-#endif
-
-APR_DECLARE(apr_status_t) apr_stat(apr_finfo_t *finfo, 
-                                   const char *fname, 
-                                   apr_int32_t wanted, apr_pool_t *pool)
-{
-    struct stat info;
-    int srv;
-    NXPathCtx_t pathCtx = 0;
-
-    getcwdpath(NULL, &pathCtx, CTX_ACTUAL_CWD);
-#ifdef APR_HAS_PSA
-	srv = getstat(pathCtx, (char*)fname, &info, ST_STAT_BITS|ST_NAME_BIT);
-#else
-    srv = cstat(pathCtx, (char*)fname, &info, ST_STAT_BITS|ST_NAME_BIT, pool);
-#endif
-    errno = srv;
-
-    if (srv == 0) {
-        finfo->pool = pool;
-        finfo->fname = fname;
-        fill_out_finfo(finfo, &info, wanted);
-        if (wanted & APR_FINFO_LINK)
-            wanted &= ~APR_FINFO_LINK;
-        if (wanted & APR_FINFO_NAME) {
-            finfo->name = apr_pstrdup(pool, info.st_name);
-            finfo->valid |= APR_FINFO_NAME;
-        }
-        return (wanted & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS;
-    }
-    else {
-#if !defined(ENOENT) || !defined(ENOTDIR)
-#error ENOENT || ENOTDIR not defined; please see the
-#error comments at this line in the source for a workaround.
-        /*
-         * If ENOENT || ENOTDIR is not defined in one of the your OS's
-         * include files, APR cannot report a good reason why the stat()
-         * of the file failed; there are cases where it can fail even though
-         * the file exists.  This opens holes in Apache, for example, because
-         * it becomes possible for someone to get a directory listing of a 
-         * directory even though there is an index (eg. index.html) file in 
-         * it.  If you do not have a problem with this, delete the above 
-         * #error lines and start the compile again.  If you need to do this,
-         * please submit a bug report to http://www.apache.org/bug_report.html
-         * letting us know that you needed to do this.  Please be sure to 
-         * include the operating system you are using.
-         */
-        /* WARNING: All errors will be handled as not found
-         */
-#if !defined(ENOENT) 
-        return APR_ENOENT;
-#else
-        /* WARNING: All errors but not found will be handled as not directory
-         */
-        if (errno != ENOENT)
-            return APR_ENOENT;
-        else
-            return errno;
-#endif
-#else /* All was defined well, report the usual: */
-        return errno;
-#endif
-    }
-}
-
-/* Perhaps this becomes nothing but a macro?
- */
-APR_DECLARE(apr_status_t) apr_lstat(apr_finfo_t *finfo, const char *fname,
-                      apr_int32_t wanted, apr_pool_t *pool)
-{
-    return apr_stat(finfo, fname, wanted | APR_FINFO_LINK, pool);
-}
-
-
-APR_DECLARE(apr_status_t) apr_file_mtime_set(const char *fname,
-                                              apr_time_t mtime,
-                                              apr_pool_t *pool)
-{
-    apr_status_t status;
-    apr_finfo_t finfo;
-
-    status = apr_stat(&finfo, fname, APR_FINFO_ATIME, pool);
-    if (!APR_STATUS_IS_SUCCESS(status)) {
-        return status;
-    }
-
-#ifdef HAVE_UTIMES
-    {
-      struct timeval tvp[2];
-    
-      tvp[0].tv_sec = apr_time_sec(finfo.atime);
-      tvp[0].tv_usec = apr_time_usec(finfo.atime);
-      tvp[1].tv_sec = apr_time_sec(mtime);
-      tvp[1].tv_usec = apr_time_usec(mtime);
-      
-      if (utimes(fname, tvp) == -1) {
-        return errno;
-      }
-    }
-#elif defined(HAVE_UTIME)
-    {
-      struct utimbuf buf;
-      
-      buf.actime = (time_t) (finfo.atime / APR_USEC_PER_SEC);
-      buf.modtime = (time_t) (mtime / APR_USEC_PER_SEC);
-      
-      if (utime(fname, &buf) == -1) {
-        return errno;
-      }
-    }
-#else
-    return APR_ENOTIMPL;
-#endif
-
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/netware/filesys.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/netware/filesys.c
deleted file mode 100644
index 05c44cec..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/netware/filesys.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_arch_file_io.h"
-#include "apr_strings.h"
-
-apr_status_t filepath_root_case(char **rootpath, char *root, apr_pool_t *p)
-{
-/* See the Windows code to figure out what to do here.
-    It probably checks to make sure that the root exists 
-    and case it correctly according to the file system.
-*/
-    *rootpath = apr_pstrdup(p, root);
-    return APR_SUCCESS;
-}
-
-apr_status_t filepath_has_drive(const char *rootpath, int only, apr_pool_t *p)
-{
-    char *s;
-
-    if (rootpath) {
-        s = strchr (rootpath, ':');
-        if (only)
-            /* Test if the path only has a drive/volume and nothing else
-            */
-            return (s && (s != rootpath) && !s[1]);
-        else
-            /* Test if the path includes a drive/volume
-            */
-            return (s && (s != rootpath));
-    }
-    return 0;
-}
-
-apr_status_t filepath_compare_drive(const char *path1, const char *path2, apr_pool_t *p)
-{
-    char *s1, *s2;
-
-    if (path1 && path2) {
-        s1 = strchr (path1, ':');
-        s2 = strchr (path2, ':');
-
-        /* Make sure that they both have a drive/volume delimiter
-            and are the same size.  Then see if they match.
-        */
-        if (s1 && s2 && ((s1-path1) == (s2-path2))) {
-            return strnicmp (s1, s2, s1-path1);
-        }
-    }
-    return -1;
-}
-
-APR_DECLARE(apr_status_t) apr_filepath_get(char **rootpath, apr_int32_t flags,
-                                           apr_pool_t *p)
-{
-    char path[APR_PATH_MAX];
-    char *ptr;
-
-    /* use getcwdpath to make sure that we get the volume name*/
-    if (!getcwdpath(path, NULL, 0)) {
-        if (errno == ERANGE)
-            return APR_ENAMETOOLONG;
-        else
-            return errno;
-    }
-    /* Strip off the server name if there is one*/
-    ptr = strpbrk(path, "\\/:");
-    if (!ptr) {
-        return APR_ENOENT;
-    }
-    if (*ptr == ':') {
-        ptr = path;
-    }
-    *rootpath = apr_pstrdup(p, ptr);
-    if (!(flags & APR_FILEPATH_NATIVE)) {
-        for (ptr = *rootpath; *ptr; ++ptr) {
-            if (*ptr == '\\')
-                *ptr = '/';
-        }
-    }
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_filepath_set(const char *rootpath,
-                                           apr_pool_t *p)
-{
-    if (chdir2(rootpath) != 0)
-        return errno;
-    return APR_SUCCESS;
-}
-
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/netware/flock.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/netware/flock.c
deleted file mode 100644
index c083a0ed..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/netware/flock.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <nks/fsio.h>
-#include "apr_arch_file_io.h"
-
-
-apr_status_t apr_file_lock(apr_file_t *thefile, int type)
-{
-	int fc;
-
-	fc = (type & APR_FLOCK_NONBLOCK) ? NX_RANGE_LOCK_TRYLOCK : NX_RANGE_LOCK_CHECK;
-
-    if(NXFileRangeLock(thefile->filedes,fc, 0, 0) == -1)
-		return errno;
-            
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_file_unlock(apr_file_t *thefile)
-{
-    if(NXFileRangeUnlock(thefile->filedes,NX_RANGE_LOCK_CANCEL,0 , 0) == -1)
-		return errno;
-   
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/netware/mktemp.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/netware/mktemp.c
deleted file mode 100644
index 2a71af7d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/netware/mktemp.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_private.h"
-#include "apr_file_io.h" /* prototype of apr_mkstemp() */
-#include "apr_strings.h" /* prototype of apr_mkstemp() */
-#include "apr_arch_file_io.h" /* prototype of apr_mkstemp() */
-#include "apr_portable.h" /* for apr_os_file_put() */
-
-#include <stdlib.h> /* for mkstemp() - Single Unix */
-
-APR_DECLARE(apr_status_t) apr_file_mktemp(apr_file_t **fp, char *template, apr_int32_t flags, apr_pool_t *p)
-{
-    int fd;
-    apr_status_t rv;
-
-    flags = (!flags) ? APR_CREATE | APR_READ | APR_WRITE |  
-                       APR_DELONCLOSE : flags & ~APR_EXCL;
-
-    fd = mkstemp(template);
-    if (fd == -1) {
-        return errno;
-    }
-    /* We need to reopen the file to get rid of the o_excl flag.
-     * Otherwise file locking will not allow the file to be shared.
-     */
-    close(fd);
-    if ((rv = apr_file_open(fp, template, flags|APR_FILE_NOCLEANUP,
-                            APR_UREAD | APR_UWRITE, p)) == APR_SUCCESS) {
-
-
-	if (!(flags & APR_FILE_NOCLEANUP)) {
-	    apr_pool_cleanup_register((*fp)->pool, (void *)(*fp),
-				      apr_unix_file_cleanup,
-				      apr_unix_child_file_cleanup);
-	}
-    }
-
-    return rv;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/netware/pipe.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/netware/pipe.c
deleted file mode 100644
index 1e573615..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/netware/pipe.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <nks/fsio.h>
-#include <nks/errno.h>
-
-#include "apr_arch_file_io.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include "apr_arch_inherit.h"
-
-static apr_status_t pipeblock(apr_file_t *thepipe)
-{
-#ifdef USE_FLAGS
-    int				err;
-	unsigned long	flags;
-
-	if (fcntl(thepipe->filedes, F_GETFL, &flags) != -1)
-	{
-		flags &= ~FNDELAY;
-		fcntl(thepipe->filedes, F_SETFL, flags);
-	}
-#else
-        errno = 0;
-		fcntl(thepipe->filedes, F_SETFL, 0);
-#endif
-
-    if (errno)
-        return errno;
-
-    thepipe->blocking = BLK_ON;
-    return APR_SUCCESS;
-}
-
-static apr_status_t pipenonblock(apr_file_t *thepipe)
-{
-#ifdef USE_FLAGS
-	int				err;
-	unsigned long	flags;
-
-    errno = 0;
-	if (fcntl(thepipe->filedes, F_GETFL, &flags) != -1)
-	{
-		flags |= FNDELAY;
-		fcntl(thepipe->filedes, F_SETFL, flags);
-	}
-#else
-        errno = 0;
-		fcntl(thepipe->filedes, F_SETFL, FNDELAY);
-#endif
-
-    if (errno)
-        return errno;
-
-    thepipe->blocking = BLK_OFF;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_file_pipe_timeout_set(apr_file_t *thepipe, apr_interval_time_t timeout)
-{
-    if (thepipe->is_pipe == 1) {
-        thepipe->timeout = timeout;
-        if (timeout >= 0) {
-            if (thepipe->blocking != BLK_OFF) { /* blocking or unknown state */
-                return pipenonblock(thepipe);
-            }
-        }
-        else {
-            if (thepipe->blocking != BLK_ON) { /* non-blocking or unknown state */
-                return pipeblock(thepipe);
-            }
-        }
-        return APR_SUCCESS;
-    }
-    return APR_EINVAL;
-}
-
-APR_DECLARE(apr_status_t) apr_file_pipe_timeout_get(apr_file_t *thepipe, apr_interval_time_t *timeout)
-{
-    if (thepipe->is_pipe == 1) {
-        *timeout = thepipe->timeout;
-        return APR_SUCCESS;
-    }
-    return APR_EINVAL;
-}
-
-APR_DECLARE(apr_status_t) apr_os_pipe_put_ex(apr_file_t **file,
-                                             apr_os_file_t *thefile,
-                                             int register_cleanup,
-                                             apr_pool_t *pool)
-{
-    int *dafile = thefile;
-    
-    (*file) = apr_pcalloc(pool, sizeof(apr_file_t));
-    (*file)->pool = pool;
-    (*file)->eof_hit = 0;
-    (*file)->is_pipe = 1;
-    (*file)->blocking = BLK_UNKNOWN; /* app needs to make a timeout call */
-    (*file)->timeout = -1;
-    (*file)->ungetchar = -1; /* no char avail */
-    (*file)->filedes = *dafile;
-    if (!register_cleanup) {
-        (*file)->flags = APR_FILE_NOCLEANUP;
-    }
-    (*file)->buffered = 0;
-#if APR_HAS_THREADS
-    (*file)->thlock = NULL;
-#endif
-    if (register_cleanup) {
-        apr_pool_cleanup_register((*file)->pool, (void *)(*file),
-                                  apr_unix_file_cleanup,
-                                  apr_pool_cleanup_null);
-    }
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_pipe_put(apr_file_t **file,
-                                          apr_os_file_t *thefile,
-                                          apr_pool_t *pool)
-{
-    return apr_os_pipe_put_ex(file, thefile, 0, pool);
-}
-
-APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, apr_file_t **out, apr_pool_t *pool)
-{
-	int     	filedes[2];
-	int 		err;
-
-    if (pipe(filedes) == -1) {
-        return errno;
-    }
-
-    (*in) = (apr_file_t *)apr_pcalloc(pool, sizeof(apr_file_t));
-    (*out) = (apr_file_t *)apr_pcalloc(pool, sizeof(apr_file_t));
-
-    (*in)->pool     =
-    (*out)->pool    = pool;
-    (*in)->filedes   = filedes[0];
-    (*out)->filedes  = filedes[1];
-    (*in)->flags     = APR_INHERIT;
-    (*out)->flags    = APR_INHERIT;
-    (*in)->is_pipe      =
-    (*out)->is_pipe     = 1;
-    (*out)->fname    = 
-    (*in)->fname     = NULL;
-    (*in)->buffered  =
-    (*out)->buffered = 0;
-    (*in)->blocking  =
-    (*out)->blocking = BLK_ON;
-    (*in)->timeout   =
-    (*out)->timeout  = -1;
-    (*in)->ungetchar = -1;
-    (*in)->thlock    =
-    (*out)->thlock   = NULL;
-
-    apr_pool_cleanup_register((*in)->pool, (void *)(*in), apr_unix_file_cleanup,
-                         apr_pool_cleanup_null);
-    apr_pool_cleanup_register((*out)->pool, (void *)(*out), apr_unix_file_cleanup,
-                         apr_pool_cleanup_null);
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_file_namedpipe_create(const char *filename, 
-                                                    apr_fileperms_t perm, apr_pool_t *pool)
-{
-    return APR_ENOTIMPL;
-} 
-
-    
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/Makefile.in
deleted file mode 100644
index a87f4242..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = \
-	dir.lo \
-	fileacc.lo \
-	filedup.lo \
-	filestat.lo \
-	open.lo \
-	pipe.lo \
-	readwrite.lo \
-	seek.lo \
-	flock.lo \
-	maperrorcode.lo \
-	fullrw.lo \
-	filepath.lo \
-	filepath_util.lo \
-	filesys.lo \
-	mktemp.lo \
-	copy.lo \
-	tempdir.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/@OSDIR@
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/copy.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/copy.c
deleted file mode 100644
index f4ce010f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/copy.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../unix/copy.c"
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/dir.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/dir.c
deleted file mode 100644
index dc194e3b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/dir.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_file_io.h"
-#include "apr_file_io.h"
-#include "apr_lib.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include <string.h>
-
-static apr_status_t dir_cleanup(void *thedir)
-{
-    apr_dir_t *dir = thedir;
-    return apr_dir_close(dir);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_dir_open(apr_dir_t **new, const char *dirname, apr_pool_t *pool)
-{
-    apr_dir_t *thedir = (apr_dir_t *)apr_palloc(pool, sizeof(apr_dir_t));
-    
-    if (thedir == NULL)
-        return APR_ENOMEM;
-    
-    thedir->pool = pool;
-    thedir->dirname = apr_pstrdup(pool, dirname);
-
-    if (thedir->dirname == NULL)
-        return APR_ENOMEM;
-
-    thedir->handle = 0;
-    thedir->validentry = FALSE;
-    *new = thedir;
-    apr_pool_cleanup_register(pool, thedir, dir_cleanup, apr_pool_cleanup_null);
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_dir_close(apr_dir_t *thedir)
-{
-    int rv = 0;
-    
-    if (thedir->handle) {
-        rv = DosFindClose(thedir->handle);
-        
-        if (rv == 0) {
-            thedir->handle = 0;
-        }
-    }
-
-    return APR_FROM_OS_ERROR(rv);
-} 
-
-
-
-APR_DECLARE(apr_status_t) apr_dir_read(apr_finfo_t *finfo, apr_int32_t wanted,
-                                       apr_dir_t *thedir)
-{
-    int rv;
-    ULONG entries = 1;
-    
-    if (thedir->handle == 0) {
-        thedir->handle = HDIR_CREATE;
-        rv = DosFindFirst(apr_pstrcat(thedir->pool, thedir->dirname, "/*", NULL), &thedir->handle, 
-                          FILE_ARCHIVED|FILE_DIRECTORY|FILE_SYSTEM|FILE_HIDDEN|FILE_READONLY, 
-                          &thedir->entry, sizeof(thedir->entry), &entries, FIL_STANDARD);
-    } else {
-        rv = DosFindNext(thedir->handle, &thedir->entry, sizeof(thedir->entry), &entries);
-    }
-
-    finfo->pool = thedir->pool;
-    finfo->fname = NULL;
-    finfo->valid = 0;
-
-    if (rv == 0 && entries == 1) {
-        thedir->validentry = TRUE;
-
-        /* We passed a name off the stack that has popped */
-        finfo->fname = NULL;
-        finfo->size = thedir->entry.cbFile;
-        finfo->csize = thedir->entry.cbFileAlloc;
-
-        /* Only directories & regular files show up in directory listings */
-        finfo->filetype = (thedir->entry.attrFile & FILE_DIRECTORY) ? APR_DIR : APR_REG;
-
-        apr_os2_time_to_apr_time(&finfo->mtime, thedir->entry.fdateLastWrite,
-                                 thedir->entry.ftimeLastWrite);
-        apr_os2_time_to_apr_time(&finfo->atime, thedir->entry.fdateLastAccess,
-                                 thedir->entry.ftimeLastAccess);
-        apr_os2_time_to_apr_time(&finfo->ctime, thedir->entry.fdateCreation,
-                                 thedir->entry.ftimeCreation);
-
-        finfo->name = thedir->entry.achName;
-        finfo->valid = APR_FINFO_NAME | APR_FINFO_MTIME | APR_FINFO_ATIME |
-            APR_FINFO_CTIME | APR_FINFO_TYPE | APR_FINFO_SIZE |
-            APR_FINFO_CSIZE;
-
-        return APR_SUCCESS;
-    }
-
-    thedir->validentry = FALSE;
-
-    if (rv)
-        return APR_FROM_OS_ERROR(rv);
-
-    return APR_ENOENT;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_dir_rewind(apr_dir_t *thedir)
-{
-    return apr_dir_close(thedir);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_dir_make(const char *path, apr_fileperms_t perm, apr_pool_t *pool)
-{
-    return APR_FROM_OS_ERROR(DosCreateDir(path, NULL));
-}
-
-
-
-apr_status_t apr_dir_make_recursive(const char *path, apr_fileperms_t perm,
-                                    apr_pool_t *pool) 
-{
-    return APR_ENOTIMPL;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_dir_remove(const char *path, apr_pool_t *pool)
-{
-    return APR_FROM_OS_ERROR(DosDeleteDir(path));
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_os_dir_get(apr_os_dir_t **thedir, apr_dir_t *dir)
-{
-    if (dir == NULL) {
-        return APR_ENODIR;
-    }
-    *thedir = &dir->handle;
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_os_dir_put(apr_dir_t **dir, apr_os_dir_t *thedir,
-                                         apr_pool_t *pool)
-{
-    if ((*dir) == NULL) {
-        (*dir) = (apr_dir_t *)apr_pcalloc(pool, sizeof(apr_dir_t));
-        (*dir)->pool = pool;
-    }
-    (*dir)->handle = *thedir;
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/fileacc.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/fileacc.c
deleted file mode 100644
index b5c1afd5..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/fileacc.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "../unix/fileacc.c"
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/filedup.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/filedup.c
deleted file mode 100644
index 0077d2d6..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/filedup.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_file_io.h"
-#include "apr_file_io.h"
-#include "apr_lib.h"
-#include "apr_strings.h"
-#include <string.h>
-#include "apr_arch_inherit.h"
-
-static apr_status_t file_dup(apr_file_t **new_file, apr_file_t *old_file, apr_pool_t *p)
-{
-    int rv;
-    apr_file_t *dup_file;
-
-    if (*new_file == NULL) {
-        dup_file = (apr_file_t *)apr_palloc(p, sizeof(apr_file_t));
-
-        if (dup_file == NULL) {
-            return APR_ENOMEM;
-        }
-
-        dup_file->filedes = -1;
-    } else {
-      dup_file = *new_file;
-    }
-
-    dup_file->pool = p;
-    rv = DosDupHandle(old_file->filedes, &dup_file->filedes);
-
-    if (rv) {
-        return APR_FROM_OS_ERROR(rv);
-    }
-
-    dup_file->fname = apr_pstrdup(dup_file->pool, old_file->fname);
-    dup_file->buffered = old_file->buffered;
-    dup_file->isopen = old_file->isopen;
-    dup_file->flags = old_file->flags & ~APR_INHERIT;
-    /* TODO - dup pipes correctly */
-    dup_file->pipe = old_file->pipe;
-
-    if (*new_file == NULL) {
-        apr_pool_cleanup_register(dup_file->pool, dup_file, apr_file_cleanup,
-                            apr_pool_cleanup_null);
-        *new_file = dup_file;
-    }
-
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_file_dup(apr_file_t **new_file, apr_file_t *old_file, apr_pool_t *p)
-{
-  if (*new_file) {
-      apr_file_close(*new_file);
-      (*new_file)->filedes = -1;
-  }
-
-  return file_dup(new_file, old_file, p);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_file_dup2(apr_file_t *new_file, apr_file_t *old_file, apr_pool_t *p)
-{
-  return file_dup(&new_file, old_file, p);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_file_setaside(apr_file_t **new_file,
-                                            apr_file_t *old_file,
-                                            apr_pool_t *p)
-{
-    *new_file = (apr_file_t *)apr_palloc(p, sizeof(apr_file_t));
-    memcpy(*new_file, old_file, sizeof(apr_file_t));
-    (*new_file)->pool = p;
-
-    if (old_file->buffered) {
-        (*new_file)->buffer = apr_palloc(p, APR_FILE_BUFSIZE);
-
-        if (old_file->direction == 1) {
-            memcpy((*new_file)->buffer, old_file->buffer, old_file->bufpos);
-        }
-        else {
-            memcpy((*new_file)->buffer, old_file->buffer, old_file->dataRead);
-        }
-
-        if (old_file->mutex) {
-            apr_thread_mutex_create(&((*new_file)->mutex),
-                                    APR_THREAD_MUTEX_DEFAULT, p);
-            apr_thread_mutex_destroy(old_file->mutex);
-        }
-    }
-
-    if (old_file->fname) {
-        (*new_file)->fname = apr_pstrdup(p, old_file->fname);
-    }
-
-    if (!(old_file->flags & APR_FILE_NOCLEANUP)) {
-        apr_pool_cleanup_register(p, (void *)(*new_file), 
-                                  apr_file_cleanup,
-                                  apr_file_cleanup);
-    }
-
-    old_file->filedes = -1;
-    apr_pool_cleanup_kill(old_file->pool, (void *)old_file,
-                          apr_file_cleanup);
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/filepath.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/filepath.c
deleted file mode 100644
index 9422faa9..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/filepath.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "../win32/filepath.c"
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/filepath_util.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/filepath_util.c
deleted file mode 100644
index a89c173e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/filepath_util.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../unix/filepath_util.c"
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/filestat.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/filestat.c
deleted file mode 100644
index 2e5dc24b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/filestat.c
+++ /dev/null
@@ -1,237 +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.
- */
-
-#define INCL_DOS
-#define INCL_DOSERRORS
-#include "apr_arch_file_io.h"
-#include "apr_file_io.h"
-#include "apr_lib.h"
-#include <sys/time.h>
-#include "apr_strings.h"
-
-
-static void FS3_to_finfo(apr_finfo_t *finfo, FILESTATUS3 *fstatus)
-{
-    finfo->protection = (fstatus->attrFile & FILE_READONLY) ? 0x555 : 0x777;
-
-    if (fstatus->attrFile & FILE_DIRECTORY)
-        finfo->filetype = APR_DIR;
-    else
-        finfo->filetype = APR_REG;
-    /* XXX: No other possible types from FS3? */
-
-    finfo->user = 0;
-    finfo->group = 0;
-    finfo->inode = 0;
-    finfo->device = 0;
-    finfo->size = fstatus->cbFile;
-    finfo->csize = fstatus->cbFileAlloc;
-    apr_os2_time_to_apr_time(&finfo->atime, fstatus->fdateLastAccess, 
-                             fstatus->ftimeLastAccess );
-    apr_os2_time_to_apr_time(&finfo->mtime, fstatus->fdateLastWrite,  
-                             fstatus->ftimeLastWrite );
-    apr_os2_time_to_apr_time(&finfo->ctime, fstatus->fdateCreation,   
-                             fstatus->ftimeCreation );
-    finfo->valid = APR_FINFO_TYPE | APR_FINFO_PROT | APR_FINFO_SIZE
-                 | APR_FINFO_CSIZE | APR_FINFO_MTIME 
-                 | APR_FINFO_CTIME | APR_FINFO_ATIME | APR_FINFO_LINK;
-}
-
-
-
-static apr_status_t handle_type(apr_filetype_e *ftype, HFILE file)
-{
-    ULONG filetype, fileattr, rc;
-
-    rc = DosQueryHType(file, &filetype, &fileattr);
-
-    if (rc == 0) {
-        switch (filetype & 0xff) {
-        case 0:
-            *ftype = APR_REG;
-            break;
-
-        case 1:
-            *ftype = APR_CHR;
-            break;
-
-        case 2:
-            *ftype = APR_PIPE;
-            break;
-
-        default:
-            /* Brian, is this correct???
-             */
-            *ftype = APR_UNKFILE;
-            break;
-        }
-
-        return APR_SUCCESS;
-    }
-    return APR_FROM_OS_ERROR(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_file_info_get(apr_finfo_t *finfo, apr_int32_t wanted, 
-                                   apr_file_t *thefile)
-{
-    ULONG rc;
-    FILESTATUS3 fstatus;
-
-    if (thefile->isopen) {
-        if (thefile->buffered) {
-            apr_status_t rv = apr_file_flush(thefile);
-
-            if (rv != APR_SUCCESS) {
-                return rv;
-            }
-        }
-
-        rc = DosQueryFileInfo(thefile->filedes, FIL_STANDARD, &fstatus, sizeof(fstatus));
-    }
-    else
-        rc = DosQueryPathInfo(thefile->fname, FIL_STANDARD, &fstatus, sizeof(fstatus));
-
-    if (rc == 0) {
-        FS3_to_finfo(finfo, &fstatus);
-        finfo->fname = thefile->fname;
-
-        if (finfo->filetype == APR_REG) {
-            if (thefile->isopen) {
-                return handle_type(&finfo->filetype, thefile->filedes);
-            }
-        } else {
-            return APR_SUCCESS;
-        }
-    }
-
-    finfo->protection = 0;
-    finfo->filetype = APR_NOFILE;
-    return APR_FROM_OS_ERROR(rc);
-}
-
-APR_DECLARE(apr_status_t) apr_file_perms_set(const char *fname, apr_fileperms_t perms)
-{
-    return APR_ENOTIMPL;
-}
-
-
-APR_DECLARE(apr_status_t) apr_stat(apr_finfo_t *finfo, const char *fname,
-                              apr_int32_t wanted, apr_pool_t *cont)
-{
-    ULONG rc;
-    FILESTATUS3 fstatus;
-    
-    finfo->protection = 0;
-    finfo->filetype = APR_NOFILE;
-    finfo->name = NULL;
-    rc = DosQueryPathInfo(fname, FIL_STANDARD, &fstatus, sizeof(fstatus));
-    
-    if (rc == 0) {
-        FS3_to_finfo(finfo, &fstatus);
-        finfo->fname = fname;
-
-        if (wanted & APR_FINFO_NAME) {
-            ULONG count = 1;
-            HDIR hDir = HDIR_SYSTEM;
-            FILEFINDBUF3 ffb;
-            rc = DosFindFirst(fname, &hDir,
-                              FILE_DIRECTORY|FILE_HIDDEN|FILE_SYSTEM|FILE_ARCHIVED,
-                              &ffb, sizeof(ffb), &count, FIL_STANDARD);
-            if (rc == 0 && count == 1) {
-                finfo->name = apr_pstrdup(cont, ffb.achName);
-                finfo->valid |= APR_FINFO_NAME;
-            }
-        }
-    } else if (rc == ERROR_INVALID_ACCESS) {
-        memset(finfo, 0, sizeof(apr_finfo_t));
-        finfo->valid = APR_FINFO_TYPE | APR_FINFO_PROT;
-        finfo->protection = 0666;
-        finfo->filetype = APR_CHR;
-
-        if (wanted & APR_FINFO_NAME) {
-            finfo->name = apr_pstrdup(cont, fname);
-            finfo->valid |= APR_FINFO_NAME;
-        }
-    } else {
-        return APR_FROM_OS_ERROR(rc);
-    }
-
-    return (wanted & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_lstat(apr_finfo_t *finfo, const char *fname,
-                                    apr_int32_t wanted, apr_pool_t *cont)
-{
-    return apr_stat(finfo, fname, wanted, cont);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_file_attrs_set(const char *fname,
-                                             apr_fileattrs_t attributes,
-                                             apr_fileattrs_t attr_mask,
-                                             apr_pool_t *cont)
-{
-    FILESTATUS3 fs3;
-    ULONG rc;
-
-    /* Don't do anything if we can't handle the requested attributes */
-    if (!(attr_mask & (APR_FILE_ATTR_READONLY
-                       | APR_FILE_ATTR_HIDDEN)))
-        return APR_SUCCESS;
-
-    rc = DosQueryPathInfo(fname, FIL_STANDARD, &fs3, sizeof(fs3));
-    if (rc == 0) {
-        ULONG old_attr = fs3.attrFile;
-
-        if (attr_mask & APR_FILE_ATTR_READONLY)
-        {
-            if (attributes & APR_FILE_ATTR_READONLY) {
-                fs3.attrFile |= FILE_READONLY;
-            } else {
-                fs3.attrFile &= ~FILE_READONLY;
-            }
-        }
-
-        if (attr_mask & APR_FILE_ATTR_HIDDEN)
-        {
-            if (attributes & APR_FILE_ATTR_HIDDEN) {
-                fs3.attrFile |= FILE_HIDDEN;
-            } else {
-                fs3.attrFile &= ~FILE_HIDDEN;
-            }
-        }
-
-        if (fs3.attrFile != old_attr) {
-            rc = DosSetPathInfo(fname, FIL_STANDARD, &fs3, sizeof(fs3), 0);
-        }
-    }
-
-    return APR_FROM_OS_ERROR(rc);
-}
-
-
-/* ### Somebody please write this! */
-APR_DECLARE(apr_status_t) apr_file_mtime_set(const char *fname,
-                                              apr_time_t mtime,
-                                              apr_pool_t *pool)
-{
-  return APR_ENOTIMPL;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/filesys.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/filesys.c
deleted file mode 100644
index ae43bc0a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/filesys.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_arch_file_io.h"
-#include "apr_strings.h"
-#include "apr_lib.h"
-#include <ctype.h>
-
-/* OS/2 Exceptions:
- *
- * Note that trailing spaces and trailing periods are never recorded
- * in the file system.
- *
- * Leading spaces and periods are accepted, however.
- * The * ? < > codes all have wildcard side effects
- * The " / \ : are exclusively component separator tokens 
- * The system doesn't accept | for any (known) purpose 
- * Oddly, \x7f _is_ acceptable ;)
- */
-
-const char c_is_fnchar[256] =
-{/* Reject all ctrl codes...                                         */
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- /*     "               *         /                      :   <   > ? */
-    1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,0, 1,1,1,1,1,1,1,1,1,1,0,1,0,1,0,0,
- /*                                                          \       */
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,
- /*                                                          |       */
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,
- /* High bit codes are accepted                                      */
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-};
-
-
-#define IS_SLASH(c) (c == '/' || c == '\\')
-
-
-apr_status_t filepath_root_test(char *path, apr_pool_t *p)
-{
-    char drive = apr_toupper(path[0]);
-
-    if (drive >= 'A' && drive <= 'Z' && path[1] == ':' && IS_SLASH(path[2]))
-        return APR_SUCCESS;
-
-    return APR_EBADPATH;
-}
-
-
-apr_status_t filepath_drive_get(char **rootpath, char drive, 
-                                apr_int32_t flags, apr_pool_t *p)
-{
-    char path[APR_PATH_MAX];
-    char *pos;
-    ULONG rc;
-    ULONG bufsize = sizeof(path) - 3;
-
-    path[0] = drive;
-    path[1] = ':';
-    path[2] = '/';
-
-    rc = DosQueryCurrentDir(apr_toupper(drive) - 'A', path+3, &bufsize);
-
-    if (rc) {
-        return APR_FROM_OS_ERROR(rc);
-    }
-
-    if (!(flags & APR_FILEPATH_NATIVE)) {
-        for (pos=path; *pos; pos++) {
-            if (*pos == '\\')
-                *pos = '/';
-        }
-    }
-
-    *rootpath = apr_pstrdup(p, path);
-    return APR_SUCCESS;
-}
-
-
-apr_status_t filepath_root_case(char **rootpath, char *root, apr_pool_t *p)
-{
-    if (root[0] && apr_islower(root[0]) && root[1] == ':') {
-        *rootpath = apr_pstrdup(p, root);
-        (*rootpath)[0] = apr_toupper((*rootpath)[0]);
-    }
-    else {
-       *rootpath = root;
-    }
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_filepath_get(char **defpath, apr_int32_t flags,
-                                           apr_pool_t *p)
-{
-    char path[APR_PATH_MAX];
-    ULONG drive;
-    ULONG drivemap;
-    ULONG rv, pathlen = sizeof(path) - 3;
-    char *pos;
-
-    DosQueryCurrentDisk(&drive, &drivemap);
-    path[0] = '@' + drive;
-    strcpy(path+1, ":\\");
-    rv = DosQueryCurrentDir(drive, path+3, &pathlen);
-
-    *defpath = apr_pstrdup(p, path);
-
-    if (!(flags & APR_FILEPATH_NATIVE)) {
-        for (pos=*defpath; *pos; pos++) {
-            if (*pos == '\\')
-                *pos = '/';
-        }
-    }
-
-    return APR_SUCCESS;
-}    
-
-
-
-APR_DECLARE(apr_status_t) apr_filepath_set(const char *path, apr_pool_t *p)
-{
-    ULONG rv = 0;
-
-    if (path[1] == ':')
-        rv = DosSetDefaultDisk(apr_toupper(path[0]) - '@');
-
-    if (rv == 0)
-        rv = DosSetCurrentDir(path);
-
-    return APR_FROM_OS_ERROR(rv);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/flock.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/flock.c
deleted file mode 100644
index ec940220..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/flock.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_file_io.h"
-
-APR_DECLARE(apr_status_t) apr_file_lock(apr_file_t *thefile, int type)
-{
-    FILELOCK lockrange = { 0, 0x7fffffff };
-    ULONG rc;
-
-    rc = DosSetFileLocks(thefile->filedes, NULL, &lockrange,
-                         (type & APR_FLOCK_NONBLOCK) ? 0 : (ULONG)-1,
-                         (type & APR_FLOCK_TYPEMASK) == APR_FLOCK_SHARED);
-    return APR_FROM_OS_ERROR(rc);
-}
-
-APR_DECLARE(apr_status_t) apr_file_unlock(apr_file_t *thefile)
-{
-    FILELOCK unlockrange = { 0, 0x7fffffff };
-    ULONG rc;
-
-    rc = DosSetFileLocks(thefile->filedes, &unlockrange, NULL, 0, 0);
-    return APR_FROM_OS_ERROR(rc);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/fullrw.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/fullrw.c
deleted file mode 100644
index cf629488..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/fullrw.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../unix/fullrw.c"
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/maperrorcode.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/maperrorcode.c
deleted file mode 100644
index 282338bb..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/maperrorcode.c
+++ /dev/null
@@ -1,95 +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.
- */
-
-#define INCL_DOSERRORS
-#include "apr_arch_file_io.h"
-#include "apr_file_io.h"
-#include <errno.h>
-#include <string.h>
-#include "apr_errno.h"
-
-static int errormap[][2] = {
-    { NO_ERROR,                   APR_SUCCESS      },
-    { ERROR_FILE_NOT_FOUND,       APR_ENOENT       },
-    { ERROR_PATH_NOT_FOUND,       APR_ENOENT       },
-    { ERROR_TOO_MANY_OPEN_FILES,  APR_EMFILE       },
-    { ERROR_ACCESS_DENIED,        APR_EACCES       },
-    { ERROR_SHARING_VIOLATION,    APR_EACCES       },
-    { ERROR_INVALID_PARAMETER,    APR_EINVAL       },
-    { ERROR_OPEN_FAILED,          APR_ENOENT       },
-    { ERROR_DISK_FULL,            APR_ENOSPC       },
-    { ERROR_FILENAME_EXCED_RANGE, APR_ENAMETOOLONG },
-    { ERROR_INVALID_FUNCTION,     APR_EINVAL       },
-    { ERROR_INVALID_HANDLE,       APR_EBADF        },
-    { ERROR_NEGATIVE_SEEK,        APR_ESPIPE       },
-    { ERROR_NO_SIGNAL_SENT,       ESRCH            },
-    { ERROR_NO_DATA,              APR_EAGAIN       },
-    { SOCEINTR,                 EINTR           },
-    { SOCEWOULDBLOCK,           EWOULDBLOCK     },
-    { SOCEINPROGRESS,           EINPROGRESS     },
-    { SOCEALREADY,              EALREADY        },
-    { SOCENOTSOCK,              ENOTSOCK        },
-    { SOCEDESTADDRREQ,          EDESTADDRREQ    },
-    { SOCEMSGSIZE,              EMSGSIZE        },
-    { SOCEPROTOTYPE,            EPROTOTYPE      },
-    { SOCENOPROTOOPT,           ENOPROTOOPT     },
-    { SOCEPROTONOSUPPORT,       EPROTONOSUPPORT },
-    { SOCESOCKTNOSUPPORT,       ESOCKTNOSUPPORT },
-    { SOCEOPNOTSUPP,            EOPNOTSUPP      },
-    { SOCEPFNOSUPPORT,          EPFNOSUPPORT    },
-    { SOCEAFNOSUPPORT,          EAFNOSUPPORT    },
-    { SOCEADDRINUSE,            EADDRINUSE      },
-    { SOCEADDRNOTAVAIL,         EADDRNOTAVAIL   },
-    { SOCENETDOWN,              ENETDOWN        },
-    { SOCENETUNREACH,           ENETUNREACH     },
-    { SOCENETRESET,             ENETRESET       },
-    { SOCECONNABORTED,          ECONNABORTED    },
-    { SOCECONNRESET,            ECONNRESET      },
-    { SOCENOBUFS,               ENOBUFS         },
-    { SOCEISCONN,               EISCONN         },
-    { SOCENOTCONN,              ENOTCONN        },
-    { SOCESHUTDOWN,             ESHUTDOWN       },
-    { SOCETOOMANYREFS,          ETOOMANYREFS    },
-    { SOCETIMEDOUT,             ETIMEDOUT       },
-    { SOCECONNREFUSED,          ECONNREFUSED    },
-    { SOCELOOP,                 ELOOP           },
-    { SOCENAMETOOLONG,          ENAMETOOLONG    },
-    { SOCEHOSTDOWN,             EHOSTDOWN       },
-    { SOCEHOSTUNREACH,          EHOSTUNREACH    },
-    { SOCENOTEMPTY,             ENOTEMPTY       },
-    { SOCEPIPE,                 EPIPE           }
-};
-
-#define MAPSIZE (sizeof(errormap)/sizeof(errormap[0]))
-
-int apr_canonical_error(apr_status_t err)
-{
-    int rv = -1, index;
-
-    if (err < APR_OS_START_SYSERR)
-        return err;
-
-    err -= APR_OS_START_SYSERR;
-
-    for (index=0; index<MAPSIZE && errormap[index][0] != err; index++);
-    
-    if (index<MAPSIZE)
-        rv = errormap[index][1];
-    else
-        fprintf(stderr, "apr_canonical_error: Unknown OS/2 error code %d\n", err );
-        
-    return rv;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/mktemp.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/mktemp.c
deleted file mode 100644
index 9e852360..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/mktemp.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../unix/mktemp.c"
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/open.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/open.c
deleted file mode 100644
index 0994e7cf..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/open.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_file_io.h"
-#include "apr_file_io.h"
-#include "apr_lib.h"
-#include "apr_portable.h"
-#include "apr_strings.h"
-#include "apr_arch_inherit.h"
-#include <string.h>
-
-apr_status_t apr_file_cleanup(void *thefile)
-{
-    apr_file_t *file = thefile;
-    return apr_file_close(file);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new, const char *fname, apr_int32_t flag,  apr_fileperms_t perm, apr_pool_t *pool)
-{
-    int oflags = 0;
-    int mflags = OPEN_FLAGS_FAIL_ON_ERROR|OPEN_SHARE_DENYNONE;
-    int rv;
-    ULONG action;
-    apr_file_t *dafile = (apr_file_t *)apr_palloc(pool, sizeof(apr_file_t));
-
-    dafile->pool = pool;
-    dafile->isopen = FALSE;
-    dafile->eof_hit = FALSE;
-    dafile->buffer = NULL;
-    dafile->flags = flag;
-    dafile->blocking = BLK_ON;
-    
-    if ((flag & APR_READ) && (flag & APR_WRITE)) {
-        mflags |= OPEN_ACCESS_READWRITE;
-    } else if (flag & APR_READ) {
-        mflags |= OPEN_ACCESS_READONLY;
-    } else if (flag & APR_WRITE) {
-        mflags |= OPEN_ACCESS_WRITEONLY;
-    } else {
-        dafile->filedes = -1;
-        return APR_EACCES;
-    }
-
-    dafile->buffered = (flag & APR_BUFFERED) > 0;
-
-    if (dafile->buffered) {
-        dafile->buffer = apr_palloc(pool, APR_FILE_BUFSIZE);
-        rv = apr_thread_mutex_create(&dafile->mutex, 0, pool);
-
-        if (rv)
-            return rv;
-    }
-
-    if (flag & APR_CREATE) {
-        oflags |= OPEN_ACTION_CREATE_IF_NEW;
-
-        if (!(flag & APR_EXCL) && !(flag & APR_TRUNCATE)) {
-            oflags |= OPEN_ACTION_OPEN_IF_EXISTS;
-        }
-    }
-    
-    if ((flag & APR_EXCL) && !(flag & APR_CREATE))
-        return APR_EACCES;
-
-    if (flag & APR_TRUNCATE) {
-        oflags |= OPEN_ACTION_REPLACE_IF_EXISTS;
-    } else if ((oflags & 0xFF) == 0) {
-        oflags |= OPEN_ACTION_OPEN_IF_EXISTS;
-    }
-    
-    rv = DosOpen(fname, &(dafile->filedes), &action, 0, 0, oflags, mflags, NULL);
-    
-    if (rv == 0 && (flag & APR_APPEND)) {
-        ULONG newptr;
-        rv = DosSetFilePtr(dafile->filedes, 0, FILE_END, &newptr );
-        
-        if (rv)
-            DosClose(dafile->filedes);
-    }
-    
-    if (rv != 0)
-        return APR_FROM_OS_ERROR(rv);
-    
-    dafile->isopen = TRUE;
-    dafile->fname = apr_pstrdup(pool, fname);
-    dafile->filePtr = 0;
-    dafile->bufpos = 0;
-    dafile->dataRead = 0;
-    dafile->direction = 0;
-    dafile->pipe = FALSE;
-
-    if (!(flag & APR_FILE_NOCLEANUP)) { 
-        apr_pool_cleanup_register(dafile->pool, dafile, apr_file_cleanup, apr_file_cleanup);
-    }
-
-    *new = dafile;
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_file_close(apr_file_t *file)
-{
-    ULONG rc;
-    apr_status_t status;
-    
-    if (file && file->isopen) {
-        apr_file_flush(file);
-        rc = DosClose(file->filedes);
-    
-        if (rc == 0) {
-            file->isopen = FALSE;
-            status = APR_SUCCESS;
-
-            if (file->flags & APR_DELONCLOSE) {
-                status = APR_FROM_OS_ERROR(DosDelete(file->fname));
-            }
-        } else {
-            return APR_FROM_OS_ERROR(rc);
-        }
-    }
-
-    if (file->buffered)
-        apr_thread_mutex_destroy(file->mutex);
-
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_file_remove(const char *path, apr_pool_t *pool)
-{
-    ULONG rc = DosDelete(path);
-    return APR_FROM_OS_ERROR(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_file_rename(const char *from_path, const char *to_path,
-                                   apr_pool_t *p)
-{
-    ULONG rc = DosMove(from_path, to_path);
-
-    if (rc == ERROR_ACCESS_DENIED || rc == ERROR_ALREADY_EXISTS) {
-        rc = DosDelete(to_path);
-
-        if (rc == 0 || rc == ERROR_FILE_NOT_FOUND) {
-            rc = DosMove(from_path, to_path);
-        }
-    }
-
-    return APR_FROM_OS_ERROR(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_os_file_get(apr_os_file_t *thefile, apr_file_t *file)
-{
-    *thefile = file->filedes;
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_os_file_put(apr_file_t **file, apr_os_file_t *thefile, apr_int32_t flags, apr_pool_t *pool)
-{
-    apr_os_file_t *dafile = thefile;
-
-    (*file) = apr_palloc(pool, sizeof(apr_file_t));
-    (*file)->pool = pool;
-    (*file)->filedes = *dafile;
-    (*file)->isopen = TRUE;
-    (*file)->eof_hit = FALSE;
-    (*file)->flags = flags;
-    (*file)->pipe = FALSE;
-    (*file)->buffered = (flags & APR_BUFFERED) > 0;
-
-    if ((*file)->buffered) {
-        apr_status_t rv;
-
-        (*file)->buffer = apr_palloc(pool, APR_FILE_BUFSIZE);
-        rv = apr_thread_mutex_create(&(*file)->mutex, 0, pool);
-
-        if (rv)
-            return rv;
-    }
-    return APR_SUCCESS;
-}    
-
-
-APR_DECLARE(apr_status_t) apr_file_eof(apr_file_t *fptr)
-{
-    if (!fptr->isopen || fptr->eof_hit == 1) {
-        return APR_EOF;
-    }
-    return APR_SUCCESS;
-}   
-
-
-APR_DECLARE(apr_status_t) apr_file_open_stderr(apr_file_t **thefile, apr_pool_t *pool)
-{
-    apr_os_file_t fd = 2;
-
-    return apr_os_file_put(thefile, &fd, 0, pool);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_file_open_stdout(apr_file_t **thefile, apr_pool_t *pool)
-{
-    apr_os_file_t fd = 1;
-
-    return apr_os_file_put(thefile, &fd, 0, pool);
-}
-
-
-APR_DECLARE(apr_status_t) apr_file_open_stdin(apr_file_t **thefile, apr_pool_t *pool)
-{
-    apr_os_file_t fd = 0;
-
-    return apr_os_file_put(thefile, &fd, 0, pool);
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(file);
-
-APR_IMPLEMENT_INHERIT_SET(file, flags, pool, apr_file_cleanup)
-
-APR_IMPLEMENT_INHERIT_UNSET(file, flags, pool, apr_file_cleanup)
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/pipe.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/pipe.c
deleted file mode 100644
index ee2b2b00..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/pipe.c
+++ /dev/null
@@ -1,177 +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.
- */
-
-#define INCL_DOSERRORS
-#include "apr_arch_file_io.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include <string.h>
-#include <process.h>
-
-APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, apr_file_t **out, apr_pool_t *pool)
-{
-    ULONG filedes[2];
-    ULONG rc, action;
-    static int id = 0;
-    char pipename[50];
-
-    sprintf(pipename, "/pipe/%d.%d", getpid(), id++);
-    rc = DosCreateNPipe(pipename, filedes, NP_ACCESS_INBOUND, NP_NOWAIT|1, 4096, 4096, 0);
-
-    if (rc)
-        return APR_FROM_OS_ERROR(rc);
-
-    rc = DosConnectNPipe(filedes[0]);
-
-    if (rc && rc != ERROR_PIPE_NOT_CONNECTED) {
-        DosClose(filedes[0]);
-        return APR_FROM_OS_ERROR(rc);
-    }
-
-    rc = DosOpen (pipename, filedes+1, &action, 0, FILE_NORMAL,
-                  OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_FAIL_IF_NEW,
-                  OPEN_ACCESS_WRITEONLY | OPEN_SHARE_DENYREADWRITE,
-                  NULL);
-
-    if (rc) {
-        DosClose(filedes[0]);
-        return APR_FROM_OS_ERROR(rc);
-    }
-
-    (*in) = (apr_file_t *)apr_palloc(pool, sizeof(apr_file_t));
-    rc = DosCreateEventSem(NULL, &(*in)->pipeSem, DC_SEM_SHARED, FALSE);
-
-    if (rc) {
-        DosClose(filedes[0]);
-        DosClose(filedes[1]);
-        return APR_FROM_OS_ERROR(rc);
-    }
-
-    rc = DosSetNPipeSem(filedes[0], (HSEM)(*in)->pipeSem, 1);
-
-    if (!rc) {
-        rc = DosSetNPHState(filedes[0], NP_WAIT);
-    }
-
-    if (rc) {
-        DosClose(filedes[0]);
-        DosClose(filedes[1]);
-        DosCloseEventSem((*in)->pipeSem);
-        return APR_FROM_OS_ERROR(rc);
-    }
-
-    (*in)->pool = pool;
-    (*in)->filedes = filedes[0];
-    (*in)->fname = apr_pstrdup(pool, pipename);
-    (*in)->isopen = TRUE;
-    (*in)->buffered = FALSE;
-    (*in)->flags = 0;
-    (*in)->pipe = 1;
-    (*in)->timeout = -1;
-    (*in)->blocking = BLK_ON;
-    apr_pool_cleanup_register(pool, *in, apr_file_cleanup, apr_pool_cleanup_null);
-
-    (*out) = (apr_file_t *)apr_palloc(pool, sizeof(apr_file_t));
-    (*out)->pool = pool;
-    (*out)->filedes = filedes[1];
-    (*out)->fname = apr_pstrdup(pool, pipename);
-    (*out)->isopen = TRUE;
-    (*out)->buffered = FALSE;
-    (*out)->flags = 0;
-    (*out)->pipe = 1;
-    (*out)->timeout = -1;
-    (*out)->blocking = BLK_ON;
-    apr_pool_cleanup_register(pool, *out, apr_file_cleanup, apr_pool_cleanup_null);
-
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_file_namedpipe_create(const char *filename, apr_fileperms_t perm, apr_pool_t *pool)
-{
-    /* Not yet implemented, interface not suitable */
-    return APR_ENOTIMPL;
-} 
-
- 
-
-APR_DECLARE(apr_status_t) apr_file_pipe_timeout_set(apr_file_t *thepipe, apr_interval_time_t timeout)
-{
-    if (thepipe->pipe == 1) {
-        thepipe->timeout = timeout;
-
-        if (thepipe->timeout >= 0) {
-            if (thepipe->blocking != BLK_OFF) {
-                thepipe->blocking = BLK_OFF;
-                return APR_FROM_OS_ERROR(DosSetNPHState(thepipe->filedes, NP_NOWAIT));
-            }
-        }
-        else if (thepipe->timeout == -1) {
-            if (thepipe->blocking != BLK_ON) {
-                thepipe->blocking = BLK_ON;
-                return APR_FROM_OS_ERROR(DosSetNPHState(thepipe->filedes, NP_WAIT));
-            }
-        }
-    }
-    return APR_EINVAL;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_file_pipe_timeout_get(apr_file_t *thepipe, apr_interval_time_t *timeout)
-{
-    if (thepipe->pipe == 1) {
-        *timeout = thepipe->timeout;
-        return APR_SUCCESS;
-    }
-    return APR_EINVAL;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_os_pipe_put_ex(apr_file_t **file,
-                                             apr_os_file_t *thefile,
-                                             int register_cleanup,
-                                             apr_pool_t *pool)
-{
-    (*file) = apr_pcalloc(pool, sizeof(apr_file_t));
-    (*file)->pool = pool;
-    (*file)->isopen = TRUE;
-    (*file)->pipe = 1;
-    (*file)->blocking = BLK_UNKNOWN; /* app needs to make a timeout call */
-    (*file)->timeout = -1;
-    (*file)->filedes = *thefile;
-
-    if (register_cleanup) {
-        apr_pool_cleanup_register(pool, *file, apr_file_cleanup,
-                                  apr_pool_cleanup_null);
-    }
-
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_os_pipe_put(apr_file_t **file,
-                                          apr_os_file_t *thefile,
-                                          apr_pool_t *pool)
-{
-    return apr_os_pipe_put_ex(file, thefile, 0, pool);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/readwrite.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/readwrite.c
deleted file mode 100644
index f25a4210..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/readwrite.c
+++ /dev/null
@@ -1,370 +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.
- */
-
-#define INCL_DOS
-#define INCL_DOSERRORS
-
-#include "apr_arch_file_io.h"
-#include "apr_file_io.h"
-#include "apr_lib.h"
-#include "apr_strings.h"
-
-#include <malloc.h>
-
-APR_DECLARE(apr_status_t) apr_file_read(apr_file_t *thefile, void *buf, apr_size_t *nbytes)
-{
-    ULONG rc = 0;
-    ULONG bytesread;
-
-    if (!thefile->isopen) {
-        *nbytes = 0;
-        return APR_EBADF;
-    }
-
-    if (thefile->buffered) {
-        char *pos = (char *)buf;
-        ULONG blocksize;
-        ULONG size = *nbytes;
-
-        apr_thread_mutex_lock(thefile->mutex);
-
-        if (thefile->direction == 1) {
-            int rv = apr_file_flush(thefile);
-
-            if (rv != APR_SUCCESS) {
-                apr_thread_mutex_unlock(thefile->mutex);
-                return rv;
-            }
-
-            thefile->bufpos = 0;
-            thefile->direction = 0;
-            thefile->dataRead = 0;
-        }
-
-        while (rc == 0 && size > 0) {
-            if (thefile->bufpos >= thefile->dataRead) {
-                ULONG bytesread;
-                rc = DosRead(thefile->filedes, thefile->buffer,
-                             APR_FILE_BUFSIZE, &bytesread);
-
-                if (bytesread == 0) {
-                    if (rc == 0)
-                        thefile->eof_hit = TRUE;
-                    break;
-                }
-
-                thefile->dataRead = bytesread;
-                thefile->filePtr += thefile->dataRead;
-                thefile->bufpos = 0;
-            }
-
-            blocksize = size > thefile->dataRead - thefile->bufpos ? thefile->dataRead - thefile->bufpos : size;
-            memcpy(pos, thefile->buffer + thefile->bufpos, blocksize);
-            thefile->bufpos += blocksize;
-            pos += blocksize;
-            size -= blocksize;
-        }
-
-        *nbytes = rc == 0 ? pos - (char *)buf : 0;
-        apr_thread_mutex_unlock(thefile->mutex);
-
-        if (*nbytes == 0 && rc == 0 && thefile->eof_hit) {
-            return APR_EOF;
-        }
-
-        return APR_FROM_OS_ERROR(rc);
-    } else {
-        if (thefile->pipe)
-            DosResetEventSem(thefile->pipeSem, &rc);
-
-        rc = DosRead(thefile->filedes, buf, *nbytes, &bytesread);
-
-        if (rc == ERROR_NO_DATA && thefile->timeout != 0) {
-            int rcwait = DosWaitEventSem(thefile->pipeSem, thefile->timeout >= 0 ? thefile->timeout / 1000 : SEM_INDEFINITE_WAIT);
-
-            if (rcwait == 0) {
-                rc = DosRead(thefile->filedes, buf, *nbytes, &bytesread);
-            }
-            else if (rcwait == ERROR_TIMEOUT) {
-                *nbytes = 0;
-                return APR_TIMEUP;
-            }
-        }
-
-        if (rc) {
-            *nbytes = 0;
-            return APR_FROM_OS_ERROR(rc);
-        }
-
-        *nbytes = bytesread;
-        
-        if (bytesread == 0) {
-            thefile->eof_hit = TRUE;
-            return APR_EOF;
-        }
-
-        return APR_SUCCESS;
-    }
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_file_write(apr_file_t *thefile, const void *buf, apr_size_t *nbytes)
-{
-    ULONG rc = 0;
-    ULONG byteswritten;
-
-    if (!thefile->isopen) {
-        *nbytes = 0;
-        return APR_EBADF;
-    }
-
-    if (thefile->buffered) {
-        char *pos = (char *)buf;
-        int blocksize;
-        int size = *nbytes;
-
-        apr_thread_mutex_lock(thefile->mutex);
-
-        if ( thefile->direction == 0 ) {
-            // Position file pointer for writing at the offset we are logically reading from
-            ULONG offset = thefile->filePtr - thefile->dataRead + thefile->bufpos;
-            if (offset != thefile->filePtr)
-                DosSetFilePtr(thefile->filedes, offset, FILE_BEGIN, &thefile->filePtr );
-            thefile->bufpos = thefile->dataRead = 0;
-            thefile->direction = 1;
-        }
-
-        while (rc == 0 && size > 0) {
-            if (thefile->bufpos == APR_FILE_BUFSIZE)   // write buffer is full
-                rc = apr_file_flush(thefile);
-
-            blocksize = size > APR_FILE_BUFSIZE - thefile->bufpos ? APR_FILE_BUFSIZE - thefile->bufpos : size;
-            memcpy(thefile->buffer + thefile->bufpos, pos, blocksize);
-            thefile->bufpos += blocksize;
-            pos += blocksize;
-            size -= blocksize;
-        }
-
-        apr_thread_mutex_unlock(thefile->mutex);
-        return APR_FROM_OS_ERROR(rc);
-    } else {
-        if (thefile->flags & APR_APPEND) {
-            FILELOCK all = { 0, 0x7fffffff };
-            ULONG newpos;
-            rc = DosSetFileLocks(thefile->filedes, NULL, &all, -1, 0);
-
-            if (rc == 0) {
-                rc = DosSetFilePtr(thefile->filedes, 0, FILE_END, &newpos);
-
-                if (rc == 0) {
-                    rc = DosWrite(thefile->filedes, buf, *nbytes, &byteswritten);
-                }
-
-                DosSetFileLocks(thefile->filedes, &all, NULL, -1, 0);
-            }
-        } else {
-            rc = DosWrite(thefile->filedes, buf, *nbytes, &byteswritten);
-        }
-
-        if (rc) {
-            *nbytes = 0;
-            return APR_FROM_OS_ERROR(rc);
-        }
-
-        *nbytes = byteswritten;
-        return APR_SUCCESS;
-    }
-}
-
-
-
-#ifdef HAVE_WRITEV
-
-APR_DECLARE(apr_status_t) apr_file_writev(apr_file_t *thefile, const struct iovec *vec, apr_size_t nvec, apr_size_t *nbytes)
-{
-    int bytes;
-    if ((bytes = writev(thefile->filedes, vec, nvec)) < 0) {
-        *nbytes = 0;
-        return errno;
-    }
-    else {
-        *nbytes = bytes;
-        return APR_SUCCESS;
-    }
-}
-#endif
-
-
-
-APR_DECLARE(apr_status_t) apr_file_putc(char ch, apr_file_t *thefile)
-{
-    ULONG rc;
-    ULONG byteswritten;
-
-    if (!thefile->isopen) {
-        return APR_EBADF;
-    }
-
-    rc = DosWrite(thefile->filedes, &ch, 1, &byteswritten);
-
-    if (rc) {
-        return APR_FROM_OS_ERROR(rc);
-    }
-    
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_file_ungetc(char ch, apr_file_t *thefile)
-{
-    apr_off_t offset = -1;
-    return apr_file_seek(thefile, APR_CUR, &offset);
-}
-
-
-APR_DECLARE(apr_status_t) apr_file_getc(char *ch, apr_file_t *thefile)
-{
-    ULONG rc;
-    apr_size_t bytesread;
-
-    if (!thefile->isopen) {
-        return APR_EBADF;
-    }
-
-    bytesread = 1;
-    rc = apr_file_read(thefile, ch, &bytesread);
-
-    if (rc) {
-        return rc;
-    }
-    
-    if (bytesread == 0) {
-        thefile->eof_hit = TRUE;
-        return APR_EOF;
-    }
-    
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_file_puts(const char *str, apr_file_t *thefile)
-{
-    apr_size_t len;
-
-    len = strlen(str);
-    return apr_file_write(thefile, str, &len); 
-}
-
-
-APR_DECLARE(apr_status_t) apr_file_flush(apr_file_t *thefile)
-{
-    if (thefile->buffered) {
-        ULONG written = 0;
-        int rc = 0;
-
-        if (thefile->direction == 1 && thefile->bufpos) {
-            rc = DosWrite(thefile->filedes, thefile->buffer, thefile->bufpos, &written);
-            thefile->filePtr += written;
-
-            if (rc == 0)
-                thefile->bufpos = 0;
-        }
-
-        return APR_FROM_OS_ERROR(rc);
-    } else {
-        /* There isn't anything to do if we aren't buffering the output
-         * so just return success.
-         */
-        return APR_SUCCESS;
-    }
-}
-
-
-APR_DECLARE(apr_status_t) apr_file_gets(char *str, int len, apr_file_t *thefile)
-{
-    apr_size_t readlen;
-    apr_status_t rv = APR_SUCCESS;
-    int i;    
-
-    for (i = 0; i < len-1; i++) {
-        readlen = 1;
-        rv = apr_file_read(thefile, str+i, &readlen);
-
-        if (rv != APR_SUCCESS) {
-            break;
-        }
-
-        if (readlen != 1) {
-            rv = APR_EOF;
-            break;
-        }
-        
-        if (str[i] == '\n') {
-            i++;
-            break;
-        }
-    }
-    str[i] = 0;
-    if (i > 0) {
-        /* we stored chars; don't report EOF or any other errors;
-         * the app will find out about that on the next call
-         */
-        return APR_SUCCESS;
-    }
-    return rv;
-}
-
-
-
-APR_DECLARE_NONSTD(int) apr_file_printf(apr_file_t *fptr, 
-                                        const char *format, ...)
-{
-    int cc;
-    va_list ap;
-    char *buf;
-    int len;
-
-    buf = malloc(HUGE_STRING_LEN);
-    if (buf == NULL) {
-        return 0;
-    }
-    va_start(ap, format);
-    len = apr_vsnprintf(buf, HUGE_STRING_LEN, format, ap);
-    cc = apr_file_puts(buf, fptr);
-    va_end(ap);
-    free(buf);
-    return (cc == APR_SUCCESS) ? len : -1;
-}
-
-
-
-apr_status_t apr_file_check_read(apr_file_t *fd)
-{
-    int rc;
-
-    if (!fd->pipe)
-        return APR_SUCCESS; /* Not a pipe, assume no waiting */
-
-    rc = DosWaitEventSem(fd->pipeSem, SEM_IMMEDIATE_RETURN);
-
-    if (rc == ERROR_TIMEOUT)
-        return APR_TIMEUP;
-
-    return APR_FROM_OS_ERROR(rc);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/seek.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/seek.c
deleted file mode 100644
index 6fdfe8e8..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/seek.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_file_io.h"
-#include "apr_file_io.h"
-#include "apr_lib.h"
-#include <string.h>
-#include <io.h>
-
-
-static apr_status_t setptr(apr_file_t *thefile, unsigned long pos )
-{
-    long newbufpos;
-    ULONG rc;
-
-    if (thefile->direction == 1) {
-        apr_status_t rv = apr_file_flush(thefile);
-
-        if (rv != APR_SUCCESS) {
-            return rv;
-        }
-
-        thefile->bufpos = thefile->direction = thefile->dataRead = 0;
-    }
-
-    newbufpos = pos - (thefile->filePtr - thefile->dataRead);
-    if (newbufpos >= 0 && newbufpos <= thefile->dataRead) {
-        thefile->bufpos = newbufpos;
-        rc = 0;
-    } else {
-        rc = DosSetFilePtr(thefile->filedes, pos, FILE_BEGIN, &thefile->filePtr );
-
-        if ( !rc )
-            thefile->bufpos = thefile->dataRead = 0;
-    }
-
-    return APR_FROM_OS_ERROR(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_file_seek(apr_file_t *thefile, apr_seek_where_t where, apr_off_t *offset)
-{
-    if (!thefile->isopen) {
-        return APR_EBADF;
-    }
-
-    thefile->eof_hit = 0;
-
-    if (thefile->buffered) {
-        int rc = EINVAL;
-        apr_finfo_t finfo;
-
-        switch (where) {
-        case APR_SET:
-            rc = setptr(thefile, *offset);
-            break;
-
-        case APR_CUR:
-            rc = setptr(thefile, thefile->filePtr - thefile->dataRead + thefile->bufpos + *offset);
-            break;
-
-        case APR_END:
-            rc = apr_file_info_get(&finfo, APR_FINFO_NORM, thefile);
-            if (rc == APR_SUCCESS)
-                rc = setptr(thefile, finfo.size + *offset);
-            break;
-        }
-
-        *offset = thefile->filePtr - thefile->dataRead + thefile->bufpos;
-        return rc;
-    } else {
-        switch (where) {
-        case APR_SET:
-            where = FILE_BEGIN;
-            break;
-
-        case APR_CUR:
-            where = FILE_CURRENT;
-            break;
-
-        case APR_END:
-            where = FILE_END;
-            break;
-        }
-
-        return APR_FROM_OS_ERROR(DosSetFilePtr(thefile->filedes, *offset, where, (ULONG *)offset));
-    }
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_file_trunc(apr_file_t *fp, apr_off_t offset)
-{
-    int rc = DosSetFileSize(fp->filedes, offset);
-
-    if (rc != 0) {
-        return APR_FROM_OS_ERROR(rc);
-    }
-
-    if (fp->buffered) {
-        return setptr(fp, offset);
-    }
-
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/tempdir.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/tempdir.c
deleted file mode 100644
index 6823569f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/os2/tempdir.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../unix/tempdir.c"
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/copy.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/copy.o
deleted file mode 100644
index 54e9342c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/copy.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/dir.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/dir.o
deleted file mode 100644
index 69530d7f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/dir.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/fileacc.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/fileacc.o
deleted file mode 100644
index c4088154..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/fileacc.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/filedup.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/filedup.o
deleted file mode 100644
index 61d2ea9c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/filedup.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/filepath.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/filepath.o
deleted file mode 100644
index fac1cc59..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/filepath.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/filepath_util.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/filepath_util.o
deleted file mode 100644
index 23562757..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/filepath_util.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/filestat.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/filestat.o
deleted file mode 100644
index ba786fdd..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/filestat.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/flock.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/flock.o
deleted file mode 100644
index 7c6cc570..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/flock.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/fullrw.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/fullrw.o
deleted file mode 100644
index 56b12074..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/fullrw.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/mktemp.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/mktemp.o
deleted file mode 100644
index b029da25..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/mktemp.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/open.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/open.o
deleted file mode 100644
index c0c5a246..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/open.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/pipe.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/pipe.o
deleted file mode 100644
index 3833ae8b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/pipe.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/readwrite.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/readwrite.o
deleted file mode 100644
index ae68e124..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/readwrite.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/seek.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/seek.o
deleted file mode 100644
index 33128c10..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/seek.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/tempdir.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/tempdir.o
deleted file mode 100644
index 5faa35fc..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/.libs/tempdir.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/Makefile
deleted file mode 100644
index f6108fab..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-srcdir = .
-
-
-TARGETS = \
-	copy.lo \
-	dir.lo \
-	fileacc.lo \
-	filedup.lo \
-	filepath.lo \
-	filepath_util.lo \
-	filestat.lo \
-	flock.lo \
-	fullrw.lo \
-	open.lo \
-	pipe.lo \
-	readwrite.lo \
-	seek.lo \
-	mktemp.lo \
-	tempdir.lo
-
-# bring in rules.mk for standard functionality
-include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/unix
-DEFOSDIR=$(INCDIR)/arch/unix
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/Makefile.in
deleted file mode 100644
index fbc93b1c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = \
-	copy.lo \
-	dir.lo \
-	fileacc.lo \
-	filedup.lo \
-	filepath.lo \
-	filepath_util.lo \
-	filestat.lo \
-	flock.lo \
-	fullrw.lo \
-	open.lo \
-	pipe.lo \
-	readwrite.lo \
-	seek.lo \
-	mktemp.lo \
-	tempdir.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/@OSDIR@
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/copy.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/copy.c
deleted file mode 100644
index e68322c5..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/copy.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_file_io.h"
-#include "apr_file_io.h"
-
-static apr_status_t apr_file_transfer_contents(const char *from_path,
-                                               const char *to_path,
-                                               apr_int32_t flags,
-                                               apr_fileperms_t to_perms,
-                                               apr_pool_t *pool)
-{
-    apr_file_t *s, *d;
-    apr_status_t status;
-    apr_fileperms_t perms;
-
-    /* Open source file. */
-    status = apr_file_open(&s, from_path, APR_READ | APR_LARGEFILE, 
-                           APR_OS_DEFAULT, pool);
-    if (status)
-        return status;
-
-    /* Maybe get its permissions. */
-    if (to_perms == APR_FILE_SOURCE_PERMS) {
-#if defined(HAVE_FSTAT64) && defined(O_LARGEFILE) && SIZEOF_OFF_T == 4
-        struct stat64 st;
-
-        if (fstat64(s->filedes, &st) != 0)
-            return errno;
-
-        perms = apr_unix_mode2perms(st.st_mode);  
-#else
-        apr_finfo_t finfo;
-
-        status = apr_file_info_get(&finfo, APR_FINFO_PROT, s);
-        if (status != APR_SUCCESS && status != APR_INCOMPLETE) {
-            apr_file_close(s);  /* toss any error */
-            return status;
-        }
-        perms = finfo.protection;
-#endif
-    }
-    else
-        perms = to_perms;
-
-    /* Open dest file. */
-    status = apr_file_open(&d, to_path, flags, perms, pool);
-    if (status) {
-        apr_file_close(s);  /* toss any error */
-        return status;
-    }
-
-#if BUFSIZ > APR_FILE_DEFAULT_BUFSIZE
-#define COPY_BUFSIZ BUFSIZ
-#else
-#define COPY_BUFSIZ APR_FILE_DEFAULT_BUFSIZE
-#endif
-
-    /* Copy bytes till the cows come home. */
-    while (1) {
-        char buf[COPY_BUFSIZ];
-        apr_size_t bytes_this_time = sizeof(buf);
-        apr_status_t read_err;
-        apr_status_t write_err;
-
-        /* Read 'em. */
-        read_err = apr_file_read(s, buf, &bytes_this_time);
-        if (read_err && !APR_STATUS_IS_EOF(read_err)) {
-            apr_file_close(s);  /* toss any error */
-            apr_file_close(d);  /* toss any error */
-            return read_err;
-        }
-
-        /* Write 'em. */
-        write_err = apr_file_write_full(d, buf, bytes_this_time, NULL);
-        if (write_err) {
-            apr_file_close(s);  /* toss any error */
-            apr_file_close(d);  /* toss any error */
-            return write_err;
-        }
-
-        if (read_err && APR_STATUS_IS_EOF(read_err)) {
-            status = apr_file_close(s);
-            if (status) {
-                apr_file_close(d);  /* toss any error */
-                return status;
-            }
-
-            /* return the results of this close: an error, or success */
-            return apr_file_close(d);
-        }
-    }
-    /* NOTREACHED */
-}
-
-APR_DECLARE(apr_status_t) apr_file_copy(const char *from_path,
-                                        const char *to_path,
-                                        apr_fileperms_t perms,
-                                        apr_pool_t *pool)
-{
-    return apr_file_transfer_contents(from_path, to_path,
-                                      (APR_WRITE | APR_CREATE | APR_TRUNCATE
-                                       | APR_LARGEFILE),
-                                      perms,
-                                      pool);
-}
-
-APR_DECLARE(apr_status_t) apr_file_append(const char *from_path,
-                                          const char *to_path,
-                                          apr_fileperms_t perms,
-                                          apr_pool_t *pool)
-{
-    return apr_file_transfer_contents(from_path, to_path,
-                                      (APR_WRITE | APR_CREATE | APR_APPEND 
-                                       | APR_LARGEFILE),
-                                      perms,
-                                      pool);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/copy.lo b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/copy.lo
deleted file mode 100644
index 968e921c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/copy.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# copy.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/copy.o'
-
-# Name of the non-PIC object.
-non_pic_object='copy.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/copy.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/copy.o
deleted file mode 100644
index e9f93c51..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/copy.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/dir.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/dir.c
deleted file mode 100644
index c42002a0..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/dir.c
+++ /dev/null
@@ -1,323 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_file_io.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-#if APR_HAVE_SYS_SYSLIMITS_H
-#include <sys/syslimits.h>
-#endif
-#if APR_HAVE_LIMITS_H
-#include <limits.h>
-#endif
-
-static apr_status_t dir_cleanup(void *thedir)
-{
-    apr_dir_t *dir = thedir;
-    if (closedir(dir->dirstruct) == 0) {
-        return APR_SUCCESS;
-    }
-    else {
-        return errno;
-    }
-} 
-
-#define PATH_SEPARATOR '/'
-
-/* Remove trailing separators that don't affect the meaning of PATH. */
-static const char *path_canonicalize (const char *path, apr_pool_t *pool)
-{
-    /* At some point this could eliminate redundant components.  For
-     * now, it just makes sure there is no trailing slash. */
-    apr_size_t len = strlen (path);
-    apr_size_t orig_len = len;
-    
-    while ((len > 0) && (path[len - 1] == PATH_SEPARATOR))
-        len--;
-    
-    if (len != orig_len)
-        return apr_pstrndup (pool, path, len);
-    else
-        return path;
-}
-
-/* Remove one component off the end of PATH. */
-static char *path_remove_last_component (const char *path, apr_pool_t *pool)
-{
-    const char *newpath = path_canonicalize (path, pool);
-    int i;
-    
-    for (i = (strlen(newpath) - 1); i >= 0; i--) {
-        if (path[i] == PATH_SEPARATOR)
-            break;
-    }
-
-    return apr_pstrndup (pool, path, (i < 0) ? 0 : i);
-}
-
-apr_status_t apr_dir_open(apr_dir_t **new, const char *dirname, 
-                          apr_pool_t *pool)
-{
-    /* On some platforms (e.g., Linux+GNU libc), d_name[] in struct 
-     * dirent is declared with enough storage for the name.  On other
-     * platforms (e.g., Solaris 8 for Intel), d_name is declared as a
-     * one-byte array.  Note: gcc evaluates this at compile time.
-     */
-    apr_size_t dirent_size = 
-        (sizeof((*new)->entry->d_name) > 1 ? 
-         sizeof(struct dirent) : sizeof (struct dirent) + 255);
-
-    (*new) = (apr_dir_t *)apr_palloc(pool, sizeof(apr_dir_t));
-
-    (*new)->pool = pool;
-    (*new)->dirname = apr_pstrdup(pool, dirname);
-    (*new)->dirstruct = opendir(dirname);
-    (*new)->entry = apr_pcalloc(pool, dirent_size);
-
-    if ((*new)->dirstruct == NULL) {
-        return errno;
-    }    
-    else {
-        apr_pool_cleanup_register((*new)->pool, (void *)(*new), dir_cleanup,
-	                          apr_pool_cleanup_null);
-        return APR_SUCCESS;
-    }
-}
-
-apr_status_t apr_dir_close(apr_dir_t *thedir)
-{
-    return apr_pool_cleanup_run(thedir->pool, thedir, dir_cleanup);
-}
-
-#ifdef DIRENT_TYPE
-static apr_filetype_e filetype_from_dirent_type(int type)
-{
-    switch (type) {
-    case DT_REG:
-        return APR_REG;
-    case DT_DIR:
-        return APR_DIR;
-    case DT_LNK:
-        return APR_LNK;
-    case DT_CHR:
-        return APR_CHR;
-    case DT_BLK:
-        return APR_BLK;
-#if defined(DT_FIFO)
-    case DT_FIFO:
-        return APR_PIPE;
-#endif
-#if !defined(BEOS) && defined(DT_SOCK)
-    case DT_SOCK:
-        return APR_SOCK;
-#endif
-    default:
-        return APR_UNKFILE;
-    }
-}
-#endif
-
-apr_status_t apr_dir_read(apr_finfo_t *finfo, apr_int32_t wanted,
-                          apr_dir_t *thedir)
-{
-    apr_status_t ret = 0;
-#ifdef DIRENT_TYPE
-    apr_filetype_e type;
-#endif
-#if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) \
-                    && !defined(READDIR_IS_THREAD_SAFE)
-    struct dirent *retent;
-
-    ret = readdir_r(thedir->dirstruct, thedir->entry, &retent);
-
-    /* Avoid the Linux problem where at end-of-directory thedir->entry
-     * is set to NULL, but ret = APR_SUCCESS.
-     */
-    if(!ret && thedir->entry != retent)
-        ret = APR_ENOENT;
-
-    /* Solaris is a bit strange, if there are no more entries in the
-     * directory, it returns EINVAL.  Since this is against POSIX, we
-     * hack around the problem here.  EINVAL is possible from other
-     * readdir implementations, but only if the result buffer is too small.
-     * since we control the size of that buffer, we should never have
-     * that problem.
-     */
-    if (ret == EINVAL) {
-        ret = ENOENT;
-    }
-#else
-    /* We're about to call a non-thread-safe readdir() that may
-       possibly set `errno', and the logic below actually cares about
-       errno after the call.  Therefore we need to clear errno first. */
-    errno = 0;
-    thedir->entry = readdir(thedir->dirstruct);
-    if (thedir->entry == NULL) {
-        /* If NULL was returned, this can NEVER be a success. Can it?! */
-        if (errno == APR_SUCCESS) {
-            ret = APR_ENOENT;
-        }
-        else
-            ret = errno;
-    }
-#endif
-
-    /* No valid bit flag to test here - do we want one? */
-    finfo->fname = NULL;
-
-    if (ret) {
-        finfo->valid = 0;
-        return ret;
-    }
-
-#ifdef DIRENT_TYPE
-    type = filetype_from_dirent_type(thedir->entry->DIRENT_TYPE);
-    if (type != APR_UNKFILE) {
-        wanted &= ~APR_FINFO_TYPE;
-    }
-#endif
-#ifdef DIRENT_INODE
-    if (thedir->entry->DIRENT_INODE && thedir->entry->DIRENT_INODE != -1) {
-        wanted &= ~APR_FINFO_INODE;
-    }
-#endif
-
-    wanted &= ~APR_FINFO_NAME;
-
-    if (wanted)
-    {
-        char fspec[APR_PATH_MAX];
-        int off;
-        apr_cpystrn(fspec, thedir->dirname, sizeof(fspec));
-        off = strlen(fspec);
-        if ((fspec[off - 1] != '/') && (off + 1 < sizeof(fspec)))
-            fspec[off++] = '/';
-        apr_cpystrn(fspec + off, thedir->entry->d_name, sizeof(fspec) - off);
-        ret = apr_lstat(finfo, fspec, wanted, thedir->pool);
-        /* We passed a stack name that will disappear */
-        finfo->fname = NULL;
-    }
-
-    if (wanted && (ret == APR_SUCCESS || ret == APR_INCOMPLETE)) {
-        wanted &= ~finfo->valid;
-    }
-    else {
-        /* We don't bail because we fail to stat, when we are only -required-
-         * to readdir... but the result will be APR_INCOMPLETE
-         */
-        finfo->pool = thedir->pool;
-        finfo->valid = 0;
-#ifdef DIRENT_TYPE
-        if (type != APR_UNKFILE) {
-            finfo->filetype = type;
-            finfo->valid |= APR_FINFO_TYPE;
-        }
-#endif
-#ifdef DIRENT_INODE
-        if (thedir->entry->DIRENT_INODE && thedir->entry->DIRENT_INODE != -1) {
-            finfo->inode = thedir->entry->DIRENT_INODE;
-            finfo->valid |= APR_FINFO_INODE;
-        }
-#endif
-    }
-
-    finfo->name = apr_pstrdup(thedir->pool, thedir->entry->d_name);
-    finfo->valid |= APR_FINFO_NAME;
-
-    if (wanted)
-        return APR_INCOMPLETE;
-
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_dir_rewind(apr_dir_t *thedir)
-{
-    rewinddir(thedir->dirstruct);
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_dir_make(const char *path, apr_fileperms_t perm, 
-                          apr_pool_t *pool)
-{
-    mode_t mode = apr_unix_perms2mode(perm);
-
-    if (mkdir(path, mode) == 0) {
-        return APR_SUCCESS;
-    }
-    else {
-        return errno;
-    }
-}
-
-apr_status_t apr_dir_make_recursive(const char *path, apr_fileperms_t perm,
-                                           apr_pool_t *pool) 
-{
-    apr_status_t apr_err = 0;
-    
-    apr_err = apr_dir_make (path, perm, pool); /* Try to make PATH right out */
-    
-    if (apr_err == EEXIST) /* It's OK if PATH exists */
-        return APR_SUCCESS;
-    
-    if (apr_err == ENOENT) { /* Missing an intermediate dir */
-        char *dir;
-        
-        dir = path_remove_last_component(path, pool);
-        /* If there is no path left, give up. */
-        if (dir[0] == '\0') {
-            return apr_err;
-        }
-
-        apr_err = apr_dir_make_recursive(dir, perm, pool);
-        
-        if (!apr_err) 
-            apr_err = apr_dir_make (path, perm, pool);
-    }
-
-    return apr_err;
-}
-
-apr_status_t apr_dir_remove(const char *path, apr_pool_t *pool)
-{
-    if (rmdir(path) == 0) {
-        return APR_SUCCESS;
-    }
-    else {
-        return errno;
-    }
-}
-
-apr_status_t apr_os_dir_get(apr_os_dir_t **thedir, apr_dir_t *dir)
-{
-    if (dir == NULL) {
-        return APR_ENODIR;
-    }
-    *thedir = dir->dirstruct;
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_os_dir_put(apr_dir_t **dir, apr_os_dir_t *thedir,
-                          apr_pool_t *pool)
-{
-    if ((*dir) == NULL) {
-        (*dir) = (apr_dir_t *)apr_pcalloc(pool, sizeof(apr_dir_t));
-        (*dir)->pool = pool;
-    }
-    (*dir)->dirstruct = thedir;
-    return APR_SUCCESS;
-}
-
-  
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/dir.lo b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/dir.lo
deleted file mode 100644
index a076bba3..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/dir.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# dir.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/dir.o'
-
-# Name of the non-PIC object.
-non_pic_object='dir.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/dir.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/dir.o
deleted file mode 100644
index b6f07689..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/dir.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/fileacc.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/fileacc.c
deleted file mode 100644
index 437f3589..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/fileacc.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_strings.h"
-#include "apr_arch_file_io.h"
-
-/* A file to put ALL of the accessor functions for apr_file_t types. */
-
-APR_DECLARE(apr_status_t) apr_file_name_get(const char **fname,
-                                           apr_file_t *thefile)
-{
-    *fname = thefile->fname;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_int32_t) apr_file_flags_get(apr_file_t *f)
-{
-    return f->flags;
-}
-
-#if !defined(OS2) && !defined(WIN32)
-mode_t apr_unix_perms2mode(apr_fileperms_t perms)
-{
-    mode_t mode = 0;
-
-    if (perms & APR_USETID)
-        mode |= S_ISUID;
-    if (perms & APR_UREAD)
-        mode |= S_IRUSR;
-    if (perms & APR_UWRITE)
-        mode |= S_IWUSR;
-    if (perms & APR_UEXECUTE)
-        mode |= S_IXUSR;
-
-    if (perms & APR_GSETID)
-        mode |= S_ISGID;
-    if (perms & APR_GREAD)
-        mode |= S_IRGRP;
-    if (perms & APR_GWRITE)
-        mode |= S_IWGRP;
-    if (perms & APR_GEXECUTE)
-        mode |= S_IXGRP;
-
-#ifdef S_ISVTX
-    if (perms & APR_WSTICKY)
-        mode |= S_ISVTX;
-#endif
-    if (perms & APR_WREAD)
-        mode |= S_IROTH;
-    if (perms & APR_WWRITE)
-        mode |= S_IWOTH;
-    if (perms & APR_WEXECUTE)
-        mode |= S_IXOTH;
-
-    return mode;
-}
-
-apr_fileperms_t apr_unix_mode2perms(mode_t mode)
-{
-    apr_fileperms_t perms = 0;
-
-    if (mode & S_ISUID)
-        perms |= APR_USETID;
-    if (mode & S_IRUSR)
-        perms |= APR_UREAD;
-    if (mode & S_IWUSR)
-        perms |= APR_UWRITE;
-    if (mode & S_IXUSR)
-        perms |= APR_UEXECUTE;
-
-    if (mode & S_ISGID)
-        perms |= APR_GSETID;
-    if (mode & S_IRGRP)
-        perms |= APR_GREAD;
-    if (mode & S_IWGRP)
-        perms |= APR_GWRITE;
-    if (mode & S_IXGRP)
-        perms |= APR_GEXECUTE;
-
-#ifdef S_ISVTX
-    if (mode & S_ISVTX)
-        perms |= APR_WSTICKY;
-#endif
-    if (mode & S_IROTH)
-        perms |= APR_WREAD;
-    if (mode & S_IWOTH)
-        perms |= APR_WWRITE;
-    if (mode & S_IXOTH)
-        perms |= APR_WEXECUTE;
-
-    return perms;
-}
-#endif
-
-APR_DECLARE(apr_status_t) apr_file_data_get(void **data, const char *key,
-                                           apr_file_t *file)
-{    
-    return apr_pool_userdata_get(data, key, file->pool);
-}
-
-APR_DECLARE(apr_status_t) apr_file_data_set(apr_file_t *file, void *data,
-                                           const char *key,
-                                           apr_status_t (*cleanup)(void *))
-{    
-    return apr_pool_userdata_set(data, key, cleanup, file->pool);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/fileacc.lo b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/fileacc.lo
deleted file mode 100644
index f7b91d17..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/fileacc.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# fileacc.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/fileacc.o'
-
-# Name of the non-PIC object.
-non_pic_object='fileacc.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/fileacc.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/fileacc.o
deleted file mode 100644
index 97bc3fbc..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/fileacc.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filedup.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filedup.c
deleted file mode 100644
index a0830db5..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filedup.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_file_io.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include "apr_thread_mutex.h"
-#include "apr_arch_inherit.h"
-
-static apr_status_t _file_dup(apr_file_t **new_file, 
-                              apr_file_t *old_file, apr_pool_t *p,
-                              int which_dup)
-{
-    int rv;
-    
-    if (which_dup == 2) {
-        if ((*new_file) == NULL) {
-            /* We can't dup2 unless we have a valid new_file */
-            return APR_EINVAL;
-        }
-        rv = dup2(old_file->filedes, (*new_file)->filedes);
-    } else {
-        rv = dup(old_file->filedes);
-    }
-
-    if (rv == -1)
-        return errno;
-    
-    if (which_dup == 1) {
-        (*new_file) = (apr_file_t *)apr_pcalloc(p, sizeof(apr_file_t));
-        (*new_file)->pool = p;
-        (*new_file)->filedes = rv;
-    }
-
-    (*new_file)->fname = apr_pstrdup(p, old_file->fname);
-    (*new_file)->buffered = old_file->buffered;
-
-    /* If the existing socket in a dup2 is already buffered, we
-     * have an existing and valid (hopefully) mutex, so we don't
-     * want to create it again as we could leak!
-     */
-#if APR_HAS_THREADS
-    if ((*new_file)->buffered && !(*new_file)->thlock && old_file->thlock) {
-        apr_thread_mutex_create(&((*new_file)->thlock),
-                                APR_THREAD_MUTEX_DEFAULT, p);
-    }
-#endif
-    /* As above, only create the buffer if we haven't already
-     * got one.
-     */
-    if ((*new_file)->buffered && !(*new_file)->buffer) {
-        (*new_file)->buffer = apr_palloc(p, APR_FILE_BUFSIZE);
-    }
-
-    /* this is the way dup() works */
-    (*new_file)->blocking = old_file->blocking; 
-
-    /* make sure unget behavior is consistent */
-    (*new_file)->ungetchar = old_file->ungetchar;
-
-    /* apr_file_dup2() retains the original cleanup, reflecting 
-     * the existing inherit and nocleanup flags.  This means, 
-     * that apr_file_dup2() cannot be called against an apr_file_t
-     * already closed with apr_file_close, because the expected
-     * cleanup was already killed.
-     */
-    if (which_dup == 2) {
-        return APR_SUCCESS;
-    }
-
-    /* apr_file_dup() retains all old_file flags with the exceptions
-     * of APR_INHERIT and APR_FILE_NOCLEANUP.
-     * The user must call apr_file_inherit_set() on the dupped 
-     * apr_file_t when desired.
-     */
-    (*new_file)->flags = old_file->flags
-                       & ~(APR_INHERIT | APR_FILE_NOCLEANUP);
-
-    apr_pool_cleanup_register((*new_file)->pool, (void *)(*new_file),
-                              apr_unix_file_cleanup, 
-                              apr_unix_child_file_cleanup);
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_file_dup(apr_file_t **new_file,
-                                       apr_file_t *old_file, apr_pool_t *p)
-{
-    return _file_dup(new_file, old_file, p, 1);
-}
-
-APR_DECLARE(apr_status_t) apr_file_dup2(apr_file_t *new_file,
-                                        apr_file_t *old_file, apr_pool_t *p)
-{
-    return _file_dup(&new_file, old_file, p, 2);
-}
-
-APR_DECLARE(apr_status_t) apr_file_setaside(apr_file_t **new_file,
-                                            apr_file_t *old_file,
-                                            apr_pool_t *p)
-{
-    *new_file = (apr_file_t *)apr_palloc(p, sizeof(apr_file_t));
-    memcpy(*new_file, old_file, sizeof(apr_file_t));
-    (*new_file)->pool = p;
-    if (old_file->buffered) {
-        (*new_file)->buffer = apr_palloc(p, APR_FILE_BUFSIZE);
-        if (old_file->direction == 1) {
-            memcpy((*new_file)->buffer, old_file->buffer, old_file->bufpos);
-        }
-        else {
-            memcpy((*new_file)->buffer, old_file->buffer, old_file->dataRead);
-        }
-#if APR_HAS_THREADS
-        if (old_file->thlock) {
-            apr_thread_mutex_create(&((*new_file)->thlock),
-                                    APR_THREAD_MUTEX_DEFAULT, p);
-            apr_thread_mutex_destroy(old_file->thlock);
-        }
-#endif /* APR_HAS_THREADS */
-    }
-    if (old_file->fname) {
-        (*new_file)->fname = apr_pstrdup(p, old_file->fname);
-    }
-    if (!(old_file->flags & APR_FILE_NOCLEANUP)) {
-        apr_pool_cleanup_register(p, (void *)(*new_file), 
-                                  apr_unix_file_cleanup,
-                                  ((*new_file)->flags & APR_INHERIT)
-                                     ? apr_pool_cleanup_null
-                                     : apr_unix_child_file_cleanup);
-    }
-
-    old_file->filedes = -1;
-    apr_pool_cleanup_kill(old_file->pool, (void *)old_file,
-                          apr_unix_file_cleanup);
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filedup.lo b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filedup.lo
deleted file mode 100644
index e4630825..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filedup.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# filedup.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/filedup.o'
-
-# Name of the non-PIC object.
-non_pic_object='filedup.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filedup.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filedup.o
deleted file mode 100644
index d8640055..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filedup.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filepath.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filepath.c
deleted file mode 100644
index 6a65b202..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filepath.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_arch_file_io.h"
-#include "apr_file_io.h"
-#include "apr_strings.h"
-#define APR_WANT_STRFUNC
-#include "apr_want.h"
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-/* Win32 malpropism that can go away once everyone believes this
- * code is golden, and I'm not testing it anymore :-)
- */
-#if APR_HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-
-/* Any OS that requires/refuses trailing slashes should be dealt with here.
- */
-APR_DECLARE(apr_status_t) apr_filepath_get(char **defpath, apr_int32_t flags,
-                                           apr_pool_t *p)
-{
-    char path[APR_PATH_MAX];
-
-    if (!getcwd(path, sizeof(path))) {
-        if (errno == ERANGE)
-            return APR_ENAMETOOLONG;
-        else
-            return errno;
-    }
-    *defpath = apr_pstrdup(p, path);
-
-    return APR_SUCCESS;
-}
-
-
-/* Any OS that requires/refuses trailing slashes should be dealt with here
- */
-APR_DECLARE(apr_status_t) apr_filepath_set(const char *path, apr_pool_t *p)
-{
-    if (chdir(path) != 0)
-        return errno;
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_filepath_root(const char **rootpath,
-                                            const char **inpath,
-                                            apr_int32_t flags,
-                                            apr_pool_t *p)
-{
-    if (**inpath == '/') {
-        *rootpath = apr_pstrdup(p, "/");
-        do {
-            ++(*inpath);
-        } while (**inpath == '/');
-
-        return APR_SUCCESS;
-    }
-
-    return APR_ERELATIVE;
-}
-
-APR_DECLARE(apr_status_t) apr_filepath_merge(char **newpath,
-                                             const char *rootpath,
-                                             const char *addpath,
-                                             apr_int32_t flags,
-                                             apr_pool_t *p)
-{
-    char *path;
-    apr_size_t rootlen; /* is the length of the src rootpath */
-    apr_size_t maxlen;  /* maximum total path length */
-    apr_size_t keptlen; /* is the length of the retained rootpath */
-    apr_size_t pathlen; /* is the length of the result path */
-    apr_size_t seglen;  /* is the end of the current segment */
-    apr_status_t rv;
-
-    /* Treat null as an empty path.
-     */
-    if (!addpath)
-        addpath = "";
-
-    if (addpath[0] == '/') {
-        /* If addpath is rooted, then rootpath is unused.
-         * Ths violates any APR_FILEPATH_SECUREROOTTEST and
-         * APR_FILEPATH_NOTABSOLUTE flags specified.
-         */
-        if (flags & APR_FILEPATH_SECUREROOTTEST)
-            return APR_EABOVEROOT;
-        if (flags & APR_FILEPATH_NOTABSOLUTE)
-            return APR_EABSOLUTE;
-
-        /* If APR_FILEPATH_NOTABOVEROOT wasn't specified,
-         * we won't test the root again, it's ignored.
-         * Waste no CPU retrieving the working path.
-         */
-        if (!rootpath && !(flags & APR_FILEPATH_NOTABOVEROOT))
-            rootpath = "";
-    }
-    else {
-        /* If APR_FILEPATH_NOTABSOLUTE is specified, the caller
-         * requires a relative result.  If the rootpath is
-         * ommitted, we do not retrieve the working path,
-         * if rootpath was supplied as absolute then fail.
-         */
-        if (flags & APR_FILEPATH_NOTABSOLUTE) {
-            if (!rootpath)
-                rootpath = "";
-            else if (rootpath[0] == '/')
-                return APR_EABSOLUTE;
-        }
-    }
-
-    if (!rootpath) {
-        /* Start with the current working path.  This is bass akwards,
-         * but required since the compiler (at least vc) doesn't like
-         * passing the address of a char const* for a char** arg.
-         */
-        char *getpath;
-        rv = apr_filepath_get(&getpath, flags, p);
-        rootpath = getpath;
-        if (rv != APR_SUCCESS)
-            return errno;
-
-        /* XXX: Any kernel subject to goofy, uncanonical results
-         * must run the rootpath against the user's given flags.
-         * Simplest would be a recursive call to apr_filepath_merge
-         * with an empty (not null) rootpath and addpath of the cwd.
-         */
-    }
-
-    rootlen = strlen(rootpath);
-    maxlen = rootlen + strlen(addpath) + 4; /* 4 for slashes at start, after
-                                             * root, and at end, plus trailing
-                                             * null */
-    if (maxlen > APR_PATH_MAX) {
-        return APR_ENAMETOOLONG;
-    }
-    path = (char *)apr_palloc(p, maxlen);
-
-    if (addpath[0] == '/') {
-        /* Ignore the given root path, strip off leading
-         * '/'s to a single leading '/' from the addpath,
-         * and leave addpath at the first non-'/' character.
-         */
-        keptlen = 0;
-        while (addpath[0] == '/')
-            ++addpath;
-        path[0] = '/';
-        pathlen = 1;
-    }
-    else {
-        /* If both paths are relative, fail early
-         */
-        if (rootpath[0] != '/' && (flags & APR_FILEPATH_NOTRELATIVE))
-            return APR_ERELATIVE;
-
-        /* Base the result path on the rootpath
-         */
-        keptlen = rootlen;
-        memcpy(path, rootpath, rootlen);
-
-        /* Always '/' terminate the given root path
-         */
-        if (keptlen && path[keptlen - 1] != '/') {
-            path[keptlen++] = '/';
-        }
-        pathlen = keptlen;
-    }
-
-    while (*addpath) {
-        /* Parse each segment, find the closing '/'
-         */
-        const char *next = addpath;
-        while (*next && (*next != '/')) {
-            ++next;
-        }
-        seglen = next - addpath;
-
-        if (seglen == 0 || (seglen == 1 && addpath[0] == '.')) {
-            /* noop segment (/ or ./) so skip it
-             */
-        }
-        else if (seglen == 2 && addpath[0] == '.' && addpath[1] == '.') {
-            /* backpath (../) */
-            if (pathlen == 1 && path[0] == '/') {
-                /* Attempt to move above root.  Always die if the
-                 * APR_FILEPATH_SECUREROOTTEST flag is specified.
-                 */
-                if (flags & APR_FILEPATH_SECUREROOTTEST) {
-                    return APR_EABOVEROOT;
-                }
-
-                /* Otherwise this is simply a noop, above root is root.
-                 * Flag that rootpath was entirely replaced.
-                 */
-                keptlen = 0;
-            }
-            else if (pathlen == 0
-                     || (pathlen == 3
-                         && !memcmp(path + pathlen - 3, "../", 3))
-                     || (pathlen  > 3
-                         && !memcmp(path + pathlen - 4, "/../", 4))) {
-                /* Path is already backpathed or empty, if the
-                 * APR_FILEPATH_SECUREROOTTEST.was given die now.
-                 */
-                if (flags & APR_FILEPATH_SECUREROOTTEST) {
-                    return APR_EABOVEROOT;
-                }
-
-                /* Otherwise append another backpath, including
-                 * trailing slash if present.
-                 */
-                memcpy(path + pathlen, "../", *next ? 3 : 2);
-                pathlen += *next ? 3 : 2;
-            }
-            else {
-                /* otherwise crop the prior segment
-                 */
-                do {
-                    --pathlen;
-                } while (pathlen && path[pathlen - 1] != '/');
-            }
-
-            /* Now test if we are above where we started and back up
-             * the keptlen offset to reflect the added/altered path.
-             */
-            if (pathlen < keptlen) {
-                if (flags & APR_FILEPATH_SECUREROOTTEST) {
-                    return APR_EABOVEROOT;
-                }
-                keptlen = pathlen;
-            }
-        }
-        else {
-            /* An actual segment, append it to the destination path
-             */
-            if (*next) {
-                seglen++;
-            }
-            memcpy(path + pathlen, addpath, seglen);
-            pathlen += seglen;
-        }
-
-        /* Skip over trailing slash to the next segment
-         */
-        if (*next) {
-            ++next;
-        }
-
-        addpath = next;
-    }
-    path[pathlen] = '\0';
-
-    /* keptlen will be the rootlen unless the addpath contained
-     * backpath elements.  If so, and APR_FILEPATH_NOTABOVEROOT
-     * is specified (APR_FILEPATH_SECUREROOTTEST was caught above),
-     * compare the original root to assure the result path is
-     * still within given root path.
-     */
-    if ((flags & APR_FILEPATH_NOTABOVEROOT) && keptlen < rootlen) {
-        if (strncmp(rootpath, path, rootlen)) {
-            return APR_EABOVEROOT;
-        }
-        if (rootpath[rootlen - 1] != '/'
-            && path[rootlen] && path[rootlen] != '/') {
-            return APR_EABOVEROOT;
-        }
-    }
-
-    *newpath = path;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_filepath_list_split(apr_array_header_t **pathelts,
-                                                  const char *liststr,
-                                                  apr_pool_t *p)
-{
-    return apr_filepath_list_split_impl(pathelts, liststr, ':', p);
-}
-
-APR_DECLARE(apr_status_t) apr_filepath_list_merge(char **liststr,
-                                                  apr_array_header_t *pathelts,
-                                                  apr_pool_t *p)
-{
-    return apr_filepath_list_merge_impl(liststr, pathelts, ':', p);
-}
-
-APR_DECLARE(apr_status_t) apr_filepath_encoding(int *style, apr_pool_t *p)
-{
-#if defined(DARWIN)
-    *style = APR_FILEPATH_ENCODING_UTF8;
-#else
-    *style = APR_FILEPATH_ENCODING_LOCALE;
-#endif
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filepath.lo b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filepath.lo
deleted file mode 100644
index af05a4cf..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filepath.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# filepath.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/filepath.o'
-
-# Name of the non-PIC object.
-non_pic_object='filepath.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filepath.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filepath.o
deleted file mode 100644
index 010f1383..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filepath.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filepath_util.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filepath_util.c
deleted file mode 100644
index d8ccc567..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filepath_util.c
+++ /dev/null
@@ -1,111 +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.
- */
-
-
-#define APR_WANT_STRFUNC
-#define APR_WANT_MEMFUNC
-#include "apr_want.h"
-
-#include "apr_errno.h"
-#include "apr_pools.h"
-#include "apr_strings.h"
-#include "apr_tables.h"
-
-#include "apr_private.h"
-
-apr_status_t apr_filepath_list_split_impl(apr_array_header_t **pathelts,
-                                          const char *liststr,
-                                          char separator,
-                                          apr_pool_t *p)
-{
-    char *path, *part, *ptr;
-    char separator_string[2] = { '\0', '\0' };
-    apr_array_header_t *elts;
-    int nelts;
-
-    separator_string[0] = separator;
-    /* Count the number of path elements. We know there'll be at least
-       one even if path is an empty string. */
-    path = apr_pstrdup(p, liststr);
-    for (nelts = 0, ptr = path; ptr != NULL; ++nelts)
-    {
-        ptr = strchr(ptr, separator);
-        if (ptr)
-            ++ptr;
-    }
-
-    /* Split the path into the array. */
-    elts = apr_array_make(p, nelts, sizeof(char*));
-    while ((part = apr_strtok(path, separator_string, &ptr)) != NULL)
-    {
-        if (*part == '\0')      /* Ignore empty path components. */
-            continue;
-
-        *(char**)apr_array_push(elts) = part;
-        path = NULL;            /* For the next call to apr_strtok */
-    }
-
-    *pathelts = elts;
-    return APR_SUCCESS;
-}
-
-
-apr_status_t apr_filepath_list_merge_impl(char **liststr,
-                                          apr_array_header_t *pathelts,
-                                          char separator,
-                                          apr_pool_t *p)
-{
-    apr_size_t path_size = 0;
-    char *path;
-    int i;
-
-    /* This test isn't 100% certain, but it'll catch at least some
-       invalid uses... */
-    if (pathelts->elt_size != sizeof(char*))
-        return APR_EINVAL;
-
-    /* Calculate the size of the merged path */
-    for (i = 0; i < pathelts->nelts; ++i)
-        path_size += strlen(((char**)pathelts->elts)[i]);
-
-    if (path_size == 0)
-    {
-        *liststr = NULL;
-        return APR_SUCCESS;
-    }
-
-    if (i > 0)                  /* Add space for the separators */
-        path_size += (i - 1);
-
-    /* Merge the path components */
-    path = *liststr = apr_palloc(p, path_size + 1);
-    for (i = 0; i < pathelts->nelts; ++i)
-    {
-        /* ### Hmmmm. Calling strlen twice on the same string. Yuck.
-               But is is better than reallocation in apr_pstrcat? */
-        const char *part = ((char**)pathelts->elts)[i];
-        apr_size_t part_size = strlen(part);
-        if (part_size == 0)     /* Ignore empty path components. */
-            continue;
-
-        if (i > 0)
-            *path++ = separator;
-        memcpy(path, part, part_size);
-        path += part_size;
-    }
-    *path = '\0';
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filepath_util.lo b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filepath_util.lo
deleted file mode 100644
index cdf8e7dc..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filepath_util.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# filepath_util.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/filepath_util.o'
-
-# Name of the non-PIC object.
-non_pic_object='filepath_util.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filepath_util.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filepath_util.o
deleted file mode 100644
index b693de00..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filepath_util.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filestat.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filestat.c
deleted file mode 100644
index 9b0ae6e6..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filestat.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_file_io.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_strings.h"
-#include "apr_errno.h"
-
-#ifdef HAVE_UTIME
-#include <utime.h>
-#endif
-
-static apr_filetype_e filetype_from_mode(mode_t mode)
-{
-    apr_filetype_e type;
-
-    switch (mode & S_IFMT) {
-    case S_IFREG:
-        type = APR_REG;  break;
-    case S_IFDIR:
-        type = APR_DIR;  break;
-    case S_IFLNK:
-        type = APR_LNK;  break;
-    case S_IFCHR:
-        type = APR_CHR;  break;
-    case S_IFBLK:
-        type = APR_BLK;  break;
-#if defined(S_IFFIFO)
-    case S_IFFIFO:
-        type = APR_PIPE; break;
-#endif
-#if !defined(BEOS) && defined(S_IFSOCK)
-    case S_IFSOCK:
-        type = APR_SOCK; break;
-#endif
-
-    default:
-	/* Work around missing S_IFxxx values above
-         * for Linux et al.
-         */
-#if !defined(S_IFFIFO) && defined(S_ISFIFO)
-    	if (S_ISFIFO(mode)) {
-            type = APR_PIPE;
-	} else
-#endif
-#if !defined(BEOS) && !defined(S_IFSOCK) && defined(S_ISSOCK)
-    	if (S_ISSOCK(mode)) {
-            type = APR_SOCK;
-	} else
-#endif
-        type = APR_UNKFILE;
-    }
-    return type;
-}
-
-static void fill_out_finfo(apr_finfo_t *finfo, struct stat *info,
-                           apr_int32_t wanted)
-{ 
-    finfo->valid = APR_FINFO_MIN | APR_FINFO_IDENT | APR_FINFO_NLINK
-                 | APR_FINFO_OWNER | APR_FINFO_PROT;
-    finfo->protection = apr_unix_mode2perms(info->st_mode);
-    finfo->filetype = filetype_from_mode(info->st_mode);
-    finfo->user = info->st_uid;
-    finfo->group = info->st_gid;
-    finfo->size = info->st_size;
-    finfo->inode = info->st_ino;
-    finfo->device = info->st_dev;
-    finfo->nlink = info->st_nlink;
-    apr_time_ansi_put(&finfo->atime, info->st_atime);
-    apr_time_ansi_put(&finfo->mtime, info->st_mtime);
-    apr_time_ansi_put(&finfo->ctime, info->st_ctime);
-    /* ### needs to be revisited  
-     * if (wanted & APR_FINFO_CSIZE) {
-     *   finfo->csize = info->st_blocks * 512;
-     *   finfo->valid |= APR_FINFO_CSIZE;
-     * }
-     */
-}
-
-apr_status_t apr_file_info_get_locked(apr_finfo_t *finfo, apr_int32_t wanted,
-                                      apr_file_t *thefile)
-{
-    struct stat info;
-
-    if (thefile->buffered) {
-        apr_status_t rv = apr_file_flush_locked(thefile);
-        if (rv != APR_SUCCESS)
-            return rv;
-    }
-
-    if (fstat(thefile->filedes, &info) == 0) {
-        finfo->pool = thefile->pool;
-        finfo->fname = thefile->fname;
-        fill_out_finfo(finfo, &info, wanted);
-        return (wanted & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS;
-    }
-    else {
-        return errno;
-    }
-}
-
-APR_DECLARE(apr_status_t) apr_file_info_get(apr_finfo_t *finfo, 
-                                            apr_int32_t wanted,
-                                            apr_file_t *thefile)
-{
-    struct stat info;
-
-    if (thefile->buffered) {
-        apr_status_t rv = apr_file_flush(thefile);
-        if (rv != APR_SUCCESS)
-            return rv;
-    }
-
-    if (fstat(thefile->filedes, &info) == 0) {
-        finfo->pool = thefile->pool;
-        finfo->fname = thefile->fname;
-        fill_out_finfo(finfo, &info, wanted);
-        return (wanted & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS;
-    }
-    else {
-        return errno;
-    }
-}
-
-APR_DECLARE(apr_status_t) apr_file_perms_set(const char *fname, 
-                                             apr_fileperms_t perms)
-{
-    mode_t mode = apr_unix_perms2mode(perms);
-
-    if (chmod(fname, mode) == -1)
-        return errno;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_file_attrs_set(const char *fname,
-                                             apr_fileattrs_t attributes,
-                                             apr_fileattrs_t attr_mask,
-                                             apr_pool_t *pool)
-{
-    apr_status_t status;
-    apr_finfo_t finfo;
-
-    /* Don't do anything if we can't handle the requested attributes */
-    if (!(attr_mask & (APR_FILE_ATTR_READONLY
-                       | APR_FILE_ATTR_EXECUTABLE)))
-        return APR_SUCCESS;
-
-    status = apr_stat(&finfo, fname, APR_FINFO_PROT, pool);
-    if (!APR_STATUS_IS_SUCCESS(status))
-        return status;
-
-    /* ### TODO: should added bits be umask'd? */
-    if (attr_mask & APR_FILE_ATTR_READONLY)
-    {
-        if (attributes & APR_FILE_ATTR_READONLY)
-        {
-            finfo.protection &= ~APR_UWRITE;
-            finfo.protection &= ~APR_GWRITE;
-            finfo.protection &= ~APR_WWRITE;
-        }
-        else
-        {
-            /* ### umask this! */
-            finfo.protection |= APR_UWRITE;
-            finfo.protection |= APR_GWRITE;
-            finfo.protection |= APR_WWRITE;
-        }
-    }
-
-    if (attr_mask & APR_FILE_ATTR_EXECUTABLE)
-    {
-        if (attributes & APR_FILE_ATTR_EXECUTABLE)
-        {
-            /* ### umask this! */
-            finfo.protection |= APR_UEXECUTE;
-            finfo.protection |= APR_GEXECUTE;
-            finfo.protection |= APR_WEXECUTE;
-        }
-        else
-        {
-            finfo.protection &= ~APR_UEXECUTE;
-            finfo.protection &= ~APR_GEXECUTE;
-            finfo.protection &= ~APR_WEXECUTE;
-        }
-    }
-
-    return apr_file_perms_set(fname, finfo.protection);
-}
-
-
-APR_DECLARE(apr_status_t) apr_file_mtime_set(const char *fname,
-                                              apr_time_t mtime,
-                                              apr_pool_t *pool)
-{
-    apr_status_t status;
-    apr_finfo_t finfo;
-
-    status = apr_stat(&finfo, fname, APR_FINFO_ATIME, pool);
-    if (!APR_STATUS_IS_SUCCESS(status)) {
-        return status;
-    }
-
-#ifdef HAVE_UTIMES
-    {
-      struct timeval tvp[2];
-    
-      tvp[0].tv_sec = apr_time_sec(finfo.atime);
-      tvp[0].tv_usec = apr_time_usec(finfo.atime);
-      tvp[1].tv_sec = apr_time_sec(mtime);
-      tvp[1].tv_usec = apr_time_usec(mtime);
-      
-      if (utimes(fname, tvp) == -1) {
-        return errno;
-      }
-    }
-#elif defined(HAVE_UTIME)
-    {
-      struct utimbuf buf;
-      
-      buf.actime = (time_t) (finfo.atime / APR_USEC_PER_SEC);
-      buf.modtime = (time_t) (mtime / APR_USEC_PER_SEC);
-      
-      if (utime(fname, &buf) == -1) {
-        return errno;
-      }
-    }
-#else
-    return APR_ENOTIMPL;
-#endif
-
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_stat(apr_finfo_t *finfo, 
-                                   const char *fname, 
-                                   apr_int32_t wanted, apr_pool_t *pool)
-{
-    struct stat info;
-    int srv;
-
-    if (wanted & APR_FINFO_LINK)
-        srv = lstat(fname, &info);
-    else
-        srv = stat(fname, &info);
-
-    if (srv == 0) {
-        finfo->pool = pool;
-        finfo->fname = fname;
-        fill_out_finfo(finfo, &info, wanted);
-        if (wanted & APR_FINFO_LINK)
-            wanted &= ~APR_FINFO_LINK;
-        return (wanted & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS;
-    }
-    else {
-#if !defined(ENOENT) || !defined(ENOTDIR)
-#error ENOENT || ENOTDIR not defined; please see the
-#error comments at this line in the source for a workaround.
-        /*
-         * If ENOENT || ENOTDIR is not defined in one of the your OS's
-         * include files, APR cannot report a good reason why the stat()
-         * of the file failed; there are cases where it can fail even though
-         * the file exists.  This opens holes in Apache, for example, because
-         * it becomes possible for someone to get a directory listing of a 
-         * directory even though there is an index (eg. index.html) file in 
-         * it.  If you do not have a problem with this, delete the above 
-         * #error lines and start the compile again.  If you need to do this,
-         * please submit a bug report to http://www.apache.org/bug_report.html
-         * letting us know that you needed to do this.  Please be sure to 
-         * include the operating system you are using.
-         */
-        /* WARNING: All errors will be handled as not found
-         */
-#if !defined(ENOENT) 
-        return APR_ENOENT;
-#else
-        /* WARNING: All errors but not found will be handled as not directory
-         */
-        if (errno != ENOENT)
-            return APR_ENOENT;
-        else
-            return errno;
-#endif
-#else /* All was defined well, report the usual: */
-        return errno;
-#endif
-    }
-}
-
-/* Perhaps this becomes nothing but a macro?
- */
-APR_DECLARE(apr_status_t) apr_lstat(apr_finfo_t *finfo, const char *fname,
-                      apr_int32_t wanted, apr_pool_t *pool)
-{
-    return apr_stat(finfo, fname, wanted | APR_FINFO_LINK, pool);
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filestat.lo b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filestat.lo
deleted file mode 100644
index f1074ce6..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filestat.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# filestat.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/filestat.o'
-
-# Name of the non-PIC object.
-non_pic_object='filestat.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filestat.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filestat.o
deleted file mode 100644
index 7eed58ce..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/filestat.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/flock.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/flock.c
deleted file mode 100644
index f400a967..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/flock.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_file_io.h"
-
-#if APR_HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef HAVE_SYS_FILE_H
-#include <sys/file.h>
-#endif
-
-APR_DECLARE(apr_status_t) apr_file_lock(apr_file_t *thefile, int type)
-{
-    int rc;
-
-#if defined(HAVE_FCNTL_H)
-    {
-        struct flock l = { 0 };
-        int fc;
-
-        l.l_whence = SEEK_SET;  /* lock from current point */
-        l.l_start = 0;          /* begin lock at this offset */
-        l.l_len = 0;            /* lock to end of file */
-        if ((type & APR_FLOCK_TYPEMASK) == APR_FLOCK_SHARED)
-            l.l_type = F_RDLCK;
-        else
-            l.l_type = F_WRLCK;
-
-        fc = (type & APR_FLOCK_NONBLOCK) ? F_SETLK : F_SETLKW;
-
-        /* keep trying if fcntl() gets interrupted (by a signal) */
-        while ((rc = fcntl(thefile->filedes, fc, &l)) < 0 && errno == EINTR)
-            continue;
-
-        if (rc == -1) {
-            /* on some Unix boxes (e.g., Tru64), we get EACCES instead
-             * of EAGAIN; we don't want APR_STATUS_IS_EAGAIN() matching EACCES
-             * since that breaks other things, so fix up the retcode here
-             */
-            if (errno == EACCES) {
-                return EAGAIN;
-            }
-            return errno;
-        }
-    }
-#elif defined(HAVE_SYS_FILE_H)
-    {
-        int ltype;
-
-        if ((type & APR_FLOCK_TYPEMASK) == APR_FLOCK_SHARED)
-            ltype = LOCK_SH;
-        else
-            ltype = LOCK_EX;
-        if ((type & APR_FLOCK_NONBLOCK) != 0)
-            ltype |= LOCK_NB;
-
-        /* keep trying if flock() gets interrupted (by a signal) */
-        while ((rc = flock(thefile->filedes, ltype)) < 0 && errno == EINTR)
-            continue;
-
-        if (rc == -1)
-            return errno;
-    }
-#else
-#error No file locking mechanism is available.
-#endif
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_file_unlock(apr_file_t *thefile)
-{
-    int rc;
-
-#if defined(HAVE_FCNTL_H)
-    {
-        struct flock l = { 0 };
-
-        l.l_whence = SEEK_SET;  /* lock from current point */
-        l.l_start = 0;          /* begin lock at this offset */
-        l.l_len = 0;            /* lock to end of file */
-        l.l_type = F_UNLCK;
-
-        /* keep trying if fcntl() gets interrupted (by a signal) */
-        while ((rc = fcntl(thefile->filedes, F_SETLKW, &l)) < 0
-               && errno == EINTR)
-            continue;
-
-        if (rc == -1)
-            return errno;
-    }
-#elif defined(HAVE_SYS_FILE_H)
-    {
-        /* keep trying if flock() gets interrupted (by a signal) */
-        while ((rc = flock(thefile->filedes, LOCK_UN)) < 0 && errno == EINTR)
-            continue;
-
-        if (rc == -1)
-            return errno;
-    }
-#else
-#error No file locking mechanism is available.
-#endif
-
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/flock.lo b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/flock.lo
deleted file mode 100644
index b2401d49..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/flock.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# flock.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/flock.o'
-
-# Name of the non-PIC object.
-non_pic_object='flock.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/flock.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/flock.o
deleted file mode 100644
index a3cf7194..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/flock.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/fullrw.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/fullrw.c
deleted file mode 100644
index ff76a29f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/fullrw.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_file_io.h"
-
-
-APR_DECLARE(apr_status_t) apr_file_read_full(apr_file_t *thefile, void *buf,
-                                             apr_size_t nbytes,
-                                             apr_size_t *bytes_read)
-{
-    apr_status_t status;
-    apr_size_t total_read = 0;
-
-    do {
-	apr_size_t amt = nbytes;
-
-	status = apr_file_read(thefile, buf, &amt);
-	buf = (char *)buf + amt;
-        nbytes -= amt;
-        total_read += amt;
-    } while (status == APR_SUCCESS && nbytes > 0);
-
-    if (bytes_read != NULL)
-        *bytes_read = total_read;
-
-    return status;
-}
-
-APR_DECLARE(apr_status_t) apr_file_write_full(apr_file_t *thefile,
-                                              const void *buf,
-                                              apr_size_t nbytes,
-                                              apr_size_t *bytes_written)
-{
-    apr_status_t status;
-    apr_size_t total_written = 0;
-
-    do {
-	apr_size_t amt = nbytes;
-
-	status = apr_file_write(thefile, buf, &amt);
-	buf = (char *)buf + amt;
-        nbytes -= amt;
-        total_written += amt;
-    } while (status == APR_SUCCESS && nbytes > 0);
-
-    if (bytes_written != NULL)
-        *bytes_written = total_written;
-
-    return status;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/fullrw.lo b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/fullrw.lo
deleted file mode 100644
index 003757c3..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/fullrw.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# fullrw.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/fullrw.o'
-
-# Name of the non-PIC object.
-non_pic_object='fullrw.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/fullrw.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/fullrw.o
deleted file mode 100644
index db1a343c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/fullrw.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/mktemp.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/mktemp.c
deleted file mode 100644
index 249f5772..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/mktemp.c
+++ /dev/null
@@ -1,208 +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.
- */
-/*
- * Copyright (c) 1987, 1993
- * The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    This product includes software developed by the University of
- *    California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "apr_private.h"
-#include "apr_file_io.h" /* prototype of apr_mkstemp() */
-#include "apr_strings.h" /* prototype of apr_mkstemp() */
-#include "apr_arch_file_io.h" /* prototype of apr_mkstemp() */
-#include "apr_portable.h" /* for apr_os_file_put() */
-
-#ifndef HAVE_MKSTEMP
-
-#if defined(SVR4) || defined(WIN32) || defined(NETWARE)
-#ifdef SVR4
-#if HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-#endif
-#define arc4random() rand()
-#define seedrandom(a) srand(a)
-#else
-#if APR_HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#define arc4random() random()
-#define seedrandom(a) srandom(a)
-#endif
-
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if APR_HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#if APR_HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#ifdef HAVE_TIME_H
-#include <time.h>
-#endif
-
-static const unsigned char padchar[] =
-"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-static apr_uint32_t randseed=0;
-
-static int gettemp(char *path, apr_file_t **doopen, apr_int32_t flags, apr_pool_t *p)
-{
-    register char *start, *trv, *suffp;
-    char *pad;
-    apr_finfo_t sbuf;
-    apr_status_t rv;
-    apr_uint32_t randnum;
-
-    if (randseed==0) {
-        randseed = (int)apr_time_now();
-        seedrandom(randseed);
-    }
-
-    for (trv = path; *trv; ++trv)
-        ;
-    suffp = trv;
-    --trv;
-    if (trv < path) {
-        return APR_EINVAL;
-    }
-
-    /* Fill space with random characters */
-    while (*trv == 'X') {
-        randnum = arc4random() % (sizeof(padchar) - 1);
-        *trv-- = padchar[randnum];
-    }
-    start = trv + 1;
-
-    /*
-     * check the target directory.
-     */
-    for (;; --trv) {
-        if (trv <= path)
-            break;
-        if (*trv == '/') {
-            *trv = '\0';
-            rv = apr_stat(&sbuf, path, APR_FINFO_TYPE, p);
-            *trv = '/';
-            if (rv != APR_SUCCESS)
-                return rv;
-            if (sbuf.filetype != APR_DIR) {
-                return APR_ENOTDIR;
-            }
-            break;
-        }
-    }
-
-    for (;;) {
-        if ((rv = apr_file_open(doopen, path, flags,
-                                APR_UREAD | APR_UWRITE, p)) == APR_SUCCESS)
-            return APR_SUCCESS;
-        if (!APR_STATUS_IS_EEXIST(rv))
-            return rv;
-
-        /* If we have a collision, cycle through the space of filenames */
-        for (trv = start;;) {
-            if (*trv == '\0' || trv == suffp)
-                return APR_EINVAL; /* XXX: is this the correct return code? */
-            pad = strchr((char *)padchar, *trv);
-            if (pad == NULL || !*++pad) {
-                *trv++ = padchar[0];
-            }
-            else {
-                *trv++ = *pad;
-                break;
-            }
-        }
-    }
-    /*NOTREACHED*/
-}
-
-#else
-
-#if APR_HAVE_STDLIB_H
-#include <stdlib.h> /* for mkstemp() - Single Unix */
-#endif
-#if APR_HAVE_UNISTD_H
-#include <unistd.h> /* for mkstemp() - FreeBSD */
-#endif
-#endif /* !defined(HAVE_MKSTEMP) */
-
-APR_DECLARE(apr_status_t) apr_file_mktemp(apr_file_t **fp, char *template, apr_int32_t flags, apr_pool_t *p)
-{
-#ifdef HAVE_MKSTEMP
-    int fd;
-#endif
-    flags = (!flags) ? APR_CREATE | APR_READ | APR_WRITE | APR_EXCL | 
-                       APR_DELONCLOSE : flags;
-#ifndef HAVE_MKSTEMP
-    return gettemp(template, fp, flags, p);
-#else
-
-    fd = mkstemp(template);
-    if (fd == -1) {
-        return errno;
-    }
-    /* XXX: We must reset several flags values as passed-in, since
-     * mkstemp didn't subscribe to our preference flags.
-     *
-     * We either have to unset the flags, or fix up the fd and other
-     * xthread and inherit bits appropriately.  Since gettemp() above
-     * calls apr_file_open, our flags are respected in that code path.
-     */
-    apr_os_file_put(fp, &fd, flags, p);
-    (*fp)->fname = apr_pstrdup(p, template);
-
-    if (!(flags & APR_FILE_NOCLEANUP)) {
-        apr_pool_cleanup_register((*fp)->pool, (void *)(*fp),
-                                  apr_unix_file_cleanup,
-                                  apr_unix_child_file_cleanup);
-    }
-#endif
-    return APR_SUCCESS;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/mktemp.lo b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/mktemp.lo
deleted file mode 100644
index 268a5865..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/mktemp.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# mktemp.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/mktemp.o'
-
-# Name of the non-PIC object.
-non_pic_object='mktemp.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/mktemp.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/mktemp.o
deleted file mode 100644
index eaf9e090..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/mktemp.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/open.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/open.c
deleted file mode 100644
index 673da3e4..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/open.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_file_io.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include "apr_thread_mutex.h"
-#include "apr_arch_inherit.h"
-
-#ifdef NETWARE
-#include "nks/dirio.h"
-#include "apr_hash.h"
-#include "fsio.h"
-#endif
-
-static apr_status_t file_cleanup(apr_file_t *file)
-{
-    apr_status_t rv = APR_SUCCESS;
-
-    if (close(file->filedes) == 0) {
-        file->filedes = -1;
-        if (file->flags & APR_DELONCLOSE) {
-            unlink(file->fname);
-        }
-#if APR_HAS_THREADS
-        if (file->thlock) {
-            rv = apr_thread_mutex_destroy(file->thlock);
-        }
-#endif
-    }
-    else {
-        /* Are there any error conditions other than EINTR or EBADF? */
-        rv = errno;
-    }
-    return rv;
-}
-
-apr_status_t apr_unix_file_cleanup(void *thefile)
-{
-    apr_file_t *file = thefile;
-    apr_status_t flush_rv = APR_SUCCESS, rv = APR_SUCCESS;
-
-    if (file->buffered) {
-        flush_rv = apr_file_flush(file);
-    }
-
-    rv = file_cleanup(file);
-
-    return rv != APR_SUCCESS ? rv : flush_rv;
-}
-
-apr_status_t apr_unix_child_file_cleanup(void *thefile)
-{
-    return file_cleanup(thefile);
-}
-
-APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new, 
-                                        const char *fname, 
-                                        apr_int32_t flag, 
-                                        apr_fileperms_t perm, 
-                                        apr_pool_t *pool)
-{
-    apr_os_file_t fd;
-    int oflags = 0;
-#if APR_HAS_THREADS
-    apr_thread_mutex_t *thlock;
-    apr_status_t rv;
-#endif
-
-    if ((flag & APR_READ) && (flag & APR_WRITE)) {
-        oflags = O_RDWR;
-    }
-    else if (flag & APR_READ) {
-        oflags = O_RDONLY;
-    }
-    else if (flag & APR_WRITE) {
-        oflags = O_WRONLY;
-    }
-    else {
-        return APR_EACCES; 
-    }
-
-    if (flag & APR_CREATE) {
-        oflags |= O_CREAT; 
-        if (flag & APR_EXCL) {
-            oflags |= O_EXCL;
-        }
-    }
-    if ((flag & APR_EXCL) && !(flag & APR_CREATE)) {
-        return APR_EACCES;
-    }   
-
-    if (flag & APR_APPEND) {
-        oflags |= O_APPEND;
-    }
-    if (flag & APR_TRUNCATE) {
-        oflags |= O_TRUNC;
-    }
-#ifdef O_BINARY
-    if (flag & APR_BINARY) {
-        oflags |= O_BINARY;
-    }
-#endif
-#ifdef O_LARGEFILE
-    if (flag & APR_LARGEFILE) {
-        oflags |= O_LARGEFILE;
-    }
-#endif
-    
-#if APR_HAS_THREADS
-    if ((flag & APR_BUFFERED) && (flag & APR_XTHREAD)) {
-        rv = apr_thread_mutex_create(&thlock,
-                                     APR_THREAD_MUTEX_DEFAULT, pool);
-        if (rv) {
-            return rv;
-        }
-    }
-#endif
-
-    if (perm == APR_OS_DEFAULT) {
-        fd = open(fname, oflags, 0666);
-    }
-    else {
-        fd = open(fname, oflags, apr_unix_perms2mode(perm));
-    } 
-    if (fd < 0) {
-       return errno;
-    }
-
-    (*new) = (apr_file_t *)apr_pcalloc(pool, sizeof(apr_file_t));
-    (*new)->pool = pool;
-    (*new)->flags = flag;
-    (*new)->filedes = fd;
-
-    (*new)->fname = apr_pstrdup(pool, fname);
-
-    (*new)->blocking = BLK_ON;
-    (*new)->buffered = (flag & APR_BUFFERED) > 0;
-
-    if ((*new)->buffered) {
-        (*new)->buffer = apr_palloc(pool, APR_FILE_BUFSIZE);
-#if APR_HAS_THREADS
-        if ((*new)->flags & APR_XTHREAD) {
-            (*new)->thlock = thlock;
-        }
-#endif
-    }
-    else {
-        (*new)->buffer = NULL;
-    }
-
-    (*new)->is_pipe = 0;
-    (*new)->timeout = -1;
-    (*new)->ungetchar = -1;
-    (*new)->eof_hit = 0;
-    (*new)->filePtr = 0;
-    (*new)->bufpos = 0;
-    (*new)->dataRead = 0;
-    (*new)->direction = 0;
-
-    if (!(flag & APR_FILE_NOCLEANUP)) {
-        apr_pool_cleanup_register((*new)->pool, (void *)(*new), 
-                                  apr_unix_file_cleanup, 
-                                  apr_unix_child_file_cleanup);
-    }
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_file_close(apr_file_t *file)
-{
-    return apr_pool_cleanup_run(file->pool, file, apr_unix_file_cleanup);
-}
-
-APR_DECLARE(apr_status_t) apr_file_remove(const char *path, apr_pool_t *pool)
-{
-    if (unlink(path) == 0) {
-        return APR_SUCCESS;
-    }
-    else {
-        return errno;
-    }
-}
-
-APR_DECLARE(apr_status_t) apr_file_rename(const char *from_path, 
-                                          const char *to_path,
-                                          apr_pool_t *p)
-{
-    if (rename(from_path, to_path) != 0) {
-        return errno;
-    }
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_file_get(apr_os_file_t *thefile, 
-                                          apr_file_t *file)
-{
-    *thefile = file->filedes;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_file_put(apr_file_t **file, 
-                                          apr_os_file_t *thefile,
-                                          apr_int32_t flags, apr_pool_t *pool)
-{
-    int *dafile = thefile;
-    
-    (*file) = apr_pcalloc(pool, sizeof(apr_file_t));
-    (*file)->pool = pool;
-    (*file)->eof_hit = 0;
-    (*file)->blocking = BLK_UNKNOWN; /* in case it is a pipe */
-    (*file)->timeout = -1;
-    (*file)->ungetchar = -1; /* no char avail */
-    (*file)->filedes = *dafile;
-    (*file)->flags = flags | APR_FILE_NOCLEANUP;
-    (*file)->buffered = (flags & APR_BUFFERED) > 0;
-
-    if ((*file)->buffered) {
-        (*file)->buffer = apr_palloc(pool, APR_FILE_BUFSIZE);
-#if APR_HAS_THREADS
-        if ((*file)->flags & APR_XTHREAD) {
-            apr_status_t rv;
-            rv = apr_thread_mutex_create(&((*file)->thlock),
-                                         APR_THREAD_MUTEX_DEFAULT, pool);
-            if (rv) {
-                return rv;
-            }
-        }
-#endif
-    }
-    return APR_SUCCESS;
-}    
-
-APR_DECLARE(apr_status_t) apr_file_eof(apr_file_t *fptr)
-{
-    if (fptr->eof_hit == 1) {
-        return APR_EOF;
-    }
-    return APR_SUCCESS;
-}   
-
-APR_DECLARE(apr_status_t) apr_file_open_stderr(apr_file_t **thefile, 
-                                               apr_pool_t *pool)
-{
-    int fd = STDERR_FILENO;
-
-    return apr_os_file_put(thefile, &fd, 0, pool);
-}
-
-APR_DECLARE(apr_status_t) apr_file_open_stdout(apr_file_t **thefile, 
-                                               apr_pool_t *pool)
-{
-    int fd = STDOUT_FILENO;
-
-    return apr_os_file_put(thefile, &fd, 0, pool);
-}
-
-APR_DECLARE(apr_status_t) apr_file_open_stdin(apr_file_t **thefile, 
-                                              apr_pool_t *pool)
-{
-    int fd = STDIN_FILENO;
-
-    return apr_os_file_put(thefile, &fd, 0, pool);
-}
-
-APR_IMPLEMENT_INHERIT_SET(file, flags, pool, apr_unix_file_cleanup)
-
-/* We need to do this by hand instead of using APR_IMPLEMENT_INHERIT_UNSET
- * because the macro sets both cleanups to the same function, which is not
- * suitable on Unix (see PR 41119). */
-APR_DECLARE(apr_status_t) apr_file_inherit_unset(apr_file_t *thefile)
-{
-    if (thefile->flags & APR_FILE_NOCLEANUP) {
-        return APR_EINVAL;
-    }
-    if (thefile->flags & APR_INHERIT) {
-        thefile->flags &= ~APR_INHERIT;
-        apr_pool_child_cleanup_set(thefile->pool,
-                                   (void *)thefile,
-                                   apr_unix_file_cleanup,
-                                   apr_unix_child_file_cleanup);
-    }
-    return APR_SUCCESS;
-}
-/* Deprecated */
-APR_DECLARE(void) apr_file_unset_inherit(apr_file_t *thefile)
-{
-    apr_file_inherit_unset(thefile);
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(file)
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/open.lo b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/open.lo
deleted file mode 100644
index ebb21cc1..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/open.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# open.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/open.o'
-
-# Name of the non-PIC object.
-non_pic_object='open.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/open.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/open.o
deleted file mode 100644
index 9560247b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/open.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/pipe.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/pipe.c
deleted file mode 100644
index 8f96c494..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/pipe.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_file_io.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-
-#include "apr_arch_inherit.h"
-
-/* Figure out how to get pipe block/nonblock on BeOS...
- * Basically, BONE7 changed things again so that ioctl didn't work,
- * but now fcntl does, hence we need to do this extra checking.
- * The joys of beta programs. :-)
- */
-#if BEOS
-#if !BONE7
-# define BEOS_BLOCKING 1
-#else
-# define BEOS_BLOCKING 0
-#endif
-#endif
-
-static apr_status_t pipeblock(apr_file_t *thepipe)
-{
-#if !BEOS_BLOCKING
-      int fd_flags;
-
-      fd_flags = fcntl(thepipe->filedes, F_GETFL, 0);
-#  if defined(O_NONBLOCK)
-      fd_flags &= ~O_NONBLOCK;
-#  elif defined(O_NDELAY)
-      fd_flags &= ~O_NDELAY;
-#  elif defined(FNDELAY)
-      fd_flags &= ~O_FNDELAY;
-#  else 
-      /* XXXX: this breaks things, but an alternative isn't obvious...*/
-      return APR_ENOTIMPL;
-#  endif
-      if (fcntl(thepipe->filedes, F_SETFL, fd_flags) == -1) {
-          return errno;
-      }
-#else /* BEOS_BLOCKING */
-
-#  if BEOS_BONE /* This only works on BONE 0-6 */
-      int on = 0;
-      if (ioctl(thepipe->filedes, FIONBIO, &on, sizeof(on)) < 0) {
-          return errno;
-      }
-#  else /* "classic" BeOS doesn't support this at all */
-      return APR_ENOTIMPL;
-#  endif 
- 
-#endif /* !BEOS_BLOCKING */
-
-    thepipe->blocking = BLK_ON;
-    return APR_SUCCESS;
-}
-
-static apr_status_t pipenonblock(apr_file_t *thepipe)
-{
-#if !BEOS_BLOCKING
-      int fd_flags = fcntl(thepipe->filedes, F_GETFL, 0);
-
-#  if defined(O_NONBLOCK)
-      fd_flags |= O_NONBLOCK;
-#  elif defined(O_NDELAY)
-      fd_flags |= O_NDELAY;
-#  elif defined(FNDELAY)
-      fd_flags |= O_FNDELAY;
-#  else
-      /* XXXX: this breaks things, but an alternative isn't obvious...*/
-      return APR_ENOTIMPL;
-#  endif
-      if (fcntl(thepipe->filedes, F_SETFL, fd_flags) == -1) {
-          return errno;
-      }
-    
-#else /* BEOS_BLOCKING */
-
-#  if BEOS_BONE /* This only works on BONE 0-6 */
-      int on = 1;
-      if (ioctl(thepipe->filedes, FIONBIO, &on, sizeof(on)) < 0) {
-          return errno;
-      }
-#  else /* "classic" BeOS doesn't support this at all */
-      return APR_ENOTIMPL;
-#  endif
-
-#endif /* !BEOS_BLOCKING */
-
-    thepipe->blocking = BLK_OFF;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_file_pipe_timeout_set(apr_file_t *thepipe, apr_interval_time_t timeout)
-{
-    if (thepipe->is_pipe == 1) {
-        thepipe->timeout = timeout;
-        if (timeout >= 0) {
-            if (thepipe->blocking != BLK_OFF) { /* blocking or unknown state */
-                return pipenonblock(thepipe);
-            }
-        }
-        else {
-            if (thepipe->blocking != BLK_ON) { /* non-blocking or unknown state */
-                return pipeblock(thepipe);
-            }
-        }
-        return APR_SUCCESS;
-    }
-    return APR_EINVAL;
-}
-
-APR_DECLARE(apr_status_t) apr_file_pipe_timeout_get(apr_file_t *thepipe, apr_interval_time_t *timeout)
-{
-    if (thepipe->is_pipe == 1) {
-        *timeout = thepipe->timeout;
-        return APR_SUCCESS;
-    }
-    return APR_EINVAL;
-}
-
-APR_DECLARE(apr_status_t) apr_os_pipe_put_ex(apr_file_t **file,
-                                             apr_os_file_t *thefile,
-                                             int register_cleanup,
-                                             apr_pool_t *pool)
-{
-    int *dafile = thefile;
-    
-    (*file) = apr_pcalloc(pool, sizeof(apr_file_t));
-    (*file)->pool = pool;
-    (*file)->eof_hit = 0;
-    (*file)->is_pipe = 1;
-    (*file)->blocking = BLK_UNKNOWN; /* app needs to make a timeout call */
-    (*file)->timeout = -1;
-    (*file)->ungetchar = -1; /* no char avail */
-    (*file)->filedes = *dafile;
-    if (!register_cleanup) {
-        (*file)->flags = APR_FILE_NOCLEANUP;
-    }
-    (*file)->buffered = 0;
-#if APR_HAS_THREADS
-    (*file)->thlock = NULL;
-#endif
-    if (register_cleanup) {
-        apr_pool_cleanup_register((*file)->pool, (void *)(*file),
-                                  apr_unix_file_cleanup,
-                                  apr_pool_cleanup_null);
-    }
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_pipe_put(apr_file_t **file,
-                                          apr_os_file_t *thefile,
-                                          apr_pool_t *pool)
-{
-    return apr_os_pipe_put_ex(file, thefile, 0, pool);
-}
-
-APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, apr_file_t **out, apr_pool_t *pool)
-{
-    int filedes[2];
-
-    if (pipe(filedes) == -1) {
-        return errno;
-    }
-    
-    (*in) = (apr_file_t *)apr_pcalloc(pool, sizeof(apr_file_t));
-    (*in)->pool = pool;
-    (*in)->filedes = filedes[0];
-    (*in)->is_pipe = 1;
-    (*in)->fname = NULL;
-    (*in)->buffered = 0;
-    (*in)->blocking = BLK_ON;
-    (*in)->timeout = -1;
-    (*in)->ungetchar = -1;
-    (*in)->flags = APR_INHERIT;
-#if APR_HAS_THREADS
-    (*in)->thlock = NULL;
-#endif
-
-    (*out) = (apr_file_t *)apr_pcalloc(pool, sizeof(apr_file_t));
-    (*out)->pool = pool;
-    (*out)->filedes = filedes[1];
-    (*out)->is_pipe = 1;
-    (*out)->fname = NULL;
-    (*out)->buffered = 0;
-    (*out)->blocking = BLK_ON;
-    (*out)->flags = APR_INHERIT;
-    (*out)->timeout = -1;
-#if APR_HAS_THREADS
-    (*out)->thlock = NULL;
-#endif
-
-    apr_pool_cleanup_register((*in)->pool, (void *)(*in), apr_unix_file_cleanup,
-                         apr_pool_cleanup_null);
-    apr_pool_cleanup_register((*out)->pool, (void *)(*out), apr_unix_file_cleanup,
-                         apr_pool_cleanup_null);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_file_namedpipe_create(const char *filename, 
-                                                    apr_fileperms_t perm, apr_pool_t *pool)
-{
-    mode_t mode = apr_unix_perms2mode(perm);
-
-    if (mkfifo(filename, mode) == -1) {
-        return errno;
-    }
-    return APR_SUCCESS;
-} 
-
-    
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/pipe.lo b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/pipe.lo
deleted file mode 100644
index 5c56a72d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/pipe.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# pipe.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/pipe.o'
-
-# Name of the non-PIC object.
-non_pic_object='pipe.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/pipe.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/pipe.o
deleted file mode 100644
index f354c401..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/pipe.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/readwrite.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/readwrite.c
deleted file mode 100644
index 541ab587..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/readwrite.c
+++ /dev/null
@@ -1,387 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_file_io.h"
-#include "apr_strings.h"
-#include "apr_thread_mutex.h"
-#include "apr_support.h"
-
-/* The only case where we don't use wait_for_io_or_timeout is on
- * pre-BONE BeOS, so this check should be sufficient and simpler */
-#if !BEOS_R5
-#define USE_WAIT_FOR_IO
-#endif
-
-/* problems: 
- * 1) ungetchar not used for buffered files
- */
-APR_DECLARE(apr_status_t) apr_file_read(apr_file_t *thefile, void *buf, apr_size_t *nbytes)
-{
-    apr_ssize_t rv;
-    apr_size_t bytes_read;
-
-    if (*nbytes <= 0) {
-        *nbytes = 0;
-        return APR_SUCCESS;
-    }
-
-    if (thefile->buffered) {
-        char *pos = (char *)buf;
-        apr_uint64_t blocksize;
-        apr_uint64_t size = *nbytes;
-
-        file_lock(thefile);
-
-        if (thefile->direction == 1) {
-            rv = apr_file_flush_locked(thefile);
-            if (rv) {
-                file_unlock(thefile);
-                return rv;
-            }
-            thefile->bufpos = 0;
-            thefile->direction = 0;
-            thefile->dataRead = 0;
-        }
-
-        rv = 0;
-        if (thefile->ungetchar != -1) {
-            *pos = (char)thefile->ungetchar;
-            ++pos;
-            --size;
-            thefile->ungetchar = -1;
-        }
-        while (rv == 0 && size > 0) {
-            if (thefile->bufpos >= thefile->dataRead) {
-                int bytesread = read(thefile->filedes, thefile->buffer, APR_FILE_BUFSIZE);
-                if (bytesread == 0) {
-                    thefile->eof_hit = TRUE;
-                    rv = APR_EOF;
-                    break;
-                }
-                else if (bytesread == -1) {
-                    rv = errno;
-                    break;
-                }
-                thefile->dataRead = bytesread;
-                thefile->filePtr += thefile->dataRead;
-                thefile->bufpos = 0;
-            }
-
-            blocksize = size > thefile->dataRead - thefile->bufpos ? thefile->dataRead - thefile->bufpos : size;
-            memcpy(pos, thefile->buffer + thefile->bufpos, blocksize);
-            thefile->bufpos += blocksize;
-            pos += blocksize;
-            size -= blocksize;
-        }
-
-        *nbytes = pos - (char *)buf;
-        if (*nbytes) {
-            rv = 0;
-        }
-
-        file_unlock(thefile);
-
-        return rv;
-    }
-    else {
-        bytes_read = 0;
-        if (thefile->ungetchar != -1) {
-            bytes_read = 1;
-            *(char *)buf = (char)thefile->ungetchar;
-            buf = (char *)buf + 1;
-            (*nbytes)--;
-            thefile->ungetchar = -1;
-            if (*nbytes == 0) {
-                *nbytes = bytes_read;
-                return APR_SUCCESS;
-            }
-        }
-
-        do {
-            rv = read(thefile->filedes, buf, *nbytes);
-        } while (rv == -1 && errno == EINTR);
-#ifdef USE_WAIT_FOR_IO
-        if (rv == -1 && 
-            (errno == EAGAIN || errno == EWOULDBLOCK) && 
-            thefile->timeout != 0) {
-            apr_status_t arv = apr_wait_for_io_or_timeout(thefile, NULL, 1);
-            if (arv != APR_SUCCESS) {
-                *nbytes = bytes_read;
-                return arv;
-            }
-            else {
-                do {
-                    rv = read(thefile->filedes, buf, *nbytes);
-                } while (rv == -1 && errno == EINTR);
-            }
-        }  
-#endif
-        *nbytes = bytes_read;
-        if (rv == 0) {
-            thefile->eof_hit = TRUE;
-            return APR_EOF;
-        }
-        if (rv > 0) {
-            *nbytes += rv;
-            return APR_SUCCESS;
-        }
-        return errno;
-    }
-}
-
-APR_DECLARE(apr_status_t) apr_file_write(apr_file_t *thefile, const void *buf, apr_size_t *nbytes)
-{
-    apr_size_t rv;
-
-    if (thefile->buffered) {
-        char *pos = (char *)buf;
-        int blocksize;
-        int size = *nbytes;
-
-        file_lock(thefile);
-
-        if ( thefile->direction == 0 ) {
-            /* Position file pointer for writing at the offset we are 
-             * logically reading from
-             */
-            apr_int64_t offset = thefile->filePtr - thefile->dataRead + thefile->bufpos;
-            if (offset != thefile->filePtr)
-                lseek(thefile->filedes, offset, SEEK_SET);
-            thefile->bufpos = thefile->dataRead = 0;
-            thefile->direction = 1;
-        }
-
-        rv = 0;
-        while (rv == 0 && size > 0) {
-            if (thefile->bufpos == APR_FILE_BUFSIZE)   /* write buffer is full*/
-                rv = apr_file_flush_locked(thefile);
-
-            blocksize = size > APR_FILE_BUFSIZE - thefile->bufpos ? 
-                        APR_FILE_BUFSIZE - thefile->bufpos : size;
-            memcpy(thefile->buffer + thefile->bufpos, pos, blocksize);                      
-            thefile->bufpos += blocksize;
-            pos += blocksize;
-            size -= blocksize;
-        }
-
-        file_unlock(thefile);
-
-        return rv;
-    }
-    else {
-        do {
-            rv = write(thefile->filedes, buf, *nbytes);
-        } while (rv == (apr_size_t)-1 && errno == EINTR);
-#ifdef USE_WAIT_FOR_IO
-        if (rv == (apr_size_t)-1 &&
-            (errno == EAGAIN || errno == EWOULDBLOCK) && 
-            thefile->timeout != 0) {
-            apr_status_t arv = apr_wait_for_io_or_timeout(thefile, NULL, 0);
-            if (arv != APR_SUCCESS) {
-                *nbytes = 0;
-                return arv;
-            }
-            else {
-                do {
-                    do {
-                        rv = write(thefile->filedes, buf, *nbytes);
-                    } while (rv == (apr_size_t)-1 && errno == EINTR);
-                    if (rv == (apr_size_t)-1 &&
-                        (errno == EAGAIN || errno == EWOULDBLOCK)) {
-                        *nbytes /= 2; /* yes, we'll loop if kernel lied
-                                       * and we can't even write 1 byte
-                                       */
-                    }
-                    else {
-                        break;
-                    }
-                } while (1);
-            }
-        }  
-#endif
-        if (rv == (apr_size_t)-1) {
-            (*nbytes) = 0;
-            return errno;
-        }
-        *nbytes = rv;
-        return APR_SUCCESS;
-    }
-}
-
-APR_DECLARE(apr_status_t) apr_file_writev(apr_file_t *thefile, const struct iovec *vec,
-                                          apr_size_t nvec, apr_size_t *nbytes)
-{
-#ifdef HAVE_WRITEV
-    apr_status_t rv;
-    int bytes;
-
-    if (thefile->buffered) {
-        file_lock(thefile);
-
-        rv = apr_file_flush_locked(thefile);
-        if (rv != APR_SUCCESS) {
-            file_unlock(thefile);
-            return rv;
-        }
-        if (thefile->direction == 0) {
-            /* Position file pointer for writing at the offset we are
-             * logically reading from
-             */
-            apr_int64_t offset = thefile->filePtr - thefile->dataRead +
-                                 thefile->bufpos;
-            if (offset != thefile->filePtr)
-                lseek(thefile->filedes, offset, SEEK_SET);
-            thefile->bufpos = thefile->dataRead = 0;
-        }
-
-        file_unlock(thefile);
-    }
-
-    if ((bytes = writev(thefile->filedes, vec, nvec)) < 0) {
-        *nbytes = 0;
-        rv = errno;
-    }
-    else {
-        *nbytes = bytes;
-        rv = APR_SUCCESS;
-    }
-    return rv;
-#else
-    *nbytes = vec[0].iov_len;
-    return apr_file_write(thefile, vec[0].iov_base, nbytes);
-#endif
-}
-
-APR_DECLARE(apr_status_t) apr_file_putc(char ch, apr_file_t *thefile)
-{
-    apr_size_t nbytes = 1;
-
-    return apr_file_write(thefile, &ch, &nbytes);
-}
-
-APR_DECLARE(apr_status_t) apr_file_ungetc(char ch, apr_file_t *thefile)
-{
-    thefile->ungetchar = (unsigned char)ch;
-    return APR_SUCCESS; 
-}
-
-APR_DECLARE(apr_status_t) apr_file_getc(char *ch, apr_file_t *thefile)
-{
-    apr_size_t nbytes = 1;
-
-    return apr_file_read(thefile, ch, &nbytes);
-}
-
-APR_DECLARE(apr_status_t) apr_file_puts(const char *str, apr_file_t *thefile)
-{
-    apr_size_t nbytes = strlen(str);
-
-    return apr_file_write(thefile, str, &nbytes);
-}
-
-apr_status_t apr_file_flush_locked(apr_file_t *thefile)
-{
-    apr_status_t rv = APR_SUCCESS;
-
-    if (thefile->direction == 1 && thefile->bufpos) {
-        apr_ssize_t written;
-
-        do {
-            written = write(thefile->filedes, thefile->buffer, thefile->bufpos);
-        } while (written == -1 && errno == EINTR);
-        if (written == -1) {
-            rv = errno;
-        } else {
-            thefile->filePtr += written;
-            thefile->bufpos = 0;
-        }
-    }
-
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_file_flush(apr_file_t *thefile)
-{
-    apr_status_t rv = APR_SUCCESS;
-
-    if (thefile->buffered) {
-        file_lock(thefile);
-        rv = apr_file_flush_locked(thefile);
-        file_unlock(thefile);
-    }
-    /* There isn't anything to do if we aren't buffering the output
-     * so just return success.
-     */
-    return rv; 
-}
-
-APR_DECLARE(apr_status_t) apr_file_gets(char *str, int len, apr_file_t *thefile)
-{
-    apr_status_t rv = APR_SUCCESS; /* get rid of gcc warning */
-    apr_size_t nbytes;
-    const char *str_start = str;
-    char *final = str + len - 1;
-
-    if (len <= 1) {  
-        /* sort of like fgets(), which returns NULL and stores no bytes 
-         */
-        return APR_SUCCESS;
-    }
-
-    while (str < final) { /* leave room for trailing '\0' */
-        nbytes = 1;
-        rv = apr_file_read(thefile, str, &nbytes);
-        if (rv != APR_SUCCESS) {
-            break;
-        }
-        if (*str == '\n') {
-            ++str;
-            break;
-        }
-        ++str;
-    }
-    /* We must store a terminating '\0' if we've stored any chars. We can
-     * get away with storing it if we hit an error first. 
-     */
-    *str = '\0';
-    if (str > str_start) {
-        /* we stored chars; don't report EOF or any other errors;
-         * the app will find out about that on the next call
-         */
-        return APR_SUCCESS;
-    }
-    return rv;
-}
-
-APR_DECLARE_NONSTD(int) apr_file_printf(apr_file_t *fptr, 
-                                        const char *format, ...)
-{
-    apr_status_t cc;
-    va_list ap;
-    char *buf;
-    int len;
-
-    buf = malloc(HUGE_STRING_LEN);
-    if (buf == NULL) {
-        return 0;
-    }
-    va_start(ap, format);
-    len = apr_vsnprintf(buf, HUGE_STRING_LEN, format, ap);
-    cc = apr_file_puts(buf, fptr);
-    va_end(ap);
-    free(buf);
-    return (cc == APR_SUCCESS) ? len : -1;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/readwrite.lo b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/readwrite.lo
deleted file mode 100644
index 7e4eabce..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/readwrite.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# readwrite.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/readwrite.o'
-
-# Name of the non-PIC object.
-non_pic_object='readwrite.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/readwrite.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/readwrite.o
deleted file mode 100644
index c69b0aef..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/readwrite.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/seek.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/seek.c
deleted file mode 100644
index 5daed0cb..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/seek.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_file_io.h"
-
-static apr_status_t setptr(apr_file_t *thefile, unsigned long pos )
-{
-    apr_off_t newbufpos;
-    apr_status_t rv;
-
-    if (thefile->direction == 1) {
-        rv = apr_file_flush_locked(thefile);
-        if (rv) {
-            return rv;
-        }
-        thefile->bufpos = thefile->direction = thefile->dataRead = 0;
-    }
-
-    newbufpos = pos - (thefile->filePtr - thefile->dataRead);
-    if (newbufpos >= 0 && newbufpos <= thefile->dataRead) {
-        thefile->bufpos = newbufpos;
-        rv = APR_SUCCESS;
-    }
-    else {
-        if (lseek(thefile->filedes, pos, SEEK_SET) != -1) {
-            thefile->bufpos = thefile->dataRead = 0;
-            thefile->filePtr = pos;
-            rv = APR_SUCCESS;
-        }
-        else {
-            rv = errno;
-        }
-    }
-
-    return rv;
-}
-
-
-APR_DECLARE(apr_status_t) apr_file_seek(apr_file_t *thefile, apr_seek_where_t where, apr_off_t *offset)
-{
-    apr_off_t rv;
-
-    thefile->eof_hit = 0;
-
-    if (thefile->buffered) {
-        int rc = EINVAL;
-        apr_finfo_t finfo;
-
-        file_lock(thefile);
-
-        switch (where) {
-        case APR_SET:
-            rc = setptr(thefile, *offset);
-            break;
-
-        case APR_CUR:
-            rc = setptr(thefile, thefile->filePtr - thefile->dataRead + thefile->bufpos + *offset);
-            break;
-
-        case APR_END:
-            rc = apr_file_info_get_locked(&finfo, APR_FINFO_SIZE, thefile);
-            if (rc == APR_SUCCESS)
-                rc = setptr(thefile, finfo.size + *offset);
-            break;
-        }
-
-        *offset = thefile->filePtr - thefile->dataRead + thefile->bufpos;
-
-        file_unlock(thefile);
-
-        return rc;
-    } else {
-
-        rv = lseek(thefile->filedes, *offset, where);
-        if (rv == -1) {
-            *offset = -1;
-            return errno;
-        }
-        else {
-            *offset = rv;
-            return APR_SUCCESS;
-        }
-    }
-}
-
-apr_status_t apr_file_trunc(apr_file_t *fp, apr_off_t offset)
-{
-    if (ftruncate(fp->filedes, offset) == -1) {
-        return errno;
-    }
-    return apr_file_seek(fp, APR_SET, &offset);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/seek.lo b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/seek.lo
deleted file mode 100644
index b46d86d0..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/seek.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# seek.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/seek.o'
-
-# Name of the non-PIC object.
-non_pic_object='seek.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/seek.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/seek.o
deleted file mode 100644
index b32032c1..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/seek.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/tempdir.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/tempdir.c
deleted file mode 100644
index 62f52076..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/tempdir.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "apr_private.h"
-#include "apr_file_io.h"
-#include "apr_strings.h"
-#include "apr_env.h"
-
-/*
- * FIXME
- * Currently, this variable is a bit of misnomer.
- * The intention is to have this in APR's global pool so that we don't have 
- * to go through this every time.
- */
-static char global_temp_dir[APR_PATH_MAX+1] = { 0 };
-
-/* Try to open a temporary file in the temporary dir, write to it,
-   and then close it. */
-static int test_tempdir(const char *temp_dir, apr_pool_t *p)
-{
-    apr_file_t *dummy_file;
-    const char *path = apr_pstrcat(p, temp_dir, "/apr-tmp.XXXXXX", NULL);
-
-    if (apr_file_mktemp(&dummy_file, (char *)path, 0, p) == APR_SUCCESS) {
-        if (apr_file_putc('!', dummy_file) == APR_SUCCESS) {
-            if (apr_file_close(dummy_file) == APR_SUCCESS) {
-                return 1;
-            }
-        }
-    }
-    return 0;
-}
-
-
-APR_DECLARE(apr_status_t) apr_temp_dir_get(const char **temp_dir, 
-                                           apr_pool_t *p)
-{
-    apr_status_t apr_err;
-    const char *try_dirs[] = { "/tmp", "/usr/tmp", "/var/tmp" };
-    const char *try_envs[] = { "TMP", "TEMP", "TMPDIR" };
-    char *cwd;
-    int i;
-
-    /* Our goal is to find a temporary directory suitable for writing
-       into.  We'll only pay the price once if we're successful -- we
-       cache our successful find.  Here's the order in which we'll try
-       various paths:
-
-          $TMP
-          $TEMP
-          $TMPDIR
-          "C:\TEMP"     (windows only)
-          "SYS:\TMP"    (netware only)
-          "/tmp"
-          "/var/tmp"
-          "/usr/tmp"
-          P_tmpdir      (POSIX define)
-          `pwd` 
-
-       NOTE: This algorithm is basically the same one used by Python
-       2.2's tempfile.py module.  */
-
-    /* Try the environment first. */
-    for (i = 0; i < (sizeof(try_envs) / sizeof(const char *)); i++) {
-        char *value;
-        apr_err = apr_env_get(&value, try_envs[i], p);
-        if ((apr_err == APR_SUCCESS) && value) {
-            apr_size_t len = strlen(value);
-            if (len && (len < APR_PATH_MAX) && test_tempdir(value, p)) {
-                memcpy(global_temp_dir, value, len + 1);
-                goto end;
-            }
-        }
-    }
-
-#ifdef WIN32
-    /* Next, on Win32, try the C:\TEMP directory. */
-    if (test_tempdir("C:\\TEMP", p)) {
-        memcpy(global_temp_dir, "C:\\TEMP", 7 + 1);
-        goto end;
-    }
-#endif
-#ifdef NETWARE
-    /* Next, on NetWare, try the SYS:/TMP directory. */
-    if (test_tempdir("SYS:/TMP", p)) {
-        memcpy(global_temp_dir, "SYS:/TMP", 8 + 1);
-        goto end;
-    }
-#endif
-
-    /* Next, try a set of hard-coded paths. */
-    for (i = 0; i < (sizeof(try_dirs) / sizeof(const char *)); i++) {
-        if (test_tempdir(try_dirs[i], p)) {
-            memcpy(global_temp_dir, try_dirs[i], strlen(try_dirs[i]) + 1);
-            goto end;
-        }
-    }
-
-#ifdef P_tmpdir
-    /* 
-     * If we have it, use the POSIX definition of where 
-     * the tmpdir should be 
-     */
-    if (test_tempdir(P_tmpdir, p)) {
-        memcpy(global_temp_dir, P_tmpdir, strlen(P_tmpdir) +1);
-        goto end;
-    }
-#endif
-    
-    /* Finally, try the current working directory. */
-    if (APR_SUCCESS == apr_filepath_get(&cwd, APR_FILEPATH_NATIVE, p)) {
-        if (test_tempdir(cwd, p)) {
-            memcpy(global_temp_dir, cwd, strlen(cwd) + 1);
-            goto end;
-        }
-    }
-
-end:
-    if (global_temp_dir[0]) {
-        *temp_dir = apr_pstrdup(p, global_temp_dir);
-        return APR_SUCCESS;
-    }
-    return APR_EGENERAL;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/tempdir.lo b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/tempdir.lo
deleted file mode 100644
index 5b1535ab..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/tempdir.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# tempdir.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/tempdir.o'
-
-# Name of the non-PIC object.
-non_pic_object='tempdir.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/tempdir.o b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/tempdir.o
deleted file mode 100644
index 93508b12..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/unix/tempdir.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/dir.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/dir.c
deleted file mode 100644
index 29a4e1c4..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/dir.c
+++ /dev/null
@@ -1,393 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_arch_file_io.h"
-#include "apr_file_io.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include "apr_arch_atime.h"
-
-#if APR_HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#if APR_HAVE_STRING_H
-#include <string.h>
-#endif
-#if APR_HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-
-static apr_status_t dir_cleanup(void *thedir)
-{
-    apr_dir_t *dir = thedir;
-    if (dir->dirhand != INVALID_HANDLE_VALUE && !FindClose(dir->dirhand)) {
-        return apr_get_os_error();
-    }
-    dir->dirhand = INVALID_HANDLE_VALUE;
-    return APR_SUCCESS;
-} 
-
-APR_DECLARE(apr_status_t) apr_dir_open(apr_dir_t **new, const char *dirname,
-                                       apr_pool_t *pool)
-{
-    apr_status_t rv;
-
-    int len = strlen(dirname);
-    (*new) = apr_pcalloc(pool, sizeof(apr_dir_t));
-    /* Leave room here to add and pop the '*' wildcard for FindFirstFile 
-     * and double-null terminate so we have one character to change.
-     */
-    (*new)->dirname = apr_palloc(pool, len + 3);
-    memcpy((*new)->dirname, dirname, len);
-    if (len && (*new)->dirname[len - 1] != '/') {
-    	(*new)->dirname[len++] = '/';
-    }
-    (*new)->dirname[len++] = '\0';
-    (*new)->dirname[len] = '\0';
-
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        /* Create a buffer for the longest file name we will ever see 
-         */
-        (*new)->w.entry = apr_pcalloc(pool, sizeof(WIN32_FIND_DATAW));
-        (*new)->name = apr_pcalloc(pool, APR_FILE_MAX * 3 + 1);        
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-    {
-        /* Note that we won't open a directory that is greater than MAX_PATH,
-         * including the trailing /* wildcard suffix.  If a * won't fit, then
-         * neither will any other file name within the directory.
-         * The length not including the trailing '*' is stored as rootlen, to
-         * skip over all paths which are too long.
-         */
-        if (len >= APR_PATH_MAX) {
-            (*new) = NULL;
-            return APR_ENAMETOOLONG;
-        }
-        (*new)->n.entry = apr_pcalloc(pool, sizeof(WIN32_FIND_DATAW));
-    }
-#endif
-    (*new)->rootlen = len - 1;
-    (*new)->pool = pool;
-    (*new)->dirhand = INVALID_HANDLE_VALUE;
-    apr_pool_cleanup_register((*new)->pool, (void *)(*new), dir_cleanup,
-                        apr_pool_cleanup_null);
-
-    rv = apr_dir_read(NULL, 0, *new);
-    if (rv != APR_SUCCESS) {
-        dir_cleanup(*new);
-        *new = NULL;
-    }
-
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_dir_close(apr_dir_t *dir)
-{
-    apr_pool_cleanup_kill(dir->pool, dir, dir_cleanup);
-    return dir_cleanup(dir);
-}
-
-APR_DECLARE(apr_status_t) apr_dir_read(apr_finfo_t *finfo, apr_int32_t wanted,
-                                       apr_dir_t *thedir)
-{
-    apr_status_t rv;
-    char *fname;
-    /* The while loops below allow us to skip all invalid file names, so that
-     * we aren't reporting any files where their absolute paths are too long.
-     */
-#if APR_HAS_UNICODE_FS
-    apr_wchar_t wdirname[APR_PATH_MAX];
-    apr_wchar_t *eos = NULL;
-    IF_WIN_OS_IS_UNICODE
-    {
-        /* This code path is always be invoked by apr_dir_open or
-         * apr_dir_rewind, so return without filling out the finfo.
-         */
-        if (thedir->dirhand == INVALID_HANDLE_VALUE) 
-        {
-            apr_status_t rv;
-            if (rv = utf8_to_unicode_path(wdirname, sizeof(wdirname) 
-                                                     / sizeof(apr_wchar_t), 
-                                          thedir->dirname)) {
-                return rv;
-            }
-            eos = wcschr(wdirname, '\0');
-            eos[0] = '*';
-            eos[1] = '\0';
-            thedir->dirhand = FindFirstFileW(wdirname, thedir->w.entry);
-            eos[0] = '\0';
-            if (thedir->dirhand == INVALID_HANDLE_VALUE) {
-                return apr_get_os_error();
-            }
-            thedir->bof = 1;
-            return APR_SUCCESS;
-        }
-        else if (thedir->bof) {
-            /* Noop - we already called FindFirstFileW from
-             * either apr_dir_open or apr_dir_rewind ... use
-             * that first record.
-             */
-            thedir->bof = 0; 
-        }
-        else if (!FindNextFileW(thedir->dirhand, thedir->w.entry)) {
-            return apr_get_os_error();
-        }
-
-        while (thedir->rootlen &&
-               thedir->rootlen + wcslen(thedir->w.entry->cFileName) >= APR_PATH_MAX)
-        {
-            if (!FindNextFileW(thedir->dirhand, thedir->w.entry)) {
-                return apr_get_os_error();
-            }
-        }
-        if (rv = unicode_to_utf8_path(thedir->name, APR_FILE_MAX * 3 + 1, 
-                                      thedir->w.entry->cFileName))
-            return rv;
-        fname = thedir->name;
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-    {
-        /* This code path is always be invoked by apr_dir_open or 
-         * apr_dir_rewind, so return without filling out the finfo.
-         */
-        if (thedir->dirhand == INVALID_HANDLE_VALUE) {
-            /* '/' terminated, so add the '*' and pop it when we finish */
-            char *eop = strchr(thedir->dirname, '\0');
-            eop[0] = '*';
-            eop[1] = '\0';
-            thedir->dirhand = FindFirstFileA(thedir->dirname, 
-                                             thedir->n.entry);
-            eop[0] = '\0';
-            if (thedir->dirhand == INVALID_HANDLE_VALUE) {
-                return apr_get_os_error();
-            }
-            thedir->bof = 1;
-            return APR_SUCCESS;
-        }
-        else if (thedir->bof) {
-            /* Noop - we already called FindFirstFileW from
-             * either apr_dir_open or apr_dir_rewind ... use
-             * that first record.
-             */
-            thedir->bof = 0; 
-        }
-        else if (!FindNextFileA(thedir->dirhand, thedir->n.entry)) {
-            return apr_get_os_error();
-        }
-        while (thedir->rootlen &&
-               thedir->rootlen + strlen(thedir->n.entry->cFileName) >= MAX_PATH)
-        {
-            if (!FindNextFileA(thedir->dirhand, thedir->n.entry)) {
-                return apr_get_os_error();
-            }
-        }
-        fname = thedir->n.entry->cFileName;
-    }
-#endif
-
-    fillin_fileinfo(finfo, (WIN32_FILE_ATTRIBUTE_DATA *) thedir->w.entry, 
-                    0, wanted);
-    finfo->pool = thedir->pool;
-
-    finfo->valid |= APR_FINFO_NAME;
-    finfo->name = fname;
-
-    if (wanted &= ~finfo->valid) {
-        /* Go back and get more_info if we can't answer the whole inquiry
-         */
-#if APR_HAS_UNICODE_FS
-        IF_WIN_OS_IS_UNICODE
-        {
-            /* Almost all our work is done.  Tack on the wide file name
-             * to the end of the wdirname (already / delimited)
-             */
-            if (!eos)
-                eos = wcschr(wdirname, '\0');
-            wcscpy(eos, thedir->w.entry->cFileName);
-            rv = more_finfo(finfo, wdirname, wanted, MORE_OF_WFSPEC);
-            eos[0] = '\0';
-            return rv;
-        }
-#endif
-#if APR_HAS_ANSI_FS
-        ELSE_WIN_OS_IS_ANSI
-        {
-#if APR_HAS_UNICODE_FS
-            /* Don't waste stack space on a second buffer, the one we set
-             * aside for the wide directory name is twice what we need.
-             */
-            char *fspec = (char*)wdirname;
-#else
-            char fspec[APR_PATH_MAX];
-#endif
-            int dirlen = strlen(thedir->dirname);
-            if (dirlen >= sizeof(fspec))
-                dirlen = sizeof(fspec) - 1;
-            apr_cpystrn(fspec, thedir->dirname, sizeof(fspec));
-            apr_cpystrn(fspec + dirlen, fname, sizeof(fspec) - dirlen);
-            return more_finfo(finfo, fspec, wanted, MORE_OF_FSPEC);
-        }
-#endif
-    }
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_dir_rewind(apr_dir_t *dir)
-{
-    apr_status_t rv;
-
-    /* this will mark the handle as invalid and we'll open it
-     * again if apr_dir_read() is subsequently called
-     */
-    rv = dir_cleanup(dir);
-
-    if (rv == APR_SUCCESS)
-        rv = apr_dir_read(NULL, 0, dir);
-
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_dir_make(const char *path, apr_fileperms_t perm,
-                                       apr_pool_t *pool)
-{
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        apr_wchar_t wpath[APR_PATH_MAX];
-        apr_status_t rv;
-        if (rv = utf8_to_unicode_path(wpath, sizeof(wpath) 
-                                              / sizeof(apr_wchar_t), path)) {
-            return rv;
-        }
-        if (!CreateDirectoryW(wpath, NULL)) {
-            return apr_get_os_error();
-        }
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-        if (!CreateDirectory(path, NULL)) {
-            return apr_get_os_error();
-        }
-#endif
-    return APR_SUCCESS;
-}
-
-
-static apr_status_t dir_make_parent(char *path,
-                                    apr_fileperms_t perm,
-                                    apr_pool_t *pool)
-{
-    apr_status_t rv;
-    char *ch = strrchr(path, '\\');
-    if (!ch) {
-        return APR_ENOENT;
-    }
-
-    *ch = '\0';
-    rv = apr_dir_make (path, perm, pool); /* Try to make straight off */
-    
-    if (APR_STATUS_IS_ENOENT(rv)) { /* Missing an intermediate dir */
-        rv = dir_make_parent(path, perm, pool);
-
-        if (rv == APR_SUCCESS) {
-            rv = apr_dir_make (path, perm, pool); /* And complete the path */
-        }
-    }
-
-    *ch = '\\'; /* Always replace the slash before returning */
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_dir_make_recursive(const char *path,
-                                                 apr_fileperms_t perm,
-                                                 apr_pool_t *pool)
-{
-    apr_status_t rv = 0;
-    
-    rv = apr_dir_make (path, perm, pool); /* Try to make PATH right out */
-    
-    if (APR_STATUS_IS_EEXIST(rv)) /* It's OK if PATH exists */
-        return APR_SUCCESS;
-    
-    if (APR_STATUS_IS_ENOENT(rv)) { /* Missing an intermediate dir */
-        char *dir;
-        
-        rv = apr_filepath_merge(&dir, "", path, APR_FILEPATH_NATIVE, pool);
-
-        if (rv == APR_SUCCESS)
-            rv = dir_make_parent(dir, perm, pool); /* Make intermediate dirs */
-        
-        if (rv == APR_SUCCESS)
-            rv = apr_dir_make (dir, perm, pool);   /* And complete the path */
-    }
-    return rv;
-}
-
-
-APR_DECLARE(apr_status_t) apr_dir_remove(const char *path, apr_pool_t *pool)
-{
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        apr_wchar_t wpath[APR_PATH_MAX];
-        apr_status_t rv;
-        if (rv = utf8_to_unicode_path(wpath, sizeof(wpath) 
-                                              / sizeof(apr_wchar_t), path)) {
-            return rv;
-        }
-        if (!RemoveDirectoryW(wpath)) {
-            return apr_get_os_error();
-        }
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-        if (!RemoveDirectory(path)) {
-            return apr_get_os_error();
-        }
-#endif
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_dir_get(apr_os_dir_t **thedir,
-                                         apr_dir_t *dir)
-{
-    if (dir == NULL) {
-        return APR_ENODIR;
-    }
-    *thedir = dir->dirhand;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_dir_put(apr_dir_t **dir,
-                                         apr_os_dir_t *thedir,
-                                         apr_pool_t *pool)
-{
-    return APR_ENOTIMPL;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/filedup.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/filedup.c
deleted file mode 100644
index 8aaf6df2..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/filedup.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "win32/apr_arch_file_io.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_strings.h"
-#include <string.h>
-#include "apr_arch_inherit.h"
-#include <io.h> /* for [_open/_get]_osfhandle */
-
-
-APR_DECLARE(apr_status_t) apr_file_dup(apr_file_t **new_file,
-                                       apr_file_t *old_file, apr_pool_t *p)
-{
-#ifdef _WIN32_WCE
-    return APR_ENOTIMPL;
-#else
-    HANDLE hproc = GetCurrentProcess();
-    HANDLE newhand = NULL;
-
-    if (!DuplicateHandle(hproc, old_file->filehand, 
-                         hproc, &newhand, 0, FALSE, 
-                         DUPLICATE_SAME_ACCESS)) {
-        return apr_get_os_error();
-    }
-
-    (*new_file) = (apr_file_t *) apr_pcalloc(p, sizeof(apr_file_t));
-    (*new_file)->filehand = newhand;
-    (*new_file)->flags = old_file->flags & ~(APR_STD_FLAGS | APR_INHERIT);
-    (*new_file)->pool = p;
-    (*new_file)->fname = apr_pstrdup(p, old_file->fname);
-    (*new_file)->append = old_file->append;
-    (*new_file)->buffered = FALSE;
-    (*new_file)->ungetchar = old_file->ungetchar;
-
-#if APR_HAS_THREADS
-    if (old_file->mutex) {
-        apr_thread_mutex_create(&((*new_file)->mutex),
-                                APR_THREAD_MUTEX_DEFAULT, p);
-    }
-#endif
-
-    apr_pool_cleanup_register((*new_file)->pool, (void *)(*new_file), file_cleanup,
-                        apr_pool_cleanup_null);
-
-    return APR_SUCCESS;
-#endif /* !defined(_WIN32_WCE) */
-}
-
-APR_DECLARE(apr_status_t) apr_file_dup2(apr_file_t *new_file,
-                                        apr_file_t *old_file, apr_pool_t *p)
-{
-#ifdef _WIN32_WCE
-    return APR_ENOTIMPL;
-#else
-    DWORD stdhandle = 0;
-    HANDLE hproc = GetCurrentProcess();
-    HANDLE newhand = NULL;
-    apr_int32_t newflags;
-    int fd;
-
-    if (new_file->flags & APR_STD_FLAGS)
-    {
-        if ((new_file->flags & APR_STD_FLAGS) == APR_STDERR_FLAG)
-        {
-            /* Flush stderr and unset its buffer, then commit the fd-based buffer.
-             * This is typically a noop for Win2K/XP since services with NULL std
-             * handles [but valid FILE *'s, oddly enough], but is required
-             * for NT 4.0 and to use this code outside of services.
-             */
-            fflush(stderr);
-            setvbuf(stderr, NULL, _IONBF, 0);
-            _commit(2 /* stderr */);
-
-            /* Clone a handle can _close() without harming the source handle,
-             * open an MSVCRT-based pseudo-fd for the file handle, then dup2
-             * and close our temporary pseudo-fd once it's been duplicated.
-             * This will incidently keep the FILE-based stderr in sync.
-             * Note the apparently redundant _O_BINARY coersions are required.
-             * Note the _dup2 will close the previous std Win32 handle.
-             */
-            if (!DuplicateHandle(hproc, old_file->filehand, hproc, &newhand,
-                                 0, FALSE, DUPLICATE_SAME_ACCESS)) {
-                return apr_get_os_error();
-            }
-            fd = _open_osfhandle((INT_PTR)newhand, _O_WRONLY | _O_BINARY);
-            _dup2(fd, 2);
-            _close(fd);
-            _setmode(2, _O_BINARY);
-
-            /* hPipeWrite was _close()'ed above, and _dup2()'ed
-             * to fd 2 creating a new, inherited Win32 handle.
-             * Recover that real handle from fd 2.  Note that
-             * SetStdHandle(STD_ERROR_HANDLE, _get_osfhandle(2))
-             * is implicit in the dup2() call above
-             */
-            newhand = (HANDLE)_get_osfhandle(2);
-        }
-        else if ((new_file->flags & APR_STD_FLAGS) == APR_STDOUT_FLAG) {
-            /* For the process flow see the stderr case above */
-            fflush(stdout);
-            setvbuf(stdout, NULL, _IONBF, 0);
-            _commit(1 /* stdout */);
-
-            if (!DuplicateHandle(hproc, old_file->filehand, hproc, &newhand,
-                                 0, FALSE, DUPLICATE_SAME_ACCESS)) {
-                return apr_get_os_error();
-            }
-            fd = _open_osfhandle((INT_PTR)newhand, _O_WRONLY | _O_BINARY);
-            _dup2(fd, 1);
-            _close(fd);
-            _setmode(1, _O_BINARY);
-            newhand = (HANDLE)_get_osfhandle(1);
-        }
-        else if ((new_file->flags & APR_STD_FLAGS) == APR_STDIN_FLAG) {
-            /* For the process flow see the stderr case above */
-            fflush(stdin);
-            setvbuf(stdin, NULL, _IONBF, 0);
-            _commit(0 /* stdin */);
-
-            if (!DuplicateHandle(hproc, old_file->filehand, hproc, &newhand,
-                                 0, FALSE, DUPLICATE_SAME_ACCESS)) {
-                return apr_get_os_error();
-            }
-            fd = _open_osfhandle((INT_PTR)newhand, _O_RDONLY | _O_BINARY);
-            _dup2(fd, 0);
-            _close(fd);
-            _setmode(0, _O_BINARY);
-            newhand = (HANDLE)_get_osfhandle(0);
-        }
-        newflags = (new_file->flags & APR_STD_FLAGS) 
-                 | (old_file->flags & ~APR_STD_FLAGS) | APR_INHERIT;
-
-        /* No need  to close the old file, _dup2() above did that for us */
-    }
-    else {
-        if (!DuplicateHandle(hproc, old_file->filehand, 
-                             hproc, &newhand, 0,
-                             FALSE, DUPLICATE_SAME_ACCESS)) {
-            return apr_get_os_error();
-        }
-        newflags = old_file->flags & ~(APR_STD_FLAGS | APR_INHERIT);
-
-        if (new_file->filehand
-                && (new_file->filehand != INVALID_HANDLE_VALUE)) {
-            CloseHandle(new_file->filehand);
-        }
-    }
-
-    new_file->flags = newflags;
-    new_file->filehand = newhand;
-    new_file->fname = apr_pstrdup(new_file->pool, old_file->fname);
-    new_file->append = old_file->append;
-    new_file->buffered = FALSE;
-    new_file->ungetchar = old_file->ungetchar;
-
-#if APR_HAS_THREADS
-    if (old_file->mutex) {
-        apr_thread_mutex_create(&(new_file->mutex),
-                                APR_THREAD_MUTEX_DEFAULT, p);
-    }
-#endif
-
-    return APR_SUCCESS;
-#endif /* !defined(_WIN32_WCE) */
-}
-
-APR_DECLARE(apr_status_t) apr_file_setaside(apr_file_t **new_file,
-                                            apr_file_t *old_file,
-                                            apr_pool_t *p)
-{
-    *new_file = (apr_file_t *)apr_palloc(p, sizeof(apr_file_t));
-    memcpy(*new_file, old_file, sizeof(apr_file_t));
-    (*new_file)->pool = p;
-    if (old_file->buffered) {
-        (*new_file)->buffer = apr_palloc(p, APR_FILE_BUFSIZE);
-        if (old_file->direction == 1) {
-            memcpy((*new_file)->buffer, old_file->buffer, old_file->bufpos);
-        }
-        else {
-            memcpy((*new_file)->buffer, old_file->buffer, old_file->dataRead);
-        }
-    }
-    if (old_file->mutex) {
-        apr_thread_mutex_create(&((*new_file)->mutex),
-                                APR_THREAD_MUTEX_DEFAULT, p);
-        apr_thread_mutex_destroy(old_file->mutex);
-    }
-    if (old_file->fname) {
-        (*new_file)->fname = apr_pstrdup(p, old_file->fname);
-    }
-    if (!(old_file->flags & APR_FILE_NOCLEANUP)) {
-        apr_pool_cleanup_register(p, (void *)(*new_file), 
-                                  file_cleanup,
-                                  file_cleanup);
-    }
-
-    old_file->filehand = INVALID_HANDLE_VALUE;
-    apr_pool_cleanup_kill(old_file->pool, (void *)old_file,
-                          file_cleanup);
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/filepath.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/filepath.c
deleted file mode 100644
index f3c1b77b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/filepath.c
+++ /dev/null
@@ -1,985 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_arch_file_io.h"
-#include "apr_strings.h"
-#include "apr_lib.h"
-#include <string.h>
-#include <ctype.h>
-
-#ifdef NETWARE
-#include <unistd.h>
-#include <fsio.h>
-#endif
-
- /* WinNT accepts several odd forms of a 'root' path.  Under Unicode
- * calls (ApiFunctionW) the //?/C:/foo or //?/UNC/mach/share/foo forms
- * are accepted.  Ansi and Unicode functions both accept the //./C:/foo 
- * form under WinNT/2K.  Since these forms are handled in the utf-8 to 
- * unicode translation phase, we don't want the user confused by them, so 
- * we will accept them but always return the canonical C:/ or //mach/share/
- *
- * OS2 appears immune from the nonsense :)
- */
-
-APR_DECLARE(apr_status_t) apr_filepath_root(const char **rootpath, 
-                                            const char **inpath, 
-                                            apr_int32_t flags,
-                                            apr_pool_t *p)
-{
-    const char *testpath = *inpath;
-    char *newpath;
-#ifdef NETWARE
-    char seperator[2] = { 0, 0};
-    char server[APR_PATH_MAX+1];
-    char volume[APR_PATH_MAX+1];
-    char file[APR_PATH_MAX+1];
-    char *volsep = NULL;
-    int elements;
-
-    if (inpath && *inpath)
-        volsep = strchr (*inpath, ':');
-    else
-        return APR_EBADPATH;
-
-    if (strlen(*inpath) > APR_PATH_MAX) {
-        return APR_EBADPATH;
-    }
-
-    seperator[0] = (flags & APR_FILEPATH_NATIVE) ? '\\' : '/';
-
-    /* Allocate and initialize each of the segment buffers
-    */
-    server[0] = volume[0] = file[0] = '\0';
-
-    /* If we don't have a volume separator then don't bother deconstructing
-        the path since we won't use the deconstructed information anyway.
-    */
-    if (volsep) {
-        /* Split the inpath into its separate parts. */
-        deconstruct(testpath, server, volume, NULL, file, NULL, &elements, PATH_UNDEF);
-    
-        /* If we got a volume part then continue splitting out the root.
-            Otherwise we either have an incomplete or relative path
-        */
-        if (volume && strlen(volume) > 0) {
-            newpath = apr_pcalloc(p, strlen(server)+strlen(volume)+5);
-            construct(newpath, server, volume, NULL, NULL, NULL, PATH_NETWARE);
-
-            /* NetWare doesn't add the root slash so we need to add it manually.
-            */
-            strcat(newpath, seperator);
-            *rootpath = newpath;
-
-            /* Skip the inpath pointer down to the first non-root character
-            */
-            newpath = volsep;
-            do {
-                ++newpath;
-            } while (*newpath && ((*newpath == '/') || (*newpath == '\\')));
-            *inpath = newpath;
-
-            /* Need to handle APR_FILEPATH_TRUENAME checking here. */
-
-            return APR_SUCCESS;
-        }
-        else
-            return APR_EBADPATH;
-    }
-    else if ((**inpath == '/') || (**inpath == '\\')) {
-        /* if we have a root path without a volume then just split
-            in same manner as unix although this path will be
-            incomplete.
-        */
-        *rootpath = apr_pstrdup(p, seperator);
-        do {
-            ++(*inpath);
-        } while ((**inpath == '/') || (**inpath == '\\'));
-    }
-    else
-        return APR_ERELATIVE;
-
-    return APR_EINCOMPLETE;
-
-#else /* ndef(NETWARE) */
-
-    char seperator[2];
-    const char *delim1;
-    const char *delim2;
-
-    seperator[0] = (flags & APR_FILEPATH_NATIVE) ? '\\' : '/';
-    seperator[1] = 0;
-
-    if (testpath[0] == '/' || testpath[0] == '\\') {
-        if (testpath[1] == '/' || testpath[1] == '\\') {
-
-#ifdef WIN32 /* //server/share isn't the only // delimited syntax */
-            if ((testpath[2] == '?' || testpath[2] == '.')
-                    && (testpath[3] == '/' || testpath[3] == '\\')) {
-                if (IS_FNCHAR(testpath[4]) && testpath[5] == ':') 
-                {
-                    apr_status_t rv;
-                    testpath += 4;
-                    /* given  '//?/C: or //./C: let us try this
-                     * all over again from the drive designator
-                     */
-                    rv = apr_filepath_root(rootpath, &testpath, flags, p);
-                    if (!rv || rv == APR_EINCOMPLETE)
-                        *inpath = testpath;
-                    return rv;
-                }
-                else if (strncasecmp(testpath + 4, "UNC", 3) == 0
-                      && (testpath[7] == '/' || testpath[7] == '\\') 
-                      && (testpath[2] == '?')) {
-                    /* given  '//?/UNC/machine/share, a little magic 
-                     * at the end makes this all work out by using
-                     * 'C/machine' as the starting point and replacing
-                     * the UNC delimiters with \'s, including the 'C'
-                     */
-                    testpath += 6;
-                }
-                else
-                    /* This must not be a path to a file, but rather
-                     * a volume or device.  Die for now.
-                     */
-                    return APR_EBADPATH;
-            }
-#endif /* WIN32 (non - //server/share syntax) */
-
-            /* Evaluate path of '//[machine/[share[/]]]' */
-            delim1 = testpath + 2;
-            do {
-                /* Protect against //X/ where X is illegal */
-                if (*delim1 && !IS_FNCHAR(*(delim1++)))
-                    return APR_EBADPATH;
-            } while (*delim1 && *delim1 != '/' && *delim1 != '\\');
-
-            if (*delim1) {
-                apr_status_t rv;
-                delim2 = delim1 + 1;
-                while (*delim2 && *delim2 != '/' && *delim2 != '\\') {
-                    /* Protect against //machine/X/ where X is illegal */
-                    if (!IS_FNCHAR(*(delim2++)))
-                        return APR_EBADPATH;
-                } 
-
-                /* Copy the '//machine/[share[/]]' path, always providing 
-                 * an extra byte for the trailing slash.
-                 */
-                newpath = apr_pstrmemdup(p, testpath, delim2 - testpath + 1);
-
-                if (delim2 == delim1 + 1) {
-                    /* We found simply \\machine\, so give up already
-                     */
-                    *rootpath = newpath;
-                    *inpath = delim2;
-                    return APR_EINCOMPLETE;
-                }
-
-                if (flags & APR_FILEPATH_TRUENAME) {
-                    /* Validate the \\Machine\Share\ designation, 
-                     * Win32 will argue about slashed in UNC paths, 
-                     * so use backslashes till we finish testing,
-                     * and add the trailing backslash [required].
-                     * apr_pstrmemdup above guarentees us the new 
-                     * trailing null character.
-                     */
-                    newpath[0] = '\\';
-                    newpath[1] = '\\';
-                    newpath[delim1 - testpath] = '\\';
-                    newpath[delim2 - testpath] = '\\';
-
-                    rv = filepath_root_test(newpath, p);
-                    if (rv)
-                        return rv;
-                    rv = filepath_root_case(&newpath, newpath, p);
-                    if (rv)
-                        return rv;
-                    newpath[0] = seperator[0];
-                    newpath[1] = seperator[0];
-                    newpath[delim1 - testpath] = seperator[0];
-                    newpath[delim2 - testpath] = (*delim2 ? seperator[0] : '\0');
-                }
-                else {                
-                    /* Give back the caller's own choice of delimiters
-                     */
-                    newpath[0] = testpath[0];
-                    newpath[1] = testpath[1];
-                    newpath[delim1 - testpath] = *delim1;
-                    newpath[delim2 - testpath] = *delim2;
-                }
-
-                /* If this root included the trailing / or \ designation 
-                 * then lop off multiple trailing slashes and give back
-                 * appropriate delimiters.
-                 */
-                if (*delim2) {
-                    *inpath = delim2 + 1;
-                    while (**inpath == '/' || **inpath == '\\')
-                        ++*inpath;
-                }
-                else {
-                    *inpath = delim2;
-                }
-
-                *rootpath = newpath;
-                return APR_SUCCESS;
-            }
-            
-            /* Have path of '\\[machine]', if the machine is given,
-             * append same trailing slash as the leading slash
-             */
-            delim1 = strchr(testpath, '\0');
-            if (delim1 > testpath + 2) {
-                newpath = apr_pstrndup(p, testpath, delim1 - testpath + 1);
-                if (flags & APR_FILEPATH_TRUENAME)
-                    newpath[delim1 - testpath] = seperator[0];
-                else
-                    newpath[delim1 - testpath] = newpath[0];
-                newpath[delim1 - testpath + 1] = '\0';
-            }
-            else {
-                newpath = apr_pstrndup(p, testpath, delim1 - testpath);
-            }
-            if (flags & APR_FILEPATH_TRUENAME) {
-                newpath[0] = seperator[0];
-                newpath[1] = seperator[0];
-            }
-            *rootpath = newpath;
-            *inpath = delim1;
-            return APR_EINCOMPLETE;
-        }
-
-        /* Left with a path of '/', what drive are we asking about? 
-         */
-        *inpath = testpath + 1;
-        newpath = apr_palloc(p, 2);
-        if (flags & APR_FILEPATH_TRUENAME)
-            newpath[0] = seperator[0];
-        else
-            newpath[0] = testpath[0];
-        newpath[1] = '\0';
-        *rootpath = newpath;
-        return APR_EINCOMPLETE;
-    }
-
-    /* Evaluate path of 'd:[/]' */
-    if (IS_FNCHAR(*testpath) && testpath[1] == ':') 
-    {
-        apr_status_t rv;
-        /* Validate that D:\ drive exists, test must be rooted
-         * Note that posix/win32 insists a drive letter is upper case,
-         * so who are we to argue with a 'feature'.
-         * It is a safe fold, since only A-Z is legal, and has no
-         * side effects of legal mis-mapped non-us-ascii codes.
-         */
-        newpath = apr_palloc(p, 4);
-        newpath[0] = testpath[0];
-        newpath[1] = testpath[1];
-        newpath[2] = seperator[0];
-        newpath[3] = '\0';
-        if (flags & APR_FILEPATH_TRUENAME) {
-            newpath[0] = apr_toupper(newpath[0]);
-            rv = filepath_root_test(newpath, p);
-            if (rv)
-                return rv;
-        }
-        /* Just give back the root the user handed to us.
-         */
-        if (testpath[2] != '/' && testpath[2] != '\\') {
-            newpath[2] = '\0';
-            *rootpath = newpath;
-            *inpath = testpath + 2;
-            return APR_EINCOMPLETE;
-        }
-
-        /* strip off remaining slashes that designate the root,
-         * give the caller back their original choice of slash
-         * unless this is TRUENAME'ed
-         */
-        *inpath = testpath + 3;
-        while (**inpath == '/' || **inpath == '\\')
-            ++*inpath;
-        if (!(flags & APR_FILEPATH_TRUENAME))
-            newpath[2] = testpath[2];
-        *rootpath = newpath;
-        return APR_SUCCESS;
-    }
-
-    /* Nothing interesting */
-    return APR_ERELATIVE;
-
-#endif /* ndef(NETWARE) */
-}
-
-
-APR_DECLARE(apr_status_t) apr_filepath_merge(char **newpath, 
-                                             const char *basepath, 
-                                             const char *addpath, 
-                                             apr_int32_t flags,
-                                             apr_pool_t *p)
-{
-    char path[APR_PATH_MAX]; /* isn't null term */
-    const char *baseroot = NULL;
-    const char *addroot;
-    apr_size_t rootlen; /* the length of the root portion of path, d:/ is 3 */
-    apr_size_t baselen; /* the length of basepath (excluding baseroot) */
-    apr_size_t keptlen; /* the length of the retained basepath (incl root) */
-    apr_size_t pathlen; /* the length of the result path */
-    apr_size_t segend;  /* the end of the current segment */
-    apr_size_t seglen;  /* the length of the segment (excl trailing chars) */
-    apr_status_t basetype = 0; /* from parsing the basepath's baseroot */
-    apr_status_t addtype;      /* from parsing the addpath's addroot */
-    apr_status_t rv;
-#ifndef NETWARE
-    int fixunc = 0;  /* flag to complete an incomplete UNC basepath */
-#endif
-    
-    /* Treat null as an empty path, otherwise split addroot from the addpath
-     */
-    if (!addpath) {
-        addpath = addroot = "";
-        addtype = APR_ERELATIVE;
-    }
-    else {
-        /* This call _should_ test the path
-         */
-        addtype = apr_filepath_root(&addroot, &addpath, 
-                                    APR_FILEPATH_TRUENAME
-                                    | (flags & APR_FILEPATH_NATIVE),
-                                    p);
-        if (addtype == APR_SUCCESS) {
-            addtype = APR_EABSOLUTE;
-        }
-        else if (addtype == APR_ERELATIVE) {
-            addroot = "";
-        }
-        else if (addtype != APR_EINCOMPLETE) {
-            /* apr_filepath_root was incomprehensible so fail already
-             */
-            return addtype;
-        }
-    }
-
-    /* If addpath is (even partially) rooted, then basepath is
-     * unused.  Ths violates any APR_FILEPATH_SECUREROOTTEST 
-     * and APR_FILEPATH_NOTABSOLUTE flags specified.
-     */
-    if (addtype == APR_EABSOLUTE || addtype == APR_EINCOMPLETE)
-    {
-        if (flags & APR_FILEPATH_SECUREROOTTEST)
-            return APR_EABOVEROOT;
-        if (flags & APR_FILEPATH_NOTABSOLUTE)
-            return addtype;
-    }
-
-    /* Optimized tests before we query the current working path
-     */
-    if (!basepath) {
-
-        /* If APR_FILEPATH_NOTABOVEROOT wasn't specified,
-         * we won't test the root again, it's ignored.
-         * Waste no CPU retrieving the working path.
-         */
-        if (addtype == APR_EABSOLUTE && !(flags & APR_FILEPATH_NOTABOVEROOT)) {
-            basepath = baseroot = "";
-            basetype = APR_ERELATIVE;
-        }
-
-        /* If APR_FILEPATH_NOTABSOLUTE is specified, the caller 
-         * requires an absolutely relative result, So do not retrieve 
-         * the working path.
-         */
-        if (addtype == APR_ERELATIVE && (flags & APR_FILEPATH_NOTABSOLUTE)) {
-            basepath = baseroot = "";
-            basetype = APR_ERELATIVE;
-        }
-    }
-
-    if (!basepath) 
-    {
-        /* Start with the current working path.  This is bass akwards,
-         * but required since the compiler (at least vc) doesn't like
-         * passing the address of a char const* for a char** arg.
-         * We must grab the current path of the designated drive 
-         * if addroot is given in drive-relative form (e.g. d:foo)
-         */
-        char *getpath;
-#ifndef NETWARE
-        if (addtype == APR_EINCOMPLETE && addroot[1] == ':')
-            rv = filepath_drive_get(&getpath, addroot[0], flags, p);
-        else
-#endif
-            rv = apr_filepath_get(&getpath, flags, p);
-        if (rv != APR_SUCCESS)
-            return rv;
-        basepath = getpath;
-    }
-
-    if (!baseroot) {
-        /* This call should _not_ test the path
-         */
-        basetype = apr_filepath_root(&baseroot, &basepath,
-                                     (flags & APR_FILEPATH_NATIVE), p);
-        if (basetype == APR_SUCCESS) {
-            basetype = APR_EABSOLUTE;
-        }
-        else if (basetype == APR_ERELATIVE) {
-            baseroot = "";
-        }
-        else if (basetype != APR_EINCOMPLETE) {
-            /* apr_filepath_root was incomprehensible so fail already
-             */
-            return basetype;
-        }
-    }
-    baselen = strlen(basepath);
-
-    /* If APR_FILEPATH_NOTABSOLUTE is specified, the caller 
-     * requires an absolutely relative result.  If the given 
-     * basepath is not relative then fail.
-     */
-    if ((flags & APR_FILEPATH_NOTABSOLUTE) && basetype != APR_ERELATIVE)
-        return basetype;
-
-    /* The Win32 nightmare on unc street... start combining for
-     * many possible root combinations.
-     */
-    if (addtype == APR_EABSOLUTE)
-    {
-        /* Ignore the given root path, and start with the addroot
-         */
-        if ((flags & APR_FILEPATH_NOTABOVEROOT) 
-                && strncmp(baseroot, addroot, strlen(baseroot)))
-            return APR_EABOVEROOT;
-        keptlen = 0;
-        rootlen = pathlen = strlen(addroot);
-        memcpy(path, addroot, pathlen);
-    }
-    else if (addtype == APR_EINCOMPLETE)
-    {
-        /* There are several types of incomplete paths, 
-         *     incomplete UNC paths         (//foo/ or //),
-         *     drives without rooted paths  (d: as in d:foo), 
-         * and simple roots                 (/ as in /foo).
-         * Deal with these in significantly different manners...
-         */
-#ifndef NETWARE
-        if ((addroot[0] == '/' || addroot[0] == '\\') &&
-            (addroot[1] == '/' || addroot[1] == '\\')) 
-        {
-            /* Ignore the given root path if the incomplete addpath is UNC,
-             * (note that the final result will be incomplete).
-             */
-            if (flags & APR_FILEPATH_NOTRELATIVE)
-                return addtype;
-            if ((flags & APR_FILEPATH_NOTABOVEROOT) 
-                    && strncmp(baseroot, addroot, strlen(baseroot)))
-                return APR_EABOVEROOT;
-            fixunc = 1;
-            keptlen = 0;
-            rootlen = pathlen = strlen(addroot);
-            memcpy(path, addroot, pathlen);
-        }
-        else
-#endif            
-        if ((addroot[0] == '/' || addroot[0] == '\\') && !addroot[1]) 
-        {
-            /* Bring together the drive or UNC root from the baseroot
-             * if the addpath is a simple root and basepath is rooted,
-             * otherwise disregard the basepath entirely.
-             */
-            if (basetype != APR_EABSOLUTE && (flags & APR_FILEPATH_NOTRELATIVE))
-                return basetype;
-            if (basetype != APR_ERELATIVE) {
-#ifndef NETWARE
-                if (basetype == APR_INCOMPLETE 
-                        && (baseroot[0] == '/' || baseroot[0] == '\\')
-                        && (baseroot[1] == '/' || baseroot[1] == '\\'))
-                    fixunc = 1;
-#endif
-                keptlen = rootlen = pathlen = strlen(baseroot);
-                memcpy(path, baseroot, pathlen);
-            }
-            else {
-                if (flags & APR_FILEPATH_NOTABOVEROOT)
-                    return APR_EABOVEROOT;
-                keptlen = 0;
-                rootlen = pathlen = strlen(addroot);
-                memcpy(path, addroot, pathlen);
-            }
-        }
-#ifdef NETWARE
-        else if (filepath_has_drive(addroot, DRIVE_ONLY, p)) 
-        {
-            /* If the addroot is a drive (without a volume root)
-             * use the basepath _if_ it matches this drive letter!
-             * Otherwise we must discard the basepath.
-             */
-            if (!filepath_compare_drive(addroot, baseroot, p) && 
-                filepath_has_drive(baseroot, 0, p)) {
-#else
-        else if (addroot[0] && addroot[1] == ':' && !addroot[2]) 
-        {
-            /* If the addroot is a drive (without a volume root)
-             * use the basepath _if_ it matches this drive letter!
-             * Otherwise we must discard the basepath.
-             */
-            if (addroot[0] == baseroot[0] && baseroot[1] == ':') {
-#endif
-                /* Base the result path on the basepath
-                 */
-                if (basetype != APR_EABSOLUTE && (flags & APR_FILEPATH_NOTRELATIVE))
-                    return basetype;
-                rootlen = strlen(baseroot);
-                keptlen = pathlen = rootlen + baselen;
-                if (keptlen >= sizeof(path))
-                    return APR_ENAMETOOLONG;
-                memcpy(path, baseroot, rootlen);
-                memcpy(path + rootlen, basepath, baselen);
-            } 
-            else {
-                if (flags & APR_FILEPATH_NOTRELATIVE)
-                    return addtype;
-                if (flags & APR_FILEPATH_NOTABOVEROOT)
-                    return APR_EABOVEROOT;
-                keptlen = 0;
-                rootlen = pathlen = strlen(addroot);
-                memcpy(path, addroot, pathlen);
-            }
-        }
-        else {
-            /* Now this is unexpected, we aren't aware of any other
-             * incomplete path forms!  Fail now.
-             */
-            return APR_EBADPATH;
-        }
-    }
-    else { /* addtype == APR_ERELATIVE */
-        /* If both paths are relative, fail early
-         */
-        if (basetype != APR_EABSOLUTE && (flags & APR_FILEPATH_NOTRELATIVE))
-            return basetype;
-
-#ifndef NETWARE
-        /* An incomplete UNC path must be completed
-         */
-        if (basetype == APR_INCOMPLETE 
-                && (baseroot[0] == '/' || baseroot[0] == '\\')
-                && (baseroot[1] == '/' || baseroot[1] == '\\'))
-            fixunc = 1;
-#endif
-
-        /* Base the result path on the basepath
-         */
-        rootlen = strlen(baseroot);
-        keptlen = pathlen = rootlen + baselen;
-        if (keptlen >= sizeof(path))
-            return APR_ENAMETOOLONG;
-        memcpy(path, baseroot, rootlen);
-        memcpy(path + rootlen, basepath, baselen);
-    }
-
-    /* '/' terminate the given root path unless it's already terminated
-     * or is an incomplete drive root.  Correct the trailing slash unless
-     * we have an incomplete UNC path still to fix.
-     */
-    if (pathlen && path[pathlen - 1] != ':') {
-        if (path[pathlen - 1] != '/' && path[pathlen - 1] != '\\') {
-            if (pathlen + 1 >= sizeof(path))
-                return APR_ENAMETOOLONG;
-        
-            path[pathlen++] = ((flags & APR_FILEPATH_NATIVE) ? '\\' : '/');
-        }
-    /*  XXX: wrong, but gotta figure out what I intended;
-     *  else if (!fixunc)
-     *      path[pathlen++] = ((flags & APR_FILEPATH_NATIVE) ? '\\' : '/');
-     */
-    }
-
-    while (*addpath) 
-    {
-        /* Parse each segment, find the closing '/' 
-         */
-        seglen = 0;
-        while (addpath[seglen] && addpath[seglen] != '/'
-                               && addpath[seglen] != '\\')
-            ++seglen;
-
-        /* Truncate all trailing spaces and all but the first two dots */
-        segend = seglen;
-        while (seglen && (addpath[seglen - 1] == ' ' 
-                       || addpath[seglen - 1] == '.')) {
-            if (seglen > 2 || addpath[seglen - 1] != '.' || addpath[0] != '.')
-                --seglen;
-            else
-                break;
-        }
-
-        if (seglen == 0 || (seglen == 1 && addpath[0] == '.')) 
-        {
-            /* NOTE: win32 _hates_ '/ /' and '/. /' (yes, with spaces in there)
-             * so eliminate all preconceptions that it is valid.
-             */
-            if (seglen < segend)
-                return APR_EBADPATH;
-
-#ifndef NETWARE
-            /* This isn't legal unless the unc path is completed
-             */
-            if (fixunc)
-                return APR_EBADPATH;
-#endif
-
-            /* Otherwise, this is a noop segment (/ or ./) so ignore it 
-             */
-        }
-        else if (seglen == 2 && addpath[0] == '.' && addpath[1] == '.') 
-        {
-            /* NOTE: win32 _hates_ '/.. /' (yes, with a space in there)
-             * and '/..../', some functions treat it as ".", and some 
-             * fail! Eliminate all preconceptions that they are valid.
-             */
-            if (seglen < segend && (seglen != 3 || addpath[2] != '.'))
-                return APR_EBADPATH;
-
-#ifndef NETWARE
-            /* This isn't legal unless the unc path is completed
-             */
-            if (fixunc)
-                return APR_EBADPATH;
-#endif
-
-            /* backpath (../) when an absolute path is given */
-            if (rootlen && (pathlen <= rootlen)) 
-            {
-                /* Attempt to move above root.  Always die if the 
-                 * APR_FILEPATH_SECUREROOTTEST flag is specified.
-                 */
-                if (flags & APR_FILEPATH_SECUREROOTTEST)
-                    return APR_EABOVEROOT;
-                
-                /* Otherwise this is simply a noop, above root is root.
-                 */
-            }
-            else if (pathlen == 0 
-                      || (pathlen >= 3 
-                           && (pathlen == 3
-                                || path[pathlen - 4] == ':'
-                                || path[pathlen - 4] == '/' 
-                                || path[pathlen - 4] == '\\')
-                           &&  path[pathlen - 3] == '.' 
-                           &&  path[pathlen - 2] == '.' 
-                           && (path[pathlen - 1] == '/' 
-                                || path[pathlen - 1] == '\\')))
-            {
-                /* Verified path is empty, exactly "..[/\]", or ends
-                 * in "[:/\]..[/\]" - these patterns we will not back
-                 * over since they aren't 'prior segements'.
-                 * 
-                 * If APR_FILEPATH_SECUREROOTTEST.was given, die now.
-                 */
-                if (flags & APR_FILEPATH_SECUREROOTTEST)
-                    return APR_EABOVEROOT;
-
-                /* Otherwise append another backpath.
-                 */
-                if (pathlen + 3 >= sizeof(path))
-                    return APR_ENAMETOOLONG;
-                path[pathlen++] = '.';
-                path[pathlen++] = '.';
-                if (addpath[segend]) {
-                    path[pathlen++] = ((flags & APR_FILEPATH_NATIVE) 
-                                    ? '\\' : ((flags & APR_FILEPATH_TRUENAME)
-                                           ? '/' : addpath[segend]));
-                }
-                /* The 'root' part of this path now includes the ../ path,
-                 * because that backpath will not be parsed by the truename
-                 * code below.
-                 */
-                keptlen = pathlen;
-            }
-            else 
-            {
-                /* otherwise crop the prior segment 
-                 */
-                do {
-                    --pathlen;
-                } while (pathlen && path[pathlen - 1] != '/'
-                                 && path[pathlen - 1] != '\\');
-
-                /* Now test if we are above where we started and back up
-                 * the keptlen offset to reflect the added/altered path.
-                 */
-                if (pathlen < keptlen) 
-                {
-                    if (flags & APR_FILEPATH_SECUREROOTTEST)
-                        return APR_EABOVEROOT;
-                    keptlen = pathlen;
-                }
-            }
-        }
-        else /* not empty or dots */
-        {
-#ifndef NETWARE
-            if (fixunc) {
-                const char *testpath = path;
-                const char *testroot;
-                apr_status_t testtype;
-                apr_size_t i = (addpath[segend] != '\0');
-                
-                /* This isn't legal unless the unc path is complete!
-                 */
-                if (seglen < segend)
-                    return APR_EBADPATH;
-                if (pathlen + seglen + 1 >= sizeof(path))
-                    return APR_ENAMETOOLONG;
-                memcpy(path + pathlen, addpath, seglen + i);
-                
-                /* Always add the trailing slash to a UNC segment
-                 */
-                path[pathlen + seglen] = ((flags & APR_FILEPATH_NATIVE) 
-                                             ? '\\' : '/');
-                pathlen += seglen + 1;
-
-                /* Recanonicalize the UNC root with the new UNC segment,
-                 * and if we succeed, reset this test and the rootlen,
-                 * and replace our path with the canonical UNC root path
-                 */
-                path[pathlen] = '\0';
-                /* This call _should_ test the path
-                 */
-                testtype = apr_filepath_root(&testroot, &testpath, 
-                                             APR_FILEPATH_TRUENAME
-                                             | (flags & APR_FILEPATH_NATIVE),
-                                             p);
-                if (testtype == APR_SUCCESS) {
-                    rootlen = pathlen = (testpath - path);
-                    memcpy(path, testroot, pathlen);
-                    fixunc = 0;
-                }
-                else if (testtype != APR_EINCOMPLETE) {
-                    /* apr_filepath_root was very unexpected so fail already
-                     */
-                    return testtype;
-                }
-            }
-            else
-#endif
-            {
-                /* An actual segment, append it to the destination path
-                 */
-                apr_size_t i = (addpath[segend] != '\0');
-                if (pathlen + seglen + i >= sizeof(path))
-                    return APR_ENAMETOOLONG;
-                memcpy(path + pathlen, addpath, seglen + i);
-                if (i)
-                    path[pathlen + seglen] = ((flags & APR_FILEPATH_NATIVE) 
-                                                 ? '\\' : '/');
-                pathlen += seglen + i;
-            }
-        }
-
-        /* Skip over trailing slash to the next segment
-         */
-        if (addpath[segend])
-            ++segend;
-
-        addpath += segend;
-    }
-    
-    /* keptlen will be the baselen unless the addpath contained
-     * backpath elements.  If so, and APR_FILEPATH_NOTABOVEROOT
-     * is specified (APR_FILEPATH_SECUREROOTTEST was caught above),
-     * compare the string beyond the root to assure the result path 
-     * is still within given basepath.  Note that the root path 
-     * segment is thoroughly tested prior to path parsing.
-     */
-    if ((flags & APR_FILEPATH_NOTABOVEROOT) && baselen) {
-        if (memcmp(basepath, path + rootlen, baselen) != 0)
-            return APR_EABOVEROOT;
- 
-         /* Ahem... if we have a basepath without a trailing slash,
-          * we better be sure that /foo wasn't replaced with /foobar!
-          */
-        if (basepath[baselen - 1] != '/' && basepath[baselen - 1] != '\\'
-              && path[rootlen + baselen] && path[rootlen + baselen] != '/' 
-                                         && path[rootlen + baselen] != '\\')
-            return APR_EABOVEROOT;
-    }
-
-    if (addpath && (flags & APR_FILEPATH_TRUENAME)) {
-        /* We can always skip the root, it's already true-named. */
-        if (rootlen > keptlen)
-            keptlen = rootlen;
-        if ((path[keptlen] == '/') || (path[keptlen] == '\\')) {
-            /* By rights, keptlen may grown longer than pathlen.
-             * we wont' use it again (in that case) so we don't care.
-             */
-            ++keptlen;
-        }
-        /* Go through all the new segments */
-        while (keptlen < pathlen) {
-            apr_finfo_t finfo;
-            char saveslash = 0;
-            seglen = 0;
-            /* find any slash and set it aside for a minute. */
-            for (seglen = 0; keptlen + seglen < pathlen; ++seglen) {
-                if ((path[keptlen + seglen] == '/')  ||
-                    (path[keptlen + seglen] == '\\')) {
-                    saveslash = path[keptlen + seglen];
-                    break;
-                }
-            }
-            /* Null term for stat! */
-            path[keptlen + seglen] = '\0';
-            if ((rv = apr_lstat(&finfo, path, 
-                                APR_FINFO_TYPE | APR_FINFO_NAME, p))
-                == APR_SUCCESS) {
-                apr_size_t namelen = strlen(finfo.name);
-
-#if defined(OS2) /* only has case folding, never aliases that change the length */
-
-                if (memcmp(finfo.name, path + keptlen, seglen) != 0) {
-                    memcpy(path + keptlen, finfo.name, namelen);
-                }
-#else /* WIN32 || NETWARE; here there be aliases that gire and gimble and change length */
-
-                if ((namelen != seglen) || 
-                    (memcmp(finfo.name, path + keptlen, seglen) != 0)) 
-                {
-                    if (namelen <= seglen) {
-                        memcpy(path + keptlen, finfo.name, namelen);
-                        if ((namelen < seglen) && saveslash) {
-                            memmove(path + keptlen + namelen + 1,
-                                   path + keptlen + seglen + 1,
-                                   pathlen - keptlen - seglen);
-                            pathlen += namelen - seglen;
-                            seglen = namelen;
-                        }
-                    }
-                    else { /* namelen > seglen */
-                        if (pathlen + namelen - seglen >= sizeof(path))
-                            return APR_ENAMETOOLONG;
-                        if (saveslash) {
-                            memmove(path + keptlen + namelen + 1,
-                                   path + keptlen + seglen + 1,
-                                   pathlen - keptlen - seglen);
-                        }
-                        memcpy(path + keptlen, finfo.name, namelen);
-                        pathlen += namelen - seglen;
-                        seglen = namelen;
-                    }
-                }
-#endif /* !OS2 (Whatever that alias was we're over it) */
-
-                /* That's it, the rest is path info. 
-                 * I don't know how we aught to handle this.  Should
-                 * we define a new error to indicate 'more info'?
-                 * Should we split out the rest of the path?
-                 */
-                if ((finfo.filetype != APR_DIR) && 
-                    (finfo.filetype != APR_LNK) && saveslash) 
-                    rv = APR_ENOTDIR;
-#ifdef XXX_FIGURE_THIS_OUT
-                {
-                    /* the example inserts a null between the end of 
-                     * the filename and the next segment, and increments
-                     * the path length so we would return both segments.
-                     */
-                    if (saveslash) {
-                        keptlen += seglen;
-                        path[keptlen] = saveslash;
-                        if (pathlen + 1 >= sizeof(path))
-                            return APR_ENAMETOOLONG;
-                        memmove(path + keptlen + 1,
-                               path + keptlen,
-                               pathlen - keptlen);
-                        path[keptlen] = '\0';
-                        ++pathlen;
-                        break;
-                    }
-                }
-#endif
-            }
-
-            /* put back the '/' */
-            if (saveslash) {
-                path[keptlen + seglen] = saveslash;
-                ++seglen;
-            }
-            keptlen += seglen;
-
-            if (rv != APR_SUCCESS) {
-                if (APR_STATUS_IS_ENOENT(rv))
-                    break;
-                if (APR_STATUS_IS_EPATHWILD(rv))
-                    /* This path included wildcards.  The path elements
-                     * that did not contain wildcards are canonicalized,
-                     * so we will return the path, although later elements
-                     * don't necessarily exist, and aren't canonical.
-                     */
-                    break;
-                else if (APR_STATUS_IS_ENOTDIR(rv))
-                    /* This is a little more serious, we just added a name
-                     * onto a filename (think http's PATH_INFO)
-                     * If the caller is foolish enough to do this, we expect
-                     * the've already canonicalized the root) that they knew
-                     * what they are doing :(
-                     */
-                    break;
-                else
-                    return rv;
-            }
-        }
-    }
-
-    *newpath = apr_pmemdup(p, path, pathlen + 1);
-    (*newpath)[pathlen] = '\0';
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_filepath_list_split(apr_array_header_t **pathelts,
-                                                  const char *liststr,
-                                                  apr_pool_t *p)
-{
-    return apr_filepath_list_split_impl(pathelts, liststr, ';', p);
-}
-
-APR_DECLARE(apr_status_t) apr_filepath_list_merge(char **liststr,
-                                                  apr_array_header_t *pathelts,
-                                                  apr_pool_t *p)
-{
-    return apr_filepath_list_merge_impl(liststr, pathelts, ';', p);
-}
-
-
-APR_DECLARE(apr_status_t) apr_filepath_encoding(int *style, apr_pool_t *p)
-{
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        *style = APR_FILEPATH_ENCODING_UTF8;
-        return APR_SUCCESS;
-    }
-#endif
-
-    *style = APR_FILEPATH_ENCODING_LOCALE;
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/filestat.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/filestat.c
deleted file mode 100644
index 041b78de..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/filestat.c
+++ /dev/null
@@ -1,767 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include <aclapi.h>
-#include "apr_private.h"
-#include "apr_arch_file_io.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_strings.h"
-#include "apr_errno.h"
-#include "apr_time.h"
-#include <sys/stat.h>
-#include "apr_arch_atime.h"
-#include "apr_arch_misc.h"
-
-/* We have to assure that the file name contains no '*'s, or other
- * wildcards when using FindFirstFile to recover the true file name.
- */
-static apr_status_t test_safe_name(const char *name)
-{
-    /* Only accept ':' in the second position of the filename,
-     * as the drive letter delimiter:
-     */
-    if (apr_isalpha(*name) && (name[1] == ':')) {
-        name += 2;
-    }
-    while (*name) {
-        if (!IS_FNCHAR(*name) && (*name != '\\') && (*name != '/')) {
-            if (*name == '?' || *name == '*')
-                return APR_EPATHWILD;
-            else
-                return APR_EBADPATH;
-        }
-        ++name;
-    }
-    return APR_SUCCESS;
-}
-
-static apr_status_t free_localheap(void *heap) {
-    LocalFree(heap);
-    return APR_SUCCESS;
-}
-
-static apr_gid_t worldid = NULL;
-
-static void free_world(void)
-{
-    if (worldid) {
-        FreeSid(worldid);
-        worldid = NULL;
-    }
-}
-
-/* Left bit shifts from World scope to given scope */
-typedef enum prot_scope_e {
-    prot_scope_world = 0,
-    prot_scope_group = 4,
-    prot_scope_user =  8
-} prot_scope_e;
-
-static apr_fileperms_t convert_prot(ACCESS_MASK acc, prot_scope_e scope)
-{
-    /* These choices are based on the single filesystem bit that controls
-     * the given behavior.  They are -not- recommended for any set protection
-     * function, such a function should -set- use GENERIC_READ/WRITE/EXECUTE
-     */
-    apr_fileperms_t prot = 0;
-    if (acc & FILE_EXECUTE)
-        prot |= APR_WEXECUTE;
-    if (acc & FILE_WRITE_DATA)
-        prot |= APR_WWRITE;
-    if (acc & FILE_READ_DATA)
-        prot |= APR_WREAD;
-    return (prot << scope);
-}
-
-static void resolve_prot(apr_finfo_t *finfo, apr_int32_t wanted, PACL dacl)
-{
-    TRUSTEE_W ident = {NULL, NO_MULTIPLE_TRUSTEE, TRUSTEE_IS_SID};
-    ACCESS_MASK acc;
-    /*
-     * This function is only invoked for WinNT, 
-     * there is no reason for os_level testing here.
-     */
-    if ((wanted & APR_FINFO_WPROT) && !worldid) {
-        SID_IDENTIFIER_AUTHORITY SIDAuth = SECURITY_WORLD_SID_AUTHORITY;
-        if (AllocateAndInitializeSid(&SIDAuth, 1, SECURITY_WORLD_RID,
-                                     0, 0, 0, 0, 0, 0, 0, &worldid))
-            atexit(free_world);
-        else
-            worldid = NULL;
-    }
-    if ((wanted & APR_FINFO_UPROT) && (finfo->valid & APR_FINFO_USER)) {
-        ident.TrusteeType = TRUSTEE_IS_USER;
-        ident.ptstrName = finfo->user;
-        /* GetEffectiveRightsFromAcl isn't supported under Win9x,
-         * which shouldn't come as a surprize.  Since we are passing
-         * TRUSTEE_IS_SID, always skip the A->W layer.
-         */
-        if (GetEffectiveRightsFromAclW(dacl, &ident, &acc) == ERROR_SUCCESS) {
-            finfo->protection |= convert_prot(acc, prot_scope_user);
-            finfo->valid |= APR_FINFO_UPROT;
-        }
-    }
-    /* Windows NT: did not return group rights.
-     * Windows 2000 returns group rights information.
-     * Since WinNT kernels don't follow the unix model of 
-     * group associations, this all all pretty mute.
-     */
-    if ((wanted & APR_FINFO_GPROT) && (finfo->valid & APR_FINFO_GROUP)) {
-        ident.TrusteeType = TRUSTEE_IS_GROUP;
-        ident.ptstrName = finfo->group;
-        if (GetEffectiveRightsFromAclW(dacl, &ident, &acc) == ERROR_SUCCESS) {
-            finfo->protection |= convert_prot(acc, prot_scope_group);
-            finfo->valid |= APR_FINFO_GPROT;
-        }
-    }
-    if ((wanted & APR_FINFO_WPROT) && (worldid)) {
-        ident.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP;
-        ident.ptstrName = worldid;
-        if (GetEffectiveRightsFromAclW(dacl, &ident, &acc) == ERROR_SUCCESS) {
-            finfo->protection |= convert_prot(acc, prot_scope_world);
-            finfo->valid |= APR_FINFO_WPROT;
-        }
-    }
-}
-
-static apr_status_t resolve_ident(apr_finfo_t *finfo, const char *fname,
-                                  apr_int32_t wanted, apr_pool_t *pool)
-{
-    apr_file_t *thefile = NULL;
-    apr_status_t rv;
-    /* 
-     * NT5 (W2K) only supports symlinks in the same manner as mount points.
-     * This code should eventually take that into account, for now treat
-     * every reparse point as a symlink...
-     *
-     * We must open the file with READ_CONTROL if we plan to retrieve the
-     * user, group or permissions.
-     */
-    
-    if ((rv = apr_file_open(&thefile, fname, APR_OPENINFO
-                          | ((wanted & APR_FINFO_LINK) ? APR_OPENLINK : 0)
-                          | ((wanted & (APR_FINFO_PROT | APR_FINFO_OWNER))
-                                ? APR_READCONTROL : 0),
-                            APR_OS_DEFAULT, pool)) == APR_SUCCESS) {
-        rv = apr_file_info_get(finfo, wanted, thefile);
-        finfo->filehand = NULL;
-        apr_file_close(thefile);
-    }
-    else if (APR_STATUS_IS_EACCES(rv) && (wanted & (APR_FINFO_PROT 
-                                                  | APR_FINFO_OWNER))) {
-        /* We have a backup plan.  Perhaps we couldn't grab READ_CONTROL?
-         * proceed without asking for that permission...
-         */
-        if ((rv = apr_file_open(&thefile, fname, APR_OPENINFO
-                              | ((wanted & APR_FINFO_LINK) ? APR_OPENLINK : 0),
-                                APR_OS_DEFAULT, pool)) == APR_SUCCESS) {
-            rv = apr_file_info_get(finfo, wanted & ~(APR_FINFO_PROT 
-                                                 | APR_FINFO_OWNER),
-                                 thefile);
-            finfo->filehand = NULL;
-            apr_file_close(thefile);
-        }
-    }
-
-    if (rv != APR_SUCCESS && rv != APR_INCOMPLETE)
-        return (rv);
-
-    /* We picked up this case above and had opened the link's properties */
-    if (wanted & APR_FINFO_LINK)
-        finfo->valid |= APR_FINFO_LINK;
-
-    return rv;
-}
-
-static void guess_protection_bits(apr_finfo_t *finfo)
-{
-    /* Read, write execute for owner.  In the Win9x environment, any
-     * readable file is executable (well, not entirely 100% true, but
-     * still looking for some cheap logic that would help us here.)
-     * The same holds on NT if a file doesn't have a DACL (e.g., on FAT)
-     */
-    if (finfo->protection & APR_FREADONLY) {
-        finfo->protection |= APR_WREAD | APR_WEXECUTE;
-    }
-    else {
-        finfo->protection |= APR_WREAD | APR_WEXECUTE | APR_WWRITE;
-    }
-    finfo->protection |= (finfo->protection << prot_scope_group)
-                       | (finfo->protection << prot_scope_user);
-
-    finfo->valid |= APR_FINFO_UPROT | APR_FINFO_GPROT | APR_FINFO_WPROT;
-}
-
-apr_status_t more_finfo(apr_finfo_t *finfo, const void *ufile, 
-                        apr_int32_t wanted, int whatfile)
-{
-    PSID user = NULL, grp = NULL;
-    PACL dacl = NULL;
-    apr_status_t rv;
-
-    if (apr_os_level < APR_WIN_NT)
-        guess_protection_bits(finfo);
-    else if (wanted & (APR_FINFO_PROT | APR_FINFO_OWNER))
-    {
-        /* On NT this request is incredibly expensive, but accurate.
-         * Since the WinNT-only functions below are protected by the
-         * (apr_os_level < APR_WIN_NT) case above, we need no extra
-         * tests, but remember GetNamedSecurityInfo & GetSecurityInfo
-         * are not supported on 9x.
-         */
-        SECURITY_INFORMATION sinf = 0;
-        PSECURITY_DESCRIPTOR pdesc = NULL;
-        if (wanted & (APR_FINFO_USER | APR_FINFO_UPROT))
-            sinf |= OWNER_SECURITY_INFORMATION;
-        if (wanted & (APR_FINFO_GROUP | APR_FINFO_GPROT))
-            sinf |= GROUP_SECURITY_INFORMATION;
-        if (wanted & APR_FINFO_PROT)
-            sinf |= DACL_SECURITY_INFORMATION;
-        if (whatfile == MORE_OF_WFSPEC) {
-            apr_wchar_t *wfile = (apr_wchar_t*) ufile;
-            int fix = 0;
-            if (wcsncmp(wfile, L"\\\\?\\", 4) == 0) {
-                fix = 4;
-                if (wcsncmp(wfile + fix, L"UNC\\", 4) == 0)
-                    wfile[6] = L'\\', fix = 6;
-            }
-            rv = GetNamedSecurityInfoW(wfile + fix, 
-                                 SE_FILE_OBJECT, sinf,
-                                 ((wanted & (APR_FINFO_USER | APR_FINFO_UPROT)) ? &user : NULL),
-                                 ((wanted & (APR_FINFO_GROUP | APR_FINFO_GPROT)) ? &grp : NULL),
-                                 ((wanted & APR_FINFO_PROT) ? &dacl : NULL),
-                                 NULL, &pdesc);
-            if (fix == 6)
-                wfile[6] = L'C';
-        }
-        else if (whatfile == MORE_OF_FSPEC)
-            rv = GetNamedSecurityInfoA((char*)ufile, 
-                                 SE_FILE_OBJECT, sinf,
-                                 ((wanted & (APR_FINFO_USER | APR_FINFO_UPROT)) ? &user : NULL),
-                                 ((wanted & (APR_FINFO_GROUP | APR_FINFO_GPROT)) ? &grp : NULL),
-                                 ((wanted & APR_FINFO_PROT) ? &dacl : NULL),
-                                 NULL, &pdesc);
-        else if (whatfile == MORE_OF_HANDLE)
-            rv = GetSecurityInfo((HANDLE)ufile, 
-                                 SE_FILE_OBJECT, sinf,
-                                 ((wanted & (APR_FINFO_USER | APR_FINFO_UPROT)) ? &user : NULL),
-                                 ((wanted & (APR_FINFO_GROUP | APR_FINFO_GPROT)) ? &grp : NULL),
-                                 ((wanted & APR_FINFO_PROT) ? &dacl : NULL),
-                                 NULL, &pdesc);
-        else
-            return APR_INCOMPLETE;
-        if (rv == ERROR_SUCCESS)
-            apr_pool_cleanup_register(finfo->pool, pdesc, free_localheap, 
-                                 apr_pool_cleanup_null);
-        else
-            user = grp = dacl = NULL;
-
-        if (user) {
-            finfo->user = user;
-            finfo->valid |= APR_FINFO_USER;
-        }
-
-        if (grp) {
-            finfo->group = grp;
-            finfo->valid |= APR_FINFO_GROUP;
-        }
-
-        if (dacl) {
-            /* Retrieved the discresionary access list */
-            resolve_prot(finfo, wanted, dacl);
-        }
-        else if (wanted & APR_FINFO_PROT)
-            guess_protection_bits(finfo);
-    }
-
-    return ((wanted & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS);
-}
-
-
-/* This generic fillin depends upon byhandle to be passed as 0 when
- * a WIN32_FILE_ATTRIBUTE_DATA or either WIN32_FIND_DATA [A or W] is
- * passed for wininfo.  When the BY_HANDLE_FILE_INFORMATION structure
- * is passed for wininfo, byhandle is passed as 1 to offset the one
- * dword discrepancy in offset of the High/Low size structure members.
- *
- * The generic fillin returns 1 if the caller should further inquire
- * if this is a CHR filetype.  If it's reasonably certain it can't be,
- * then the function returns 0.
- */
-int fillin_fileinfo(apr_finfo_t *finfo, 
-                    WIN32_FILE_ATTRIBUTE_DATA *wininfo, 
-                    int byhandle, apr_int32_t wanted) 
-{
-    DWORD *sizes = &wininfo->nFileSizeHigh + byhandle;
-    int warn = 0;
-
-    memset(finfo, '\0', sizeof(*finfo));
-
-    FileTimeToAprTime(&finfo->atime, &wininfo->ftLastAccessTime);
-    FileTimeToAprTime(&finfo->ctime, &wininfo->ftCreationTime);
-    FileTimeToAprTime(&finfo->mtime, &wininfo->ftLastWriteTime);
-
-#if APR_HAS_LARGE_FILES
-    finfo->size =  (apr_off_t)sizes[1]
-                | ((apr_off_t)sizes[0] << 32);
-#else
-    finfo->size = (apr_off_t)sizes[1];
-    if (finfo->size < 0 || sizes[0])
-        finfo->size = 0x7fffffff;
-#endif
-
-    if (wanted & APR_FINFO_LINK &&
-        wininfo->dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
-        finfo->filetype = APR_LNK;
-    }
-    else if (wininfo->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
-        finfo->filetype = APR_DIR;
-    }
-    else if (wininfo->dwFileAttributes & FILE_ATTRIBUTE_DEVICE) {
-        /* Warning: This test only succeeds on Win9x, on NT these files
-         * (con, aux, nul, lpt#, com# etc) escape early detection!
-         */
-        finfo->filetype = APR_CHR;
-    }
-    else {
-        /* Warning: Short of opening the handle to the file, the 'FileType'
-         * appears to be unknowable (in any trustworthy or consistent sense)
-         * on WinNT/2K as far as PIPE, CHR, etc are concerned.
-         */
-        if (!wininfo->ftLastWriteTime.dwLowDateTime 
-                && !wininfo->ftLastWriteTime.dwHighDateTime 
-                && !finfo->size)
-            warn = 1;
-        finfo->filetype = APR_REG;
-    }
-
-    /* The following flags are [for this moment] private to Win32.
-     * That's the only excuse for not toggling valid bits to reflect them.
-     */
-    if (wininfo->dwFileAttributes & FILE_ATTRIBUTE_READONLY)
-        finfo->protection = APR_FREADONLY;
-    
-    finfo->valid = APR_FINFO_ATIME | APR_FINFO_CTIME | APR_FINFO_MTIME
-                 | APR_FINFO_SIZE  | APR_FINFO_TYPE;   /* == APR_FINFO_MIN */
-
-    /* Only byhandle optionally tests link targets, so tell that caller
-     * what it wants to hear, otherwise the byattributes is never
-     * reporting anything but the link.
-     */
-    if (!byhandle || (wanted & APR_FINFO_LINK))
-        finfo->valid |= APR_FINFO_LINK;
-    return warn;
-}
-
-
-APR_DECLARE(apr_status_t) apr_file_info_get(apr_finfo_t *finfo, apr_int32_t wanted,
-                                            apr_file_t *thefile)
-{
-    BY_HANDLE_FILE_INFORMATION FileInfo;
-
-    if (thefile->buffered) {
-        /* XXX: flush here is not mutex protected */
-        apr_status_t rv = apr_file_flush(thefile);
-        if (rv != APR_SUCCESS)
-            return rv;
-    }
-
-    if (!GetFileInformationByHandle(thefile->filehand, &FileInfo)) {
-        return apr_get_os_error();
-    }
-
-    fillin_fileinfo(finfo, (WIN32_FILE_ATTRIBUTE_DATA *) &FileInfo, 1, wanted);
-
-    if (finfo->filetype == APR_REG)
-    {
-        /* Go the extra mile to be -certain- that we have a real, regular
-         * file, since the attribute bits aren't a certain thing.  Even
-         * though fillin should have hinted if we *must* do this, we
-         * don't need to take chances while the handle is already open.
-         */
-        DWORD FileType;
-        if (FileType = GetFileType(thefile->filehand)) {
-            if (FileType == FILE_TYPE_CHAR) {
-                finfo->filetype = APR_CHR;
-            }
-            else if (FileType == FILE_TYPE_PIPE) {
-                finfo->filetype = APR_PIPE;
-            }
-            /* Otherwise leave the original conclusion alone 
-             */
-        }
-    }
-
-    finfo->pool = thefile->pool;
-
-    /* ### The finfo lifetime may exceed the lifetime of thefile->pool
-     * but finfo's aren't managed in pools, so where on earth would
-     * we pstrdup the fname into???
-     */
-    finfo->fname = thefile->fname;
- 
-    /* Extra goodies known only by GetFileInformationByHandle() */
-    finfo->inode  =  (apr_ino_t)FileInfo.nFileIndexLow
-                  | ((apr_ino_t)FileInfo.nFileIndexHigh << 32);
-    finfo->device = FileInfo.dwVolumeSerialNumber;
-    finfo->nlink  = FileInfo.nNumberOfLinks;
-
-    finfo->valid |= APR_FINFO_IDENT | APR_FINFO_NLINK;
-
-    /* If we still want something more (besides the name) go get it! 
-     */
-    if ((wanted &= ~finfo->valid) & ~APR_FINFO_NAME) {
-        return more_finfo(finfo, thefile->filehand, wanted, MORE_OF_HANDLE);
-    }
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_file_perms_set(const char *fname,
-                                           apr_fileperms_t perms)
-{
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_stat(apr_finfo_t *finfo, const char *fname,
-                                   apr_int32_t wanted, apr_pool_t *pool)
-{
-    /* XXX: is constant - needs testing - which requires a lighter-weight root test fn */
-    int isroot = 0;
-    apr_status_t ident_rv = 0;
-    apr_status_t rv;
-#if APR_HAS_UNICODE_FS
-    apr_wchar_t wfname[APR_PATH_MAX];
-
-#endif
-    char *filename = NULL;
-    /* These all share a common subset of this structure */
-    union {
-        WIN32_FIND_DATAW w;
-        WIN32_FIND_DATAA n;
-        WIN32_FILE_ATTRIBUTE_DATA i;
-    } FileInfo;
-    
-    /* Catch fname length == MAX_PATH since GetFileAttributesEx fails 
-     * with PATH_NOT_FOUND.  We would rather indicate length error than 
-     * 'not found'
-     */        
-    if (strlen(fname) >= APR_PATH_MAX) {
-        return APR_ENAMETOOLONG;
-    }
-
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        if ((wanted & (APR_FINFO_IDENT | APR_FINFO_NLINK)) 
-               || (~wanted & APR_FINFO_LINK)) {
-            /* FindFirstFile and GetFileAttributesEx can't figure the inode,
-             * device or number of links, so we need to resolve with an open 
-             * file handle.  If the user has asked for these fields, fall over 
-             * to the get file info by handle method.  If we fail, or the user
-             * also asks for the file name, continue by our usual means.
-             *
-             * We also must use this method for a 'true' stat, that resolves
-             * a symlink (NTFS Junction) target.  This is because all fileinfo
-             * on a Junction always returns the junction, opening the target
-             * is the only way to resolve the target's attributes.
-             */
-            if ((ident_rv = resolve_ident(finfo, fname, wanted, pool)) 
-                    == APR_SUCCESS)
-                return ident_rv;
-            else if (ident_rv == APR_INCOMPLETE)
-                wanted &= ~finfo->valid;
-        }
-
-        if (rv = utf8_to_unicode_path(wfname, sizeof(wfname) 
-                                            / sizeof(apr_wchar_t), fname))
-            return rv;
-        if (!(wanted & APR_FINFO_NAME)) {
-            if (!GetFileAttributesExW(wfname, GetFileExInfoStandard, 
-                                      &FileInfo.i))
-                return apr_get_os_error();
-        }
-        else {
-            /* Guard against bogus wildcards and retrieve by name
-             * since we want the true name, and set aside a long
-             * enough string to handle the longest file name.
-             */
-            char tmpname[APR_FILE_MAX * 3 + 1];
-            HANDLE hFind;
-            if ((rv = test_safe_name(fname)) != APR_SUCCESS) {
-                return rv;
-            }
-            hFind = FindFirstFileW(wfname, &FileInfo.w);
-            if (hFind == INVALID_HANDLE_VALUE)
-                return apr_get_os_error();
-            FindClose(hFind);
-            if (unicode_to_utf8_path(tmpname, sizeof(tmpname), 
-                                     FileInfo.w.cFileName)) {
-                return APR_ENAMETOOLONG;
-            }
-            filename = apr_pstrdup(pool, tmpname);
-        }
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-    {
-        char *root = NULL;
-        const char *test = fname;
-        rv = apr_filepath_root(&root, &test, APR_FILEPATH_NATIVE, pool);
-        isroot = (root && *root && !(*test));
-
-        if ((apr_os_level >= APR_WIN_98) && (!(wanted & APR_FINFO_NAME) || isroot))
-        {
-            /* cannot use FindFile on a Win98 root, it returns \*
-             * GetFileAttributesExA is not available on Win95
-             */
-            if (!GetFileAttributesExA(fname, GetFileExInfoStandard, 
-                                     &FileInfo.i)) {
-                return apr_get_os_error();
-            }
-        }
-        else if (isroot) {
-            /* This is Win95 and we are trying to stat a root.  Lie.
-             */
-            if (GetDriveType(fname) != DRIVE_UNKNOWN) 
-            {
-                finfo->pool = pool;
-                finfo->filetype = 0;
-                finfo->mtime = apr_time_now();
-                finfo->protection |= APR_WREAD | APR_WEXECUTE | APR_WWRITE;
-                finfo->protection |= (finfo->protection << prot_scope_group) 
-                                   | (finfo->protection << prot_scope_user);
-                finfo->valid |= APR_FINFO_TYPE | APR_FINFO_PROT 
-                              | APR_FINFO_MTIME
-                              | (wanted & APR_FINFO_LINK);
-                return (wanted &= ~finfo->valid) ? APR_INCOMPLETE 
-                                                 : APR_SUCCESS;
-            }
-            else
-                return APR_FROM_OS_ERROR(ERROR_PATH_NOT_FOUND);
-        }
-        else  {
-            /* Guard against bogus wildcards and retrieve by name
-             * since we want the true name, or are stuck in Win95,
-             * or are looking for the root of a Win98 drive.
-             */
-            HANDLE hFind;
-            if ((rv = test_safe_name(fname)) != APR_SUCCESS) {
-                return rv;
-            }
-            hFind = FindFirstFileA(fname, &FileInfo.n);
-            if (hFind == INVALID_HANDLE_VALUE) {
-                return apr_get_os_error();
-    	    } 
-            FindClose(hFind);
-            filename = apr_pstrdup(pool, FileInfo.n.cFileName);
-        }
-    }
-#endif
-
-    if (ident_rv != APR_INCOMPLETE) {
-        if (fillin_fileinfo(finfo, (WIN32_FILE_ATTRIBUTE_DATA *) &FileInfo, 
-                            0, wanted))
-        {
-            /* Go the extra mile to assure we have a file.  WinNT/2000 seems
-             * to reliably translate char devices to the path '\\.\device'
-             * so go ask for the full path.
-             */
-            if (apr_os_level >= APR_WIN_NT)
-            {
-#if APR_HAS_UNICODE_FS
-                apr_wchar_t tmpname[APR_FILE_MAX];
-                apr_wchar_t *tmpoff = NULL;
-                if (GetFullPathNameW(wfname, sizeof(tmpname) / sizeof(apr_wchar_t),
-                                     tmpname, &tmpoff))
-                {
-                    if (!wcsncmp(tmpname, L"\\\\.\\", 4)) {
-#else
-                /* Same initial logic as above, but
-                 * only for WinNT/non-UTF-8 builds of APR:
-                 */
-                char tmpname[APR_FILE_MAX];
-                char *tmpoff;
-                if (GetFullPathName(fname, sizeof(tmpname), tmpname, &tmpoff))
-                {
-                    if (!strncmp(tmpname, "\\\\.\\", 4)) {
-#endif
-                        if (tmpoff == tmpname + 4) {
-                            finfo->filetype = APR_CHR;
-                        }
-                        /* For WHATEVER reason, CHR devices such as \\.\con 
-                         * or \\.\lpt1 *may*not* update tmpoff; in fact the
-                         * resulting tmpoff is set to NULL.  Guard against 
-                         * either case.
-                         *
-                         * This code is identical for wide and narrow chars...
-                         */
-                        else if (!tmpoff) {
-                            tmpoff = tmpname + 4;
-                            while (*tmpoff) {
-                                if (*tmpoff == '\\' || *tmpoff == '/') {
-                                    break;
-                                }
-                                ++tmpoff;
-                            }
-                            if (!*tmpoff) {
-                                finfo->filetype = APR_CHR;
-                            }
-                        }
-                    }
-                }
-                else {
-                    finfo->valid &= ~APR_FINFO_TYPE;
-                }
-
-            }
-            else {
-                finfo->valid &= ~APR_FINFO_TYPE;
-            }
-        }
-        finfo->pool = pool;
-    }
-
-    if (filename && !isroot) {
-        finfo->name = filename;
-        finfo->valid |= APR_FINFO_NAME;
-    }
-
-    if (wanted &= ~finfo->valid) {
-        /* Caller wants more than APR_FINFO_MIN | APR_FINFO_NAME */
-#if APR_HAS_UNICODE_FS
-        if (apr_os_level >= APR_WIN_NT)
-            return more_finfo(finfo, wfname, wanted, MORE_OF_WFSPEC);
-#endif
-        return more_finfo(finfo, fname, wanted, MORE_OF_FSPEC);
-    }
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_lstat(apr_finfo_t *finfo, const char *fname,
-                                    apr_int32_t wanted, apr_pool_t *pool)
-{
-    return apr_stat(finfo, fname, wanted | APR_FINFO_LINK, pool);
-}
-
-APR_DECLARE(apr_status_t) apr_file_attrs_set(const char *fname,
-                                             apr_fileattrs_t attributes,
-                                             apr_fileattrs_t attr_mask,
-                                             apr_pool_t *pool)
-{
-    DWORD flags;
-    apr_status_t rv;
-#if APR_HAS_UNICODE_FS
-    apr_wchar_t wfname[APR_PATH_MAX];
-#endif
-
-    /* Don't do anything if we can't handle the requested attributes */
-    if (!(attr_mask & (APR_FILE_ATTR_READONLY
-                       | APR_FILE_ATTR_HIDDEN)))
-        return APR_SUCCESS;
-
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        if (rv = utf8_to_unicode_path(wfname,
-                                      sizeof(wfname) / sizeof(wfname[0]),
-                                      fname))
-            return rv;
-        flags = GetFileAttributesW(wfname);
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-    {
-        flags = GetFileAttributesA(fname);
-    }
-#endif
-
-    if (flags == 0xFFFFFFFF)
-        return apr_get_os_error();
-
-    if (attr_mask & APR_FILE_ATTR_READONLY)
-    {
-        if (attributes & APR_FILE_ATTR_READONLY)
-            flags |= FILE_ATTRIBUTE_READONLY;
-        else
-            flags &= ~FILE_ATTRIBUTE_READONLY;
-    }
-
-    if (attr_mask & APR_FILE_ATTR_HIDDEN)
-    {
-        if (attributes & APR_FILE_ATTR_HIDDEN)
-            flags |= FILE_ATTRIBUTE_HIDDEN;
-        else
-            flags &= ~FILE_ATTRIBUTE_HIDDEN;
-    }
-
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        rv = SetFileAttributesW(wfname, flags);
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-    {
-        rv = SetFileAttributesA(fname, flags);
-    }
-#endif
-
-    if (rv == 0)
-        return apr_get_os_error();
-
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_file_mtime_set(const char *fname,
-                                             apr_time_t mtime,
-                                             apr_pool_t *pool)
-{
-    apr_file_t *thefile;
-    apr_status_t rv;
-
-    rv = apr_file_open(&thefile, fname,
-                       APR_READ | APR_WRITEATTRS,
-                       APR_OS_DEFAULT, pool);
-    if (!rv)
-    {
-        FILETIME file_ctime;
-        FILETIME file_atime;
-        FILETIME file_mtime;
-
-        if (!GetFileTime(thefile->filehand,
-                         &file_ctime, &file_atime, &file_mtime))
-            rv = apr_get_os_error();
-        else
-        {
-            AprTimeToFileTime(&file_mtime, mtime);
-            if (!SetFileTime(thefile->filehand,
-                             &file_ctime, &file_atime, &file_mtime))
-                rv = apr_get_os_error();
-        }
-
-        apr_file_close(thefile);
-    }
-
-    return rv;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/filesys.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/filesys.c
deleted file mode 100644
index ad31e338..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/filesys.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_arch_file_io.h"
-#include "apr_strings.h"
-
-/* Win32 Exceptions:
- *
- * Note that trailing spaces and trailing periods are never recorded
- * in the file system, except by a very obscure bug where any file
- * that is created with a trailing space or period, followed by the 
- * ':' stream designator on an NTFS volume can never be accessed again.
- * In other words, don't ever accept them when designating a stream!
- *
- * An interesting side effect is that two or three periods are both 
- * treated as the parent directory, although the fourth and on are
- * not [strongly suggest all trailing periods are trimmed off, or
- * down to two if there are no other characters.]
- *
- * Leading spaces and periods are accepted, however.
- * The * ? < > codes all have wildcard side effects
- * The " / \ : are exclusively component separator tokens 
- * The system doesn't accept | for any (known) purpose 
- * Oddly, \x7f _is_ acceptable ;)
- */
-
-/* apr_c_is_fnchar[] maps Win32's file name and shell escape symbols
- *
- *   element & 1 == valid file name character [excluding delimiters]
- *   element & 2 == character should be shell (caret) escaped from cmd.exe
- *
- * this must be in-sync with Apache httpd's gen_test_char.c for cgi escaping.
- */
-
-const char apr_c_is_fnchar[256] =
-{/* Reject all ctrl codes... Escape \n and \r (ascii 10 and 13)      */
-    0,0,0,0,0,0,0,0,0,0,2,0,0,2,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- /*   ! " # $ % & ' ( ) * + , - . /  0 1 2 3 4 5 6 7 8 9 : ; < = > ? */
-    1,1,2,1,3,3,3,3,3,3,2,1,1,1,1,0, 1,1,1,1,1,1,1,1,1,1,0,3,2,1,2,2,
- /* @ A B C D E F G H I J K L M N O  P Q R S T U V W X Y Z [ \ ] ^ _ */
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,3,2,3,3,1,
- /* ` a b c d e f g h i j k l m n o  p q r s t u v w x y z { | } ~   */
-    3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,3,2,3,3,1,
- /* High bit codes are accepted (subject to utf-8->Unicode xlation)  */
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-};
-
-
-apr_status_t filepath_root_test(char *path, apr_pool_t *p)
-{
-    apr_status_t rv;
-#if APR_HAS_UNICODE_FS
-    if (apr_os_level >= APR_WIN_NT)
-    {
-        apr_wchar_t wpath[APR_PATH_MAX];
-        if (rv = utf8_to_unicode_path(wpath, sizeof(wpath) 
-                                           / sizeof(apr_wchar_t), path))
-            return rv;
-        rv = GetDriveTypeW(wpath);
-    }
-    else
-#endif
-        rv = GetDriveType(path);
-
-    if (rv == DRIVE_UNKNOWN || rv == DRIVE_NO_ROOT_DIR)
-        return APR_EBADPATH;
-    return APR_SUCCESS;
-}
-
-
-apr_status_t filepath_drive_get(char **rootpath, char drive, 
-                                apr_int32_t flags, apr_pool_t *p)
-{
-    char path[APR_PATH_MAX];
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        apr_wchar_t *ignored;
-        apr_wchar_t wdrive[8];
-        apr_wchar_t wpath[APR_PATH_MAX];
-        apr_status_t rv;
-        /* ???: This needs review, apparently "\\?\d:." returns "\\?\d:" 
-         * as if that is useful for anything.
-         */
-        wcscpy(wdrive, L"D:.");
-        wdrive[0] = (apr_wchar_t)(unsigned char)drive;
-        if (!GetFullPathNameW(wdrive, sizeof(wpath) / sizeof(apr_wchar_t), wpath, &ignored))
-            return apr_get_os_error();
-        if ((rv = unicode_to_utf8_path(path, sizeof(path), wpath)))
-            return rv;
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-    {
-        char *ignored;
-        char drivestr[4];
-        drivestr[0] = drive;
-        drivestr[1] = ':';
-        drivestr[2] = '.';;
-        drivestr[3] = '\0';
-        if (!GetFullPathName(drivestr, sizeof(path), path, &ignored))
-            return apr_get_os_error();
-    }
-#endif
-    if (!(flags & APR_FILEPATH_NATIVE)) {
-        for (*rootpath = path; **rootpath; ++*rootpath) {
-            if (**rootpath == '\\')
-                **rootpath = '/';
-        }
-    }
-    *rootpath = apr_pstrdup(p, path);
-    return APR_SUCCESS;
-}
-
-
-apr_status_t filepath_root_case(char **rootpath, char *root, apr_pool_t *p)
-{
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        apr_wchar_t *ignored;
-        apr_wchar_t wpath[APR_PATH_MAX];
-        apr_status_t rv;
-        apr_wchar_t wroot[APR_PATH_MAX];
-        /* ???: This needs review, apparently "\\?\d:." returns "\\?\d:" 
-         * as if that is useful for anything.
-         */
-        if (rv = utf8_to_unicode_path(wroot, sizeof(wroot) 
-                                           / sizeof(apr_wchar_t), root))
-            return rv;
-        if (!GetFullPathNameW(wroot, sizeof(wpath) / sizeof(apr_wchar_t), wpath, &ignored))
-            return apr_get_os_error();
-
-        /* Borrow wroot as a char buffer (twice as big as necessary) 
-         */
-        if ((rv = unicode_to_utf8_path((char*)wroot, sizeof(wroot), wpath)))
-            return rv;
-        *rootpath = apr_pstrdup(p, (char*)wroot);
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-    {
-        char path[APR_PATH_MAX];
-        char *ignored;
-        if (!GetFullPathName(root, sizeof(path), path, &ignored))
-            return apr_get_os_error();
-        *rootpath = apr_pstrdup(p, path);
-    }
-#endif
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_filepath_get(char **rootpath, apr_int32_t flags,
-                                           apr_pool_t *p)
-{
-    char path[APR_PATH_MAX];
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        apr_wchar_t wpath[APR_PATH_MAX];
-        apr_status_t rv;
-        if (!GetCurrentDirectoryW(sizeof(wpath) / sizeof(apr_wchar_t), wpath))
-            return apr_get_os_error();
-        if ((rv = unicode_to_utf8_path(path, sizeof(path), wpath)))
-            return rv;
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-    {
-        if (!GetCurrentDirectory(sizeof(path), path))
-            return apr_get_os_error();
-    }
-#endif
-    if (!(flags & APR_FILEPATH_NATIVE)) {
-        for (*rootpath = path; **rootpath; ++*rootpath) {
-            if (**rootpath == '\\')
-                **rootpath = '/';
-        }
-    }
-    *rootpath = apr_pstrdup(p, path);
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_filepath_set(const char *rootpath,
-                                           apr_pool_t *p)
-{
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        apr_wchar_t wpath[APR_PATH_MAX];
-        apr_status_t rv;
-        if (rv = utf8_to_unicode_path(wpath, sizeof(wpath) 
-                                           / sizeof(apr_wchar_t), rootpath))
-            return rv;
-        if (!SetCurrentDirectoryW(wpath))
-            return apr_get_os_error();
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-    {
-        if (!SetCurrentDirectory(rootpath))
-            return apr_get_os_error();
-    }
-#endif
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/flock.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/flock.c
deleted file mode 100644
index e08e08a7..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/flock.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_file_io.h"
-
-APR_DECLARE(apr_status_t) apr_file_lock(apr_file_t *thefile, int type)
-{
-#ifdef _WIN32_WCE
-    /* The File locking is unsuported on WCE */
-    return APR_ENOTIMPL;
-#else
-    const DWORD len = 0xffffffff;
-    DWORD flags; 
-
-    flags = ((type & APR_FLOCK_NONBLOCK) ? LOCKFILE_FAIL_IMMEDIATELY : 0)
-          + (((type & APR_FLOCK_TYPEMASK) == APR_FLOCK_SHARED) 
-                                       ? 0 : LOCKFILE_EXCLUSIVE_LOCK);
-    if (apr_os_level >= APR_WIN_NT) {
-        /* Syntax is correct, len is passed for LengthLow and LengthHigh*/
-        OVERLAPPED offset;
-        memset (&offset, 0, sizeof(offset));
-        if (!LockFileEx(thefile->filehand, flags, 0, len, len, &offset))
-            return apr_get_os_error();
-    }
-    else {
-        /* On Win9x, LockFile() never blocks.  Hack in a crufty poll.
-         *
-         * Note that this hack exposes threads to being unserviced forever,
-         * in the situation that the given lock has low availability.
-         * When implemented in the kernel, LockFile will typically use
-         * FIFO or round robin distribution to ensure all threads get 
-         * one crack at the lock; but in this case we can't emulate that.
-         *
-         * However Win9x are barely maintainable anyways, if the user does
-         * choose to build to them, this is the best we can do.
-         */
-        while (!LockFile(thefile->filehand, 0, 0, len, 0)) {
-            DWORD err = GetLastError();
-            if ((err == ERROR_LOCK_VIOLATION) && !(type & APR_FLOCK_NONBLOCK))
-            {
-                Sleep(500); /* pause for a half second */
-                continue;   /* ... and then poll again */
-            }
-            return APR_FROM_OS_ERROR(err);
-        }
-    }
-
-    return APR_SUCCESS;
-#endif /* !defined(_WIN32_WCE) */
-}
-
-APR_DECLARE(apr_status_t) apr_file_unlock(apr_file_t *thefile)
-{
-#ifdef _WIN32_WCE
-    return APR_ENOTIMPL;
-#else
-    DWORD len = 0xffffffff;
-
-    if (apr_os_level >= APR_WIN_NT) {
-        /* Syntax is correct, len is passed for LengthLow and LengthHigh*/
-        OVERLAPPED offset;
-        memset (&offset, 0, sizeof(offset));
-        if (!UnlockFileEx(thefile->filehand, 0, len, len, &offset))
-            return apr_get_os_error();
-    }
-    else {
-        if (!UnlockFile(thefile->filehand, 0, 0, len, 0))
-            return apr_get_os_error();
-    }
-
-    return APR_SUCCESS;
-#endif /* !defined(_WIN32_WCE) */
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/open.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/open.c
deleted file mode 100644
index a60fba26..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/open.c
+++ /dev/null
@@ -1,628 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_private.h"
-#include "apr_arch_file_io.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include "apr_thread_mutex.h"
-#if APR_HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#include <winbase.h>
-#include <string.h>
-#if APR_HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#include "apr_arch_misc.h"
-#include "apr_arch_inherit.h"
-#include <io.h>
-
-#if APR_HAS_UNICODE_FS
-apr_status_t utf8_to_unicode_path(apr_wchar_t* retstr, apr_size_t retlen, 
-                                  const char* srcstr)
-{
-    /* TODO: The computations could preconvert the string to determine
-     * the true size of the retstr, but that's a memory over speed
-     * tradeoff that isn't appropriate this early in development.
-     *
-     * Allocate the maximum string length based on leading 4 
-     * characters of \\?\ (allowing nearly unlimited path lengths) 
-     * plus the trailing null, then transform /'s into \\'s since
-     * the \\?\ form doesn't allow '/' path seperators.
-     *
-     * Note that the \\?\ form only works for local drive paths, and
-     * \\?\UNC\ is needed UNC paths.
-     */
-    int srcremains = strlen(srcstr) + 1;
-    apr_wchar_t *t = retstr;
-    apr_status_t rv;
-
-    /* This is correct, we don't twist the filename if it is will
-     * definately be shorter than 248 characters.  It merits some 
-     * performance testing to see if this has any effect, but there
-     * seem to be applications that get confused by the resulting
-     * Unicode \\?\ style file names, especially if they use argv[0]
-     * or call the Win32 API functions such as GetModuleName, etc.
-     * Not every application is prepared to handle such names.
-     * 
-     * Note also this is shorter than MAX_PATH, as directory paths 
-     * are actually limited to 248 characters. 
-     *
-     * Note that a utf-8 name can never result in more wide chars
-     * than the original number of utf-8 narrow chars.
-     */
-    if (srcremains > 248) {
-        if (srcstr[1] == ':' && (srcstr[2] == '/' || srcstr[2] == '\\')) {
-            wcscpy (retstr, L"\\\\?\\");
-            retlen -= 4;
-            t += 4;
-        }
-        else if ((srcstr[0] == '/' || srcstr[0] == '\\')
-              && (srcstr[1] == '/' || srcstr[1] == '\\')
-              && (srcstr[2] != '?')) {
-            /* Skip the slashes */
-            srcstr += 2;
-            srcremains -= 2;
-            wcscpy (retstr, L"\\\\?\\UNC\\");
-            retlen -= 8;
-            t += 8;
-        }
-    }
-
-    if (rv = apr_conv_utf8_to_ucs2(srcstr, &srcremains, t, &retlen)) {
-        return (rv == APR_INCOMPLETE) ? APR_EINVAL : rv;
-    }
-    if (srcremains) {
-        return APR_ENAMETOOLONG;
-    }
-    for (; *t; ++t)
-        if (*t == L'/')
-            *t = L'\\';
-    return APR_SUCCESS;
-}
-
-apr_status_t unicode_to_utf8_path(char* retstr, apr_size_t retlen,
-                                  const apr_wchar_t* srcstr)
-{
-    /* Skip the leading 4 characters if the path begins \\?\, or substitute
-     * // for the \\?\UNC\ path prefix, allocating the maximum string
-     * length based on the remaining string, plus the trailing null.
-     * then transform \\'s back into /'s since the \\?\ form never
-     * allows '/' path seperators, and APR always uses '/'s.
-     */
-    int srcremains = wcslen(srcstr) + 1;
-    apr_status_t rv;
-    char *t = retstr;
-    if (srcstr[0] == L'\\' && srcstr[1] == L'\\' && 
-        srcstr[2] == L'?'  && srcstr[3] == L'\\') {
-        if (srcstr[4] == L'U' && srcstr[5] == L'N' && 
-            srcstr[6] == L'C' && srcstr[7] == L'\\') {
-            srcremains -= 8;
-            srcstr += 8;
-            retstr[0] = '\\';
-            retstr[1] = '\\';
-            retlen -= 2;
-            t += 2;
-        }
-        else {
-            srcremains -= 4;
-            srcstr += 4;
-        }
-    }
-        
-    if (rv = apr_conv_ucs2_to_utf8(srcstr, &srcremains, t, &retlen)) {
-        return rv;
-    }
-    if (srcremains) {
-        return APR_ENAMETOOLONG;
-    }
-    return APR_SUCCESS;
-}
-#endif
-
-void *res_name_from_filename(const char *file, int global, apr_pool_t *pool)
-{
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        apr_wchar_t *wpre, *wfile, *ch;
-        apr_size_t n = strlen(file) + 1;
-        apr_size_t r, d;
-        apr_status_t rv;
-
-        if (apr_os_level >= APR_WIN_2000) {
-            if (global)
-                wpre = L"Global\\";
-            else
-                wpre = L"Local\\";
-        }
-        else
-            wpre = L"";
-        r = wcslen(wpre);
-
-        if (n > 256 - r) {
-            file += n - 256 - r;
-            n = 256;
-            /* skip utf8 continuation bytes */
-            while ((*file & 0xC0) == 0x80) {
-                ++file;
-                --n;
-            }
-        }
-        wfile = apr_palloc(pool, (r + n) * sizeof(apr_wchar_t));
-        wcscpy(wfile, wpre);
-        d = n;
-        if (rv = apr_conv_utf8_to_ucs2(file, &n, wfile + r, &d)) {
-            return NULL;
-        }
-        for (ch = wfile + r; *ch; ++ch) {
-            if (*ch == ':' || *ch == '/' || *ch == '\\')
-                *ch = '_';
-        }
-        return wfile;
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-    {
-        char *nfile, *ch;
-        apr_size_t n = strlen(file) + 1;
-
-#if !APR_HAS_UNICODE_FS
-        apr_status_t rv;
-        apr_size_t r, d;
-        char *pre;
-
-        if (apr_os_level >= APR_WIN_2000) {
-            if (global)
-                pre = "Global\\";
-            else
-                pre = "Local\\";
-        }
-        else
-            pre = "";
-        r = strlen(pre);
-
-        if (n > 256 - r) {
-            file += n - 256 - r;
-            n = 256;
-        }
-        nfile = apr_palloc(pool, (r + n) * sizeof(apr_wchar_t));
-        memcpy(nfile, pre, r);
-        memcpy(nfile + r, file, n);
-#else
-        const apr_size_t r = 0;
-        if (n > 256) {
-            file += n - 256;
-            n = 256;
-        }
-        nfile = apr_pmemdup(pool, file, n);
-#endif
-        for (ch = nfile + r; *ch; ++ch) {
-            if (*ch == ':' || *ch == '/' || *ch == '\\')
-                *ch = '_';
-        }
-        return nfile;
-    }
-#endif
-}
-
-
-apr_status_t file_cleanup(void *thefile)
-{
-    apr_file_t *file = thefile;
-    apr_status_t flush_rv = APR_SUCCESS;
-
-    if (file->filehand != INVALID_HANDLE_VALUE) {
-
-        if (file->buffered) {
-            /* XXX: flush here is not mutex protected */
-            flush_rv = apr_file_flush((apr_file_t *)thefile);
-        }
-
-        /* In order to avoid later segfaults with handle 'reuse',
-         * we must protect against the case that a dup2'ed handle
-         * is being closed, and invalidate the corresponding StdHandle 
-         * We also tell msvcrt when stdhandles are closed.
-         */
-        if (file->flags & APR_STD_FLAGS)
-        {
-            if ((file->flags & APR_STD_FLAGS) == APR_STDERR_FLAG) {
-                _close(2);
-                SetStdHandle(STD_ERROR_HANDLE, INVALID_HANDLE_VALUE);
-            }
-            else if ((file->flags & APR_STD_FLAGS) == APR_STDOUT_FLAG) {
-                _close(1);
-                SetStdHandle(STD_OUTPUT_HANDLE, INVALID_HANDLE_VALUE);
-            }
-            else if ((file->flags & APR_STD_FLAGS) == APR_STDIN_FLAG) {
-                _close(0);
-                SetStdHandle(STD_INPUT_HANDLE, INVALID_HANDLE_VALUE);
-            }
-        }
-        else
-            CloseHandle(file->filehand);
-
-        file->filehand = INVALID_HANDLE_VALUE;
-    }
-    if (file->pOverlapped && file->pOverlapped->hEvent) {
-        CloseHandle(file->pOverlapped->hEvent);
-        file->pOverlapped = NULL;
-    }
-    return flush_rv;
-}
-
-APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new, const char *fname,
-                                   apr_int32_t flag, apr_fileperms_t perm,
-                                   apr_pool_t *pool)
-{
-    HANDLE handle = INVALID_HANDLE_VALUE;
-    DWORD oflags = 0;
-    DWORD createflags = 0;
-    DWORD attributes = 0;
-    DWORD sharemode = FILE_SHARE_READ | FILE_SHARE_WRITE;
-    apr_status_t rv;
-
-    if (flag & APR_READ) {
-        oflags |= GENERIC_READ;
-    }
-    if (flag & APR_WRITE) {
-        oflags |= GENERIC_WRITE;
-    }
-    if (flag & APR_WRITEATTRS) {
-        oflags |= FILE_WRITE_ATTRIBUTES;
-    }
-
-    if (apr_os_level >= APR_WIN_NT) 
-        sharemode |= FILE_SHARE_DELETE;
-
-    if (flag & APR_CREATE) {
-        if (flag & APR_EXCL) {
-            /* only create new if file does not already exist */
-            createflags = CREATE_NEW;
-        } else if (flag & APR_TRUNCATE) {
-            /* truncate existing file or create new */
-            createflags = CREATE_ALWAYS;
-        } else {
-            /* open existing but create if necessary */
-            createflags = OPEN_ALWAYS;
-        }
-    } else if (flag & APR_TRUNCATE) {
-        /* only truncate if file already exists */
-        createflags = TRUNCATE_EXISTING;
-    } else {
-        /* only open if file already exists */
-        createflags = OPEN_EXISTING;
-    }
-
-    if ((flag & APR_EXCL) && !(flag & APR_CREATE)) {
-        return APR_EACCES;
-    }   
-    
-    if (flag & APR_DELONCLOSE) {
-        attributes |= FILE_FLAG_DELETE_ON_CLOSE;
-    }
-
-    if (flag & APR_OPENLINK) {
-       attributes |= FILE_FLAG_OPEN_REPARSE_POINT;
-    }
-
-    /* Without READ or WRITE, we fail unless apr called apr_file_open
-     * internally with the private APR_OPENINFO flag.
-     *
-     * With the APR_OPENINFO flag on NT, use the option flag
-     * FILE_FLAG_BACKUP_SEMANTICS to allow us to open directories.
-     * See the static resolve_ident() fn in file_io/win32/filestat.c
-     */
-    if (!(flag & (APR_READ | APR_WRITE))) {
-        if (flag & APR_OPENINFO) {
-            if (apr_os_level >= APR_WIN_NT) {
-                attributes |= FILE_FLAG_BACKUP_SEMANTICS;
-            }
-        }
-        else {
-            return APR_EACCES;
-        }
-        if (flag & APR_READCONTROL)
-            oflags |= READ_CONTROL;
-    }
-
-    if (flag & APR_XTHREAD) {
-        /* This win32 specific feature is required 
-         * to allow multiple threads to work with the file.
-         */
-        attributes |= FILE_FLAG_OVERLAPPED;
-    }
-
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        apr_wchar_t wfname[APR_PATH_MAX];
-
-        if (flag & APR_SENDFILE_ENABLED) {    
-            /* This feature is required to enable sendfile operations
-             * against the file on Win32. Also implies APR_XTHREAD.
-             */
-            flag |= APR_XTHREAD;
-            attributes |= FILE_FLAG_SEQUENTIAL_SCAN | FILE_FLAG_OVERLAPPED;
-        }
-
-        if (rv = utf8_to_unicode_path(wfname, sizeof(wfname) 
-                                               / sizeof(apr_wchar_t), fname))
-            return rv;
-        handle = CreateFileW(wfname, oflags, sharemode,
-                             NULL, createflags, attributes, 0);
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI {
-        handle = CreateFileA(fname, oflags, sharemode,
-                             NULL, createflags, attributes, 0);
-        if (flag & APR_SENDFILE_ENABLED) {    
-            /* This feature is not supported on this platform.
-             */
-            flag &= ~APR_SENDFILE_ENABLED;
-        }
-
-    }
-#endif
-    if (handle == INVALID_HANDLE_VALUE) {
-        return apr_get_os_error();
-    }
-
-    (*new) = (apr_file_t *)apr_pcalloc(pool, sizeof(apr_file_t));
-    (*new)->pool = pool;
-    (*new)->filehand = handle;
-    (*new)->fname = apr_pstrdup(pool, fname);
-    (*new)->flags = flag;
-    (*new)->timeout = -1;
-    (*new)->ungetchar = -1;
-
-    if (flag & APR_APPEND) {
-        (*new)->append = 1;
-        SetFilePointer((*new)->filehand, 0, NULL, FILE_END);
-    }
-    if (flag & APR_BUFFERED) {
-        (*new)->buffered = 1;
-        (*new)->buffer = apr_palloc(pool, APR_FILE_BUFSIZE);
-    }
-    /* Need the mutex to handled buffered and O_APPEND style file i/o */
-    if ((*new)->buffered || (*new)->append) {
-        rv = apr_thread_mutex_create(&(*new)->mutex, 
-                                     APR_THREAD_MUTEX_DEFAULT, pool);
-        if (rv) {
-            if (file_cleanup(*new) == APR_SUCCESS) {
-                apr_pool_cleanup_kill(pool, *new, file_cleanup);
-            }
-            return rv;
-        }
-    }
-
-    if (!(flag & APR_FILE_NOCLEANUP)) {
-        apr_pool_cleanup_register((*new)->pool, (void *)(*new), file_cleanup,
-                                  apr_pool_cleanup_null);
-    }
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_file_close(apr_file_t *file)
-{
-    apr_status_t stat;
-    if ((stat = file_cleanup(file)) == APR_SUCCESS) {
-        apr_pool_cleanup_kill(file->pool, file, file_cleanup);
-
-        if (file->mutex) {
-            apr_thread_mutex_destroy(file->mutex);
-        }
-
-        return APR_SUCCESS;
-    }
-    return stat;
-}
-
-APR_DECLARE(apr_status_t) apr_file_remove(const char *path, apr_pool_t *pool)
-{
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        apr_wchar_t wpath[APR_PATH_MAX];
-        apr_status_t rv;
-        if (rv = utf8_to_unicode_path(wpath, sizeof(wpath) 
-                                              / sizeof(apr_wchar_t), path)) {
-            return rv;
-        }
-        if (DeleteFileW(wpath))
-            return APR_SUCCESS;
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-        if (DeleteFile(path))
-            return APR_SUCCESS;
-#endif
-    return apr_get_os_error();
-}
-
-APR_DECLARE(apr_status_t) apr_file_rename(const char *frompath,
-                                          const char *topath,
-                                          apr_pool_t *pool)
-{
-    IF_WIN_OS_IS_UNICODE
-    {
-#if APR_HAS_UNICODE_FS
-        apr_wchar_t wfrompath[APR_PATH_MAX], wtopath[APR_PATH_MAX];
-        apr_status_t rv;
-        if (rv = utf8_to_unicode_path(wfrompath, sizeof(wfrompath) 
-                                           / sizeof(apr_wchar_t), frompath)) {
-            return rv;
-        }
-        if (rv = utf8_to_unicode_path(wtopath, sizeof(wtopath) 
-                                             / sizeof(apr_wchar_t), topath)) {
-            return rv;
-        }
-#ifndef _WIN32_WCE
-        if (MoveFileExW(wfrompath, wtopath, MOVEFILE_REPLACE_EXISTING |
-                                            MOVEFILE_COPY_ALLOWED))
-#else
-        if (MoveFileW(wfrompath, wtopath))
-#endif
-            return APR_SUCCESS;
-#else
-        if (MoveFileEx(frompath, topath, MOVEFILE_REPLACE_EXISTING |
-                                         MOVEFILE_COPY_ALLOWED))
-            return APR_SUCCESS;
-#endif
-    }
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-    {
-        /* Windows 95 and 98 do not support MoveFileEx, so we'll use
-         * the old MoveFile function.  However, MoveFile requires that
-         * the new file not already exist...so we have to delete that
-         * file if it does.  Perhaps we should back up the to-be-deleted
-         * file in case something happens?
-         */
-        HANDLE handle = INVALID_HANDLE_VALUE;
-
-        if ((handle = CreateFile(topath, GENERIC_WRITE, 0, 0,  
-            OPEN_EXISTING, 0, 0 )) != INVALID_HANDLE_VALUE )
-        {
-            CloseHandle(handle);
-            if (!DeleteFile(topath))
-                return apr_get_os_error();
-        }
-        if (MoveFile(frompath, topath))
-            return APR_SUCCESS;
-    }        
-#endif
-    return apr_get_os_error();
-}
-
-APR_DECLARE(apr_status_t) apr_os_file_get(apr_os_file_t *thefile,
-                                          apr_file_t *file)
-{
-    *thefile = file->filehand;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_file_put(apr_file_t **file,
-                                          apr_os_file_t *thefile,
-                                          apr_int32_t flags,
-                                          apr_pool_t *pool)
-{
-    (*file) = apr_pcalloc(pool, sizeof(apr_file_t));
-    (*file)->pool = pool;
-    (*file)->filehand = *thefile;
-    (*file)->ungetchar = -1; /* no char avail */
-    (*file)->timeout = -1;
-    (*file)->flags = flags;
-
-    if (flags & APR_APPEND) {
-        (*file)->append = 1;
-    }
-    if (flags & APR_BUFFERED) {
-        (*file)->buffered = 1;
-        (*file)->buffer = apr_palloc(pool, APR_FILE_BUFSIZE);
-    }
-
-    if ((*file)->append || (*file)->buffered) {
-        apr_status_t rv;
-        rv = apr_thread_mutex_create(&(*file)->mutex, 
-                                     APR_THREAD_MUTEX_DEFAULT, pool);
-        if (rv) {
-            if (file_cleanup(*file) == APR_SUCCESS) {
-                apr_pool_cleanup_kill(pool, *file, file_cleanup);
-            }
-            return rv;
-        }
-    }
-
-    /* XXX... we pcalloc above so all others are zeroed.
-     * Should we be testing if thefile is a handle to 
-     * a PIPE and set up the mechanics appropriately?
-     *
-     *  (*file)->pipe;
-     */
-    return APR_SUCCESS;
-}    
-
-APR_DECLARE(apr_status_t) apr_file_eof(apr_file_t *fptr)
-{
-    if (fptr->eof_hit == 1) {
-        return APR_EOF;
-    }
-    return APR_SUCCESS;
-}   
-
-APR_DECLARE(apr_status_t) apr_file_open_stderr(apr_file_t **thefile, apr_pool_t *pool)
-{
-#ifdef _WIN32_WCE
-    return APR_ENOTIMPL;
-#else
-    apr_os_file_t file_handle;
-
-    apr_set_os_error(APR_SUCCESS);
-    file_handle = GetStdHandle(STD_ERROR_HANDLE);
-    if (!file_handle)
-        file_handle = INVALID_HANDLE_VALUE;
-
-    return apr_os_file_put(thefile, &file_handle,
-                           APR_WRITE | APR_STDERR_FLAG, pool);
-#endif
-}
-
-APR_DECLARE(apr_status_t) apr_file_open_stdout(apr_file_t **thefile, apr_pool_t *pool)
-{
-#ifdef _WIN32_WCE
-    return APR_ENOTIMPL;
-#else
-    apr_os_file_t file_handle;
-
-    apr_set_os_error(APR_SUCCESS);
-    file_handle = GetStdHandle(STD_OUTPUT_HANDLE);
-    if (!file_handle)
-        file_handle = INVALID_HANDLE_VALUE;
-
-    return apr_os_file_put(thefile, &file_handle,
-                           APR_WRITE | APR_STDOUT_FLAG, pool);
-#endif
-}
-
-APR_DECLARE(apr_status_t) apr_file_open_stdin(apr_file_t **thefile, apr_pool_t *pool)
-{
-#ifdef _WIN32_WCE
-    return APR_ENOTIMPL;
-#else
-    apr_os_file_t file_handle;
-
-    apr_set_os_error(APR_SUCCESS);
-    file_handle = GetStdHandle(STD_INPUT_HANDLE);
-    if (!file_handle)
-        file_handle = INVALID_HANDLE_VALUE;
-
-    return apr_os_file_put(thefile, &file_handle,
-                           APR_READ | APR_STDIN_FLAG, pool);
-#endif
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(file);
-
-APR_IMPLEMENT_INHERIT_SET(file, flags, pool, file_cleanup)
- 
-APR_IMPLEMENT_INHERIT_UNSET(file, flags, pool, file_cleanup)
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/pipe.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/pipe.c
deleted file mode 100644
index 78d6b096..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/pipe.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "win32/apr_arch_file_io.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_strings.h"
-#if APR_HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#include <string.h>
-#include <stdio.h>
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if APR_HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#include "apr_arch_misc.h"
-
-APR_DECLARE(apr_status_t) apr_file_pipe_timeout_set(apr_file_t *thepipe, apr_interval_time_t timeout)
-{
-    /* Always OK to unset timeouts */
-    if (timeout == -1) {
-        thepipe->timeout = timeout;
-        return APR_SUCCESS;
-    }
-    if (!thepipe->pipe) {
-        return APR_ENOTIMPL;
-    }
-    if (timeout && !(thepipe->pOverlapped)) {
-        /* Cannot be nonzero if a pipe was opened blocking
-         */
-        return APR_EINVAL;
-    }
-    thepipe->timeout = timeout;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_file_pipe_timeout_get(apr_file_t *thepipe, apr_interval_time_t *timeout)
-{
-    /* Always OK to get the timeout (even if it's unset ... -1) */
-    *timeout = thepipe->timeout;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, apr_file_t **out, apr_pool_t *p)
-{
-    /* Unix creates full blocking pipes. */
-    return apr_create_nt_pipe(in, out, APR_FULL_BLOCK, p);
-}
-
-/* apr_create_nt_pipe()
- * An internal (for now) APR function used by apr_proc_create() 
- * when setting up pipes to communicate with the child process. 
- * apr_create_nt_pipe() allows setting the blocking mode of each end of 
- * the pipe when the pipe is created (rather than after the pipe is created). 
- * A pipe handle must be opened in full async i/o mode in order to 
- * emulate Unix non-blocking pipes with timeouts. 
- *
- * In general, we don't want to enable child side pipe handles for async i/o.
- * This prevents us from enabling both ends of the pipe for async i/o in 
- * apr_file_pipe_create.
- *
- * Why not use NamedPipes on NT which support setting pipe state to
- * non-blocking? On NT, even though you can set a pipe non-blocking, 
- * there is no clean way to set event driven non-zero timeouts (e.g select(),
- * WaitForSinglelObject, et. al. will not detect pipe i/o). On NT, you 
- * have to poll the pipe to detect i/o on a non-blocking pipe.
- */
-apr_status_t apr_create_nt_pipe(apr_file_t **in, apr_file_t **out, 
-                                apr_int32_t blocking_mode, 
-                                apr_pool_t *p)
-{
-#ifdef _WIN32_WCE
-    return APR_ENOTIMPL;
-#else
-    SECURITY_ATTRIBUTES sa;
-    static unsigned long id = 0;
-    DWORD dwPipeMode;
-    DWORD dwOpenMode;
-    char name[50];
-
-    sa.nLength = sizeof(sa);
-    
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-        sa.bInheritHandle = FALSE;
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-        sa.bInheritHandle = TRUE;
-#endif
-    sa.lpSecurityDescriptor = NULL;
-
-    (*in) = (apr_file_t *)apr_pcalloc(p, sizeof(apr_file_t));
-    (*in)->pool = p;
-    (*in)->fname = NULL;
-    (*in)->pipe = 1;
-    (*in)->timeout = -1;
-    (*in)->ungetchar = -1;
-    (*in)->eof_hit = 0;
-    (*in)->filePtr = 0;
-    (*in)->bufpos = 0;
-    (*in)->dataRead = 0;
-    (*in)->direction = 0;
-    (*in)->pOverlapped = NULL;
-
-    (*out) = (apr_file_t *)apr_pcalloc(p, sizeof(apr_file_t));
-    (*out)->pool = p;
-    (*out)->fname = NULL;
-    (*out)->pipe = 1;
-    (*out)->timeout = -1;
-    (*out)->ungetchar = -1;
-    (*out)->eof_hit = 0;
-    (*out)->filePtr = 0;
-    (*out)->bufpos = 0;
-    (*out)->dataRead = 0;
-    (*out)->direction = 0;
-    (*out)->pOverlapped = NULL;
-
-    if (apr_os_level >= APR_WIN_NT) {
-        /* Create the read end of the pipe */
-        dwOpenMode = PIPE_ACCESS_INBOUND;
-        if (blocking_mode == APR_WRITE_BLOCK /* READ_NONBLOCK */
-               || blocking_mode == APR_FULL_NONBLOCK) {
-            dwOpenMode |= FILE_FLAG_OVERLAPPED;
-            (*in)->pOverlapped = (OVERLAPPED*) apr_pcalloc(p, sizeof(OVERLAPPED));
-            (*in)->pOverlapped->hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
-        }
-
-        dwPipeMode = 0;
-
-        sprintf(name, "\\\\.\\pipe\\apr-pipe-%u.%lu", getpid(), id++);
-
-        (*in)->filehand = CreateNamedPipe(name,
-                                          dwOpenMode,
-                                          dwPipeMode,
-                                          1,            //nMaxInstances,
-                                          0,            //nOutBufferSize, 
-                                          65536,        //nInBufferSize,                   
-                                          1,            //nDefaultTimeOut,                
-                                          &sa);
-
-        /* Create the write end of the pipe */
-        dwOpenMode = FILE_ATTRIBUTE_NORMAL;
-        if (blocking_mode == APR_READ_BLOCK /* WRITE_NONBLOCK */
-                || blocking_mode == APR_FULL_NONBLOCK) {
-            dwOpenMode |= FILE_FLAG_OVERLAPPED;
-            (*out)->pOverlapped = (OVERLAPPED*) apr_pcalloc(p, sizeof(OVERLAPPED));
-            (*out)->pOverlapped->hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
-        }
-        
-        (*out)->filehand = CreateFile(name,
-                                      GENERIC_WRITE,   // access mode
-                                      0,               // share mode
-                                      &sa,             // Security attributes
-                                      OPEN_EXISTING,   // dwCreationDisposition
-                                      dwOpenMode,      // Pipe attributes
-                                      NULL);           // handle to template file
-    }
-    else {
-        /* Pipes on Win9* are blocking. Live with it. */
-        if (!CreatePipe(&(*in)->filehand, &(*out)->filehand, &sa, 65536)) {
-            return apr_get_os_error();
-        }
-    }
-
-    apr_pool_cleanup_register((*in)->pool, (void *)(*in), file_cleanup,
-                        apr_pool_cleanup_null);
-    apr_pool_cleanup_register((*out)->pool, (void *)(*out), file_cleanup,
-                        apr_pool_cleanup_null);
-    return APR_SUCCESS;
-#endif /* _WIN32_WCE */
-}
-
-
-APR_DECLARE(apr_status_t) apr_file_namedpipe_create(const char *filename,
-                                                    apr_fileperms_t perm,
-                                                    apr_pool_t *pool)
-{
-    /* Not yet implemented, interface not suitable.
-     * Win32 requires the named pipe to be *opened* at the time it's
-     * created, and to do so, blocking or non blocking must be elected.
-     */
-    return APR_ENOTIMPL;
-}
-
-
-/* XXX: Problem; we need to choose between blocking and nonblocking based
- * on how *thefile was opened, and we don't have that information :-/
- * Hack; assume a blocking socket, since the most common use for the fn
- * would be to handle stdio-style or blocking pipes.  Win32 doesn't have
- * select() blocking for pipes anyways :(
- */
-APR_DECLARE(apr_status_t) apr_os_pipe_put_ex(apr_file_t **file,
-                                             apr_os_file_t *thefile,
-                                             int register_cleanup,
-                                             apr_pool_t *pool)
-{
-    (*file) = apr_pcalloc(pool, sizeof(apr_file_t));
-    (*file)->pool = pool;
-    (*file)->pipe = 1;
-    (*file)->timeout = -1;
-    (*file)->ungetchar = -1;
-    (*file)->filehand = *thefile;
-
-    if (register_cleanup) {
-        apr_pool_cleanup_register(pool, *file, file_cleanup,
-                                  apr_pool_cleanup_null);
-    }
-
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_os_pipe_put(apr_file_t **file,
-                                          apr_os_file_t *thefile,
-                                          apr_pool_t *pool)
-{
-    return apr_os_pipe_put_ex(file, thefile, 0, pool);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/readwrite.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/readwrite.c
deleted file mode 100644
index 5291830a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/readwrite.c
+++ /dev/null
@@ -1,524 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "win32/apr_arch_file_io.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_strings.h"
-#include "apr_lib.h"
-#include "apr_errno.h"
-#include <malloc.h>
-#include "apr_arch_atime.h"
-#include "apr_arch_misc.h"
-
-/*
- * read_with_timeout() 
- * Uses async i/o to emulate unix non-blocking i/o with timeouts.
- */
-static apr_status_t read_with_timeout(apr_file_t *file, void *buf, apr_size_t len, apr_size_t *nbytes)
-{
-    apr_status_t rv;
-    *nbytes = 0;
-
-    /* Handle the zero timeout non-blocking case */
-    if (file->timeout == 0) {
-        /* Peek at the pipe. If there is no data available, return APR_EAGAIN.
-         * If data is available, go ahead and read it.
-         */
-        if (file->pipe) {
-            DWORD bytes;
-            if (!PeekNamedPipe(file->filehand, NULL, 0, NULL, &bytes, NULL)) {
-                rv = apr_get_os_error();
-                if (rv == APR_FROM_OS_ERROR(ERROR_BROKEN_PIPE)) {
-                    rv = APR_EOF;
-                }
-                return rv;
-            }
-            else {
-                if (bytes == 0) {
-                    return APR_EAGAIN;
-                }
-                if (len > bytes) {
-                    len = bytes;
-                }
-            }
-        }
-        else {
-            /* ToDo: Handle zero timeout non-blocking file i/o 
-             * This is not needed until an APR application needs to
-             * timeout file i/o (which means setting file i/o non-blocking)
-             */
-        }
-    }
-
-    if (file->pOverlapped && !file->pipe) {
-        file->pOverlapped->Offset     = (DWORD)file->filePtr;
-        file->pOverlapped->OffsetHigh = (DWORD)(file->filePtr >> 32);
-    }
-
-    rv = ReadFile(file->filehand, buf, len, nbytes, file->pOverlapped);
-
-    if (!rv) {
-        rv = apr_get_os_error();
-        if (rv == APR_FROM_OS_ERROR(ERROR_IO_PENDING)) {
-            /* Wait for the pending i/o */
-            if (file->timeout > 0) {
-                /* timeout in milliseconds... */
-                rv = WaitForSingleObject(file->pOverlapped->hEvent, 
-                                         (DWORD)(file->timeout/1000)); 
-            }
-            else if (file->timeout == -1) {
-                rv = WaitForSingleObject(file->pOverlapped->hEvent, INFINITE);
-            }
-            switch (rv) {
-                case WAIT_OBJECT_0:
-                    GetOverlappedResult(file->filehand, file->pOverlapped, 
-                                        nbytes, TRUE);
-                    rv = APR_SUCCESS;
-                    break;
-
-                case WAIT_TIMEOUT:
-                    rv = APR_TIMEUP;
-                    break;
-
-                case WAIT_FAILED:
-                    rv = apr_get_os_error();
-                    break;
-
-                default:
-                    break;
-            }
-
-            if (rv != APR_SUCCESS) {
-                if (apr_os_level >= APR_WIN_98) {
-                    CancelIo(file->filehand);
-                }
-            }
-        }
-        else if (rv == APR_FROM_OS_ERROR(ERROR_BROKEN_PIPE)) {
-            /* Assume ERROR_BROKEN_PIPE signals an EOF reading from a pipe */
-            rv = APR_EOF;
-        } else if (rv == APR_FROM_OS_ERROR(ERROR_HANDLE_EOF)) {
-            /* Did we hit EOF reading from the handle? */
-            rv = APR_EOF;
-        }
-    } else {
-        /* OK and 0 bytes read ==> end of file */
-        if (*nbytes == 0)
-            rv = APR_EOF;
-        else
-            rv = APR_SUCCESS;
-    }
-    if (rv == APR_SUCCESS && file->pOverlapped && !file->pipe) {
-        file->filePtr += *nbytes;
-    }
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_file_read(apr_file_t *thefile, void *buf, apr_size_t *len)
-{
-    apr_status_t rv;
-    DWORD bytes_read = 0;
-
-    if (*len <= 0) {
-        *len = 0;
-        return APR_SUCCESS;
-    }
-
-    /* If the file is open for xthread support, allocate and
-     * initialize the overlapped and io completion event (hEvent). 
-     * Threads should NOT share an apr_file_t or its hEvent.
-     */
-    if ((thefile->flags & APR_XTHREAD) && !thefile->pOverlapped ) {
-        thefile->pOverlapped = (OVERLAPPED*) apr_pcalloc(thefile->pool, 
-                                                         sizeof(OVERLAPPED));
-        thefile->pOverlapped->hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
-        if (!thefile->pOverlapped->hEvent) {
-            rv = apr_get_os_error();
-            return rv;
-        }
-    }
-
-    /* Handle the ungetchar if there is one */
-    if (thefile->ungetchar != -1) {
-        bytes_read = 1;
-        *(char *)buf = (char)thefile->ungetchar;
-        buf = (char *)buf + 1;
-        (*len)--;
-        thefile->ungetchar = -1;
-        if (*len == 0) {
-            *len = bytes_read;
-            return APR_SUCCESS;
-        }
-    }
-    if (thefile->buffered) {
-        char *pos = (char *)buf;
-        apr_size_t blocksize;
-        apr_size_t size = *len;
-
-        apr_thread_mutex_lock(thefile->mutex);
-
-        if (thefile->direction == 1) {
-            rv = apr_file_flush(thefile);
-            if (rv != APR_SUCCESS) {
-                apr_thread_mutex_unlock(thefile->mutex);
-                return rv;
-            }
-            thefile->bufpos = 0;
-            thefile->direction = 0;
-            thefile->dataRead = 0;
-        }
-
-        rv = 0;
-        while (rv == 0 && size > 0) {
-            if (thefile->bufpos >= thefile->dataRead) {
-                apr_size_t read;
-                rv = read_with_timeout(thefile, thefile->buffer, 
-                                       APR_FILE_BUFSIZE, &read);
-                if (read == 0) {
-                    if (rv == APR_EOF)
-                        thefile->eof_hit = TRUE;
-                    break;
-                }
-                else {
-                    thefile->dataRead = read;
-                    thefile->filePtr += thefile->dataRead;
-                    thefile->bufpos = 0;
-                }
-            }
-
-            blocksize = size > thefile->dataRead - thefile->bufpos ? thefile->dataRead - thefile->bufpos : size;
-            memcpy(pos, thefile->buffer + thefile->bufpos, blocksize);
-            thefile->bufpos += blocksize;
-            pos += blocksize;
-            size -= blocksize;
-        }
-
-        *len = pos - (char *)buf;
-        if (*len) {
-            rv = APR_SUCCESS;
-        }
-        apr_thread_mutex_unlock(thefile->mutex);
-    } else {  
-        /* Unbuffered i/o */
-        apr_size_t nbytes;
-        rv = read_with_timeout(thefile, buf, *len, &nbytes);
-        if (rv == APR_EOF)
-            thefile->eof_hit = TRUE;
-        *len = nbytes;
-    }
-
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_file_write(apr_file_t *thefile, const void *buf, apr_size_t *nbytes)
-{
-    apr_status_t rv;
-    DWORD bwrote;
-
-    /* If the file is open for xthread support, allocate and
-     * initialize the overlapped and io completion event (hEvent). 
-     * Threads should NOT share an apr_file_t or its hEvent.
-     */
-    if ((thefile->flags & APR_XTHREAD) && !thefile->pOverlapped ) {
-        thefile->pOverlapped = (OVERLAPPED*) apr_pcalloc(thefile->pool, 
-                                                         sizeof(OVERLAPPED));
-        thefile->pOverlapped->hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
-        if (!thefile->pOverlapped->hEvent) {
-            rv = apr_get_os_error();
-            return rv;
-        }
-    }
-
-    if (thefile->buffered) {
-        char *pos = (char *)buf;
-        apr_size_t blocksize;
-        apr_size_t size = *nbytes;
-
-        apr_thread_mutex_lock(thefile->mutex);
-
-        if (thefile->direction == 0) {
-            // Position file pointer for writing at the offset we are logically reading from
-            apr_off_t offset = thefile->filePtr - thefile->dataRead + thefile->bufpos;
-            DWORD offlo = (DWORD)offset;
-            DWORD offhi = (DWORD)(offset >> 32);
-            if (offset != thefile->filePtr)
-                SetFilePointer(thefile->filehand, offlo, &offhi, FILE_BEGIN);
-            thefile->bufpos = thefile->dataRead = 0;
-            thefile->direction = 1;
-        }
-
-        rv = 0;
-        while (rv == 0 && size > 0) {
-            if (thefile->bufpos == APR_FILE_BUFSIZE)   // write buffer is full
-                rv = apr_file_flush(thefile);
-
-            blocksize = size > APR_FILE_BUFSIZE - thefile->bufpos ? APR_FILE_BUFSIZE - thefile->bufpos : size;
-            memcpy(thefile->buffer + thefile->bufpos, pos, blocksize);
-            thefile->bufpos += blocksize;
-            pos += blocksize;
-            size -= blocksize;
-        }
-
-        apr_thread_mutex_unlock(thefile->mutex);
-        return rv;
-    } else {
-        if (!thefile->pipe) {
-            apr_off_t offset = 0;
-            apr_status_t rc;
-            if (thefile->append) {
-                /* apr_file_lock will mutex the file across processes.
-                 * The call to apr_thread_mutex_lock is added to avoid
-                 * a race condition between LockFile and WriteFile 
-                 * that occasionally leads to deadlocked threads.
-                 */
-                apr_thread_mutex_lock(thefile->mutex);
-                rc = apr_file_lock(thefile, APR_FLOCK_EXCLUSIVE);
-                if (rc != APR_SUCCESS) {
-                    apr_thread_mutex_unlock(thefile->mutex);
-                    return rc;
-                }
-                rc = apr_file_seek(thefile, APR_END, &offset);
-                if (rc != APR_SUCCESS) {
-                    apr_thread_mutex_unlock(thefile->mutex);
-                    return rc;
-                }
-            }
-            if (thefile->pOverlapped) {
-                thefile->pOverlapped->Offset     = (DWORD)thefile->filePtr;
-                thefile->pOverlapped->OffsetHigh = (DWORD)(thefile->filePtr >> 32);
-            }
-            rv = WriteFile(thefile->filehand, buf, *nbytes, &bwrote,
-                           thefile->pOverlapped);
-            if (thefile->append) {
-                apr_file_unlock(thefile);
-                apr_thread_mutex_unlock(thefile->mutex);
-            }
-        }
-        else {
-            rv = WriteFile(thefile->filehand, buf, *nbytes, &bwrote,
-                           thefile->pOverlapped);
-        }
-        if (rv) {
-            *nbytes = bwrote;
-            rv = APR_SUCCESS;
-        }
-        else {
-            (*nbytes) = 0;
-            rv = apr_get_os_error();
-            if (rv == APR_FROM_OS_ERROR(ERROR_IO_PENDING)) {
- 
-                DWORD timeout_ms;
-
-                if (thefile->timeout == 0) {
-                    timeout_ms = 0;
-                }
-                else if (thefile->timeout < 0) {
-                    timeout_ms = INFINITE;
-                }
-                else {
-                    timeout_ms = (DWORD)(thefile->timeout / 1000);
-                }
-	       
-                rv = WaitForSingleObject(thefile->pOverlapped->hEvent, timeout_ms);
-                switch (rv) {
-                    case WAIT_OBJECT_0:
-                        GetOverlappedResult(thefile->filehand, thefile->pOverlapped, nbytes, TRUE);
-                        rv = APR_SUCCESS;
-                        break;
-                    case WAIT_TIMEOUT:
-                        rv = APR_TIMEUP;
-                        break;
-                    case WAIT_FAILED:
-                        rv = apr_get_os_error();
-                        break;
-                    default:
-                        break;
-                }
-                if (rv != APR_SUCCESS) {
-                    if (apr_os_level >= APR_WIN_98)
-                        CancelIo(thefile->filehand);
-                }
-            }
-        }
-        if (rv == APR_SUCCESS && thefile->pOverlapped && !thefile->pipe) {
-            thefile->filePtr += *nbytes;
-        }
-    }
-    return rv;
-}
-/* ToDo: Write for it anyway and test the oslevel!
- * Too bad WriteFileGather() is not supported on 95&98 (or NT prior to SP2)
- */
-APR_DECLARE(apr_status_t) apr_file_writev(apr_file_t *thefile,
-                                     const struct iovec *vec,
-                                     apr_size_t nvec, 
-                                     apr_size_t *nbytes)
-{
-    apr_status_t rv = APR_SUCCESS;
-    apr_size_t i;
-    DWORD bwrote = 0;
-    char *buf;
-
-    *nbytes = 0;
-    for (i = 0; i < nvec; i++) {
-        buf = vec[i].iov_base;
-        bwrote = vec[i].iov_len;
-        rv = apr_file_write(thefile, buf, &bwrote);
-        *nbytes += bwrote;
-        if (rv != APR_SUCCESS) {
-            break;
-        }
-    }
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_file_putc(char ch, apr_file_t *thefile)
-{
-    DWORD len = 1;
-
-    return apr_file_write(thefile, &ch, &len);
-}
-
-APR_DECLARE(apr_status_t) apr_file_ungetc(char ch, apr_file_t *thefile)
-{
-    thefile->ungetchar = (unsigned char) ch;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_file_getc(char *ch, apr_file_t *thefile)
-{
-    apr_status_t rc;
-    int bread;
-
-    bread = 1;
-    rc = apr_file_read(thefile, ch, &bread);
-
-    if (rc) {
-        return rc;
-    }
-    
-    if (bread == 0) {
-        thefile->eof_hit = TRUE;
-        return APR_EOF;
-    }
-    return APR_SUCCESS; 
-}
-
-APR_DECLARE(apr_status_t) apr_file_puts(const char *str, apr_file_t *thefile)
-{
-    DWORD len = strlen(str);
-
-    return apr_file_write(thefile, str, &len);
-}
-
-APR_DECLARE(apr_status_t) apr_file_gets(char *str, int len, apr_file_t *thefile)
-{
-    apr_size_t readlen;
-    apr_status_t rv = APR_SUCCESS;
-    int i;    
-
-    for (i = 0; i < len-1; i++) {
-        readlen = 1;
-        rv = apr_file_read(thefile, str+i, &readlen);
-
-        if (rv != APR_SUCCESS && rv != APR_EOF)
-            return rv;
-
-        if (readlen == 0) {
-            /* If we have bytes, defer APR_EOF to the next call */
-            if (i > 0)
-                rv = APR_SUCCESS;
-            break;
-        }
-        
-        if (str[i] == '\n') {
-            i++; /* don't clobber this char below */
-            break;
-        }
-    }
-    str[i] = 0;
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_file_flush(apr_file_t *thefile)
-{
-    if (thefile->buffered) {
-        DWORD written = 0;
-        apr_status_t rc = 0;
-
-        if (thefile->direction == 1 && thefile->bufpos) {
-            if (!WriteFile(thefile->filehand, thefile->buffer, thefile->bufpos, &written, NULL))
-                rc = apr_get_os_error();
-            thefile->filePtr += written;
-
-            if (rc == 0)
-                thefile->bufpos = 0;
-        }
-
-        return rc;
-    }
-
-    /* There isn't anything to do if we aren't buffering the output
-     * so just return success.
-     */
-    return APR_SUCCESS; 
-}
-
-struct apr_file_printf_data {
-    apr_vformatter_buff_t vbuff;
-    apr_file_t *fptr;
-    char *buf;
-};
-
-static int file_printf_flush(apr_vformatter_buff_t *buff)
-{
-    struct apr_file_printf_data *data = (struct apr_file_printf_data *)buff;
-
-    if (apr_file_write_full(data->fptr, data->buf,
-                            data->vbuff.curpos - data->buf, NULL)) {
-        return -1;
-    }
-
-    data->vbuff.curpos = data->buf;
-    return 0;
-}
-
-APR_DECLARE_NONSTD(int) apr_file_printf(apr_file_t *fptr, 
-                                        const char *format, ...)
-{
-    struct apr_file_printf_data data;
-    va_list ap;
-    int count;
-
-    data.buf = malloc(HUGE_STRING_LEN);
-    if (data.buf == NULL) {
-        return 0;
-    }
-    data.vbuff.curpos = data.buf;
-    data.vbuff.endpos = data.buf + HUGE_STRING_LEN;
-    data.fptr = fptr;
-    va_start(ap, format);
-    count = apr_vformatter(file_printf_flush,
-                           (apr_vformatter_buff_t *)&data, format, ap);
-    /* apr_vformatter does not call flush for the last bits */
-    if (count >= 0) file_printf_flush((apr_vformatter_buff_t *)&data);
-
-    va_end(ap);
-
-    free(data.buf);
-    return count;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/seek.c b/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/seek.c
deleted file mode 100644
index 3a291485..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/file_io/win32/seek.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "win32/apr_arch_file_io.h"
-#include "apr_file_io.h"
-#include <errno.h>
-#include <string.h>
-
-static apr_status_t setptr(apr_file_t *thefile, apr_off_t pos )
-{
-    apr_off_t newbufpos;
-    apr_status_t rv;
-    DWORD rc;
-
-    if (thefile->direction == 1) {
-        /* XXX: flush here is not mutex protected */
-        rv = apr_file_flush(thefile);
-        if (rv != APR_SUCCESS)
-            return rv;
-        thefile->bufpos = thefile->direction = thefile->dataRead = 0;
-    }
-
-    newbufpos = pos - (thefile->filePtr - thefile->dataRead);
-
-    if (newbufpos >= 0 && newbufpos <= thefile->dataRead) {
-        thefile->bufpos = (apr_size_t)newbufpos;
-        rv = APR_SUCCESS;
-    } else {
-        DWORD offlo = (DWORD)pos;
-        DWORD offhi = (DWORD)(pos >> 32);
-        rc = SetFilePointer(thefile->filehand, offlo, &offhi, FILE_BEGIN);
-
-        if (rc == (DWORD)-1)
-            /* A legal value, perhaps?  MSDN implies prior SetLastError isn't
-             * needed, googling for SetLastError SetFilePointer seems
-             * to confirm this.  INVALID_SET_FILE_POINTER is too recently
-             * added for us to rely on it as a constant.
-             */
-            rv = apr_get_os_error();
-        else
-            rv = APR_SUCCESS;
-
-        if (rv == APR_SUCCESS) {
-            thefile->eof_hit = thefile->bufpos = thefile->dataRead = 0;
-            thefile->filePtr = pos;
-        }
-    }
-
-    return rv;
-}
-
-
-APR_DECLARE(apr_status_t) apr_file_seek(apr_file_t *thefile, apr_seek_where_t where, apr_off_t *offset)
-{
-    apr_finfo_t finfo;
-    apr_status_t rc = APR_SUCCESS;
-
-    thefile->eof_hit = 0;
-
-    if (thefile->buffered) {
-        switch (where) {
-            case APR_SET:
-                rc = setptr(thefile, *offset);
-                break;
-
-            case APR_CUR:
-                rc = setptr(thefile, thefile->filePtr - thefile->dataRead 
-                                      + thefile->bufpos + *offset);
-                break;
-
-            case APR_END:
-                rc = apr_file_info_get(&finfo, APR_FINFO_SIZE, thefile);
-                if (rc == APR_SUCCESS)
-                    rc = setptr(thefile, finfo.size + *offset);
-                break;
-
-            default:
-                return APR_EINVAL;
-        }
-
-        *offset = thefile->filePtr - thefile->dataRead + thefile->bufpos;
-        return rc;
-    } 
-    /* A file opened with APR_XTHREAD has been opened for overlapped i/o. 
-     * APR must explicitly track the file pointer in this case.
-     */
-    else if (thefile->pOverlapped || thefile->flags & APR_XTHREAD) {
-        switch(where) {
-            case APR_SET:
-                thefile->filePtr = *offset;
-                break;
-        
-            case APR_CUR:
-                thefile->filePtr += *offset;
-                break;
-        
-            case APR_END:
-                rc = apr_file_info_get(&finfo, APR_FINFO_SIZE, thefile);
-                if (rc == APR_SUCCESS && finfo.size + *offset >= 0)
-                    thefile->filePtr = finfo.size + *offset;
-                break;
-
-            default:
-                return APR_EINVAL;
-        }
-        *offset = thefile->filePtr;
-        return rc;
-    }
-    else {
-        DWORD howmove;
-        DWORD offlo = (DWORD)*offset;
-        DWORD offhi = (DWORD)(*offset >> 32);
-
-        switch(where) {
-            case APR_SET:
-                howmove = FILE_BEGIN;   break;
-            case APR_CUR:
-                howmove = FILE_CURRENT; break;
-            case APR_END:
-                howmove = FILE_END;     break;
-            default:
-                return APR_EINVAL;
-        }
-        offlo = SetFilePointer(thefile->filehand, (LONG)offlo, 
-                               (LONG*)&offhi, howmove);
-        if (offlo == 0xFFFFFFFF)
-            rc = apr_get_os_error();
-        else
-            rc = APR_SUCCESS;
-        /* Since we can land at 0xffffffff we will measure our APR_SUCCESS */
-        if (rc == APR_SUCCESS)
-            *offset = ((apr_off_t)offhi << 32) | offlo;
-        return rc;
-    }
-}
-
-
-APR_DECLARE(apr_status_t) apr_file_trunc(apr_file_t *thefile, apr_off_t offset)
-{
-    apr_status_t rv;
-    DWORD offlo = (DWORD)offset;
-    DWORD offhi = (DWORD)(offset >> 32);
-    DWORD rc;
-
-    rc = SetFilePointer(thefile->filehand, offlo, &offhi, FILE_BEGIN);
-    if (rc == 0xFFFFFFFF)
-        if ((rv = apr_get_os_error()) != APR_SUCCESS)
-            return rv;
-
-    if (!SetEndOfFile(thefile->filehand))
-        return apr_get_os_error();
-
-    if (thefile->buffered) {
-        return setptr(thefile, offset);
-    }
-
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/images/ScanDocBig.jpg b/rubbos/app/httpd-2.0.64/srclib/apr/images/ScanDocBig.jpg
deleted file mode 100644
index 2c47fbc1..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/images/ScanDocBig.jpg
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/images/ScanDocSmall.jpg b/rubbos/app/httpd-2.0.64/srclib/apr/images/ScanDocSmall.jpg
deleted file mode 100644
index a10964aa..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/images/ScanDocSmall.jpg
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/images/ball1.gif b/rubbos/app/httpd-2.0.64/srclib/apr/images/ball1.gif
deleted file mode 100644
index f434b524..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/images/ball1.gif
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/images/ball1.png b/rubbos/app/httpd-2.0.64/srclib/apr/images/ball1.png
deleted file mode 100644
index 311d4b3f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/images/ball1.png
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/images/ball2.gif b/rubbos/app/httpd-2.0.64/srclib/apr/images/ball2.gif
deleted file mode 100644
index 9adc11c6..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/images/ball2.gif
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/images/ball2.png b/rubbos/app/httpd-2.0.64/srclib/apr/images/ball2.png
deleted file mode 100644
index cac3c07a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/images/ball2.png
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/images/bug.gif b/rubbos/app/httpd-2.0.64/srclib/apr/images/bug.gif
deleted file mode 100644
index abf4c845..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/images/bug.gif
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/images/bug.png b/rubbos/app/httpd-2.0.64/srclib/apr/images/bug.png
deleted file mode 100644
index dd787888..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/images/bug.png
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/images/caution.gif b/rubbos/app/httpd-2.0.64/srclib/apr/images/caution.gif
deleted file mode 100644
index 39bac170..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/images/caution.gif
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/images/caution.png b/rubbos/app/httpd-2.0.64/srclib/apr/images/caution.png
deleted file mode 100644
index 965fe7eb..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/images/caution.png
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/images/master.gif b/rubbos/app/httpd-2.0.64/srclib/apr/images/master.gif
deleted file mode 100644
index 5751a403..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/images/master.gif
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/images/master.png b/rubbos/app/httpd-2.0.64/srclib/apr/images/master.png
deleted file mode 100644
index a5c0508a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/images/master.png
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/images/tip.gif b/rubbos/app/httpd-2.0.64/srclib/apr/images/tip.gif
deleted file mode 100644
index 25367912..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/images/tip.gif
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/images/tip.png b/rubbos/app/httpd-2.0.64/srclib/apr/images/tip.png
deleted file mode 100644
index 82dfaa2a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/images/tip.png
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/images/warning.gif b/rubbos/app/httpd-2.0.64/srclib/apr/images/warning.gif
deleted file mode 100644
index 5d676d75..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/images/warning.gif
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/images/warning.png b/rubbos/app/httpd-2.0.64/srclib/apr/images/warning.png
deleted file mode 100644
index cf0d7ee4..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/images/warning.png
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr.h
deleted file mode 100644
index 276e0ab6..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr.h
+++ /dev/null
@@ -1,414 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#ifndef APR_H
-#define APR_H
-
-/* GENERATED FILE WARNING!  DO NOT EDIT apr.h
- *
- * You must modify apr.h.in instead.
- *
- * And please, make an effort to stub apr.hw and apr.hnw in the process.
- */
-
-/**
- * @file apr.h
- * @brief APR Platform Definitions
- * @remark This is a generated header generated from include/apr.h.in by
- * ./configure, or copied from include/apr.hw or include/apr.hnw 
- * for Win32 or Netware by those build environments, respectively.
- */
-
-/**
- * @defgroup APR Apache Portability Runtime library
- * @{
- */
-/**
- * @defgroup apr_platform Platform Definitions
- * @{
- * @warning
- * <strong><em>The actual values of macros and typedefs on this page<br>
- * are platform specific and should NOT be relied upon!</em></strong>
- */
-
-/* So that we can use inline on some critical functions, and use
- * GNUC attributes (such as to get -Wall warnings for printf-like
- * functions).  Only do this in gcc 2.7 or later ... it may work
- * on earlier stuff, but why chance it.
- *
- * We've since discovered that the gcc shipped with NeXT systems
- * as "cc" is completely broken.  It claims to be __GNUC__ and so
- * on, but it doesn't implement half of the things that __GNUC__
- * means.  In particular it's missing inline and the __attribute__
- * stuff.  So we hack around it.  PR#1613. -djg
- */
-#if !defined(__GNUC__) || __GNUC__ < 2 || \
-    (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ||\
-    defined(NEXT)
-#ifndef __attribute__
-#define __attribute__(__x)
-#endif
-#define APR_INLINE
-#define APR_HAS_INLINE		0
-#else
-#define APR_INLINE __inline__
-#define APR_HAS_INLINE		1
-#endif
-
-#define APR_HAVE_ARPA_INET_H     1
-#define APR_HAVE_CONIO_H         0
-#define APR_HAVE_CRYPT_H         1
-#define APR_HAVE_CTYPE_H         1
-#define APR_HAVE_DIRENT_H        1
-#define APR_HAVE_ERRNO_H         1
-#define APR_HAVE_FCNTL_H         1
-#define APR_HAVE_IO_H            0
-#define APR_HAVE_LIMITS_H        1
-#define APR_HAVE_NETDB_H         1
-#define APR_HAVE_NETINET_IN_H    1
-#define APR_HAVE_NETINET_SCTP_H  0
-#define APR_HAVE_NETINET_SCTP_UIO_H 0
-#define APR_HAVE_NETINET_TCP_H   1
-#define APR_HAVE_PTHREAD_H       1
-#define APR_HAVE_SEMAPHORE_H     1
-#define APR_HAVE_SIGNAL_H        1
-#define APR_HAVE_STDARG_H        1
-#define APR_HAVE_STDINT_H        1
-#define APR_HAVE_STDIO_H         1
-#define APR_HAVE_STDLIB_H        1
-#define APR_HAVE_STRING_H        1
-#define APR_HAVE_STRINGS_H       1
-#define APR_HAVE_SYS_IOCTL_H     1
-#define APR_HAVE_SYS_SENDFILE_H  1
-#define APR_HAVE_SYS_SIGNAL_H    1
-#define APR_HAVE_SYS_SOCKET_H    1
-#define APR_HAVE_SYS_SOCKIO_H    0
-#define APR_HAVE_SYS_SYSLIMITS_H 0
-#define APR_HAVE_SYS_TIME_H      1
-#define APR_HAVE_SYS_TYPES_H     1
-#define APR_HAVE_SYS_UIO_H       1
-#define APR_HAVE_SYS_UN_H        1
-#define APR_HAVE_SYS_WAIT_H      1
-#define APR_HAVE_TIME_H          1
-#define APR_HAVE_UNISTD_H        1
-
-/** @} */
-
-/* We don't include our conditional headers within the doxyblocks 
- * or the extern "C" namespace 
- */
-
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#if APR_HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS)
-/* C99 7.18.4 requires that stdint.h only exposes INT64_C 
- * and UINT64_C for C++ implementations if this is defined: */
-#define __STDC_CONSTANT_MACROS
-#endif
-
-#if APR_HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-#if APR_HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-
-#ifdef OS2
-#define INCL_DOS
-#define INCL_DOSERRORS
-#include <os2.h>
-#endif
-
-/* header files for PATH_MAX, _POSIX_PATH_MAX */
-#if APR_HAVE_LIMITS_H
-#include <limits.h>
-#else
-#if APR_HAVE_SYS_SYSLIMITS_H
-#include <sys/syslimits.h>
-#endif
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @addtogroup apr_platform
- * @ingroup APR 
- * @{
- */
-
-#define APR_HAVE_SHMEM_MMAP_TMP     1
-#define APR_HAVE_SHMEM_MMAP_SHM     1
-#define APR_HAVE_SHMEM_MMAP_ZERO    1
-#define APR_HAVE_SHMEM_SHMGET_ANON  1
-#define APR_HAVE_SHMEM_SHMGET       1
-#define APR_HAVE_SHMEM_MMAP_ANON    1
-#define APR_HAVE_SHMEM_BEOS         0
-
-#define APR_USE_SHMEM_MMAP_TMP     0
-#define APR_USE_SHMEM_MMAP_SHM     0
-#define APR_USE_SHMEM_MMAP_ZERO    0
-#define APR_USE_SHMEM_SHMGET_ANON  0
-#define APR_USE_SHMEM_SHMGET       1
-#define APR_USE_SHMEM_MMAP_ANON    1
-#define APR_USE_SHMEM_BEOS         0
-
-#define APR_USE_FLOCK_SERIALIZE           0 
-#define APR_USE_SYSVSEM_SERIALIZE         1
-#define APR_USE_POSIXSEM_SERIALIZE        0
-#define APR_USE_FCNTL_SERIALIZE           0
-#define APR_USE_PROC_PTHREAD_SERIALIZE    0 
-#define APR_USE_PTHREAD_SERIALIZE         1 
-
-#define APR_HAS_FLOCK_SERIALIZE           1
-#define APR_HAS_SYSVSEM_SERIALIZE         1
-#define APR_HAS_POSIXSEM_SERIALIZE        0
-#define APR_HAS_FCNTL_SERIALIZE           1
-#define APR_HAS_PROC_PTHREAD_SERIALIZE    1
-#define APR_HAS_RWLOCK_SERIALIZE          0
-
-#define APR_PROCESS_LOCK_IS_GLOBAL        0
-
-#define APR_HAVE_CORKABLE_TCP   1 
-#define APR_HAVE_GETRLIMIT      1
-#define APR_HAVE_IN_ADDR        1
-#define APR_HAVE_INET_ADDR      1
-#define APR_HAVE_INET_NETWORK   1
-#define APR_HAVE_IPV6           1
-#define APR_HAVE_MEMMOVE        1
-#define APR_HAVE_SETRLIMIT      1
-#define APR_HAVE_SIGACTION      1
-#define APR_HAVE_SIGSUSPEND     1
-#define APR_HAVE_SIGWAIT        1
-#define APR_HAVE_STRCASECMP     1
-#define APR_HAVE_STRDUP         1
-#define APR_HAVE_STRICMP        0
-#define APR_HAVE_STRNCASECMP    1
-#define APR_HAVE_STRNICMP       0
-#define APR_HAVE_STRSTR         1
-#define APR_HAVE_MEMCHR         1
-#define APR_HAVE_STRUCT_RLIMIT  1
-#define APR_HAVE_UNION_SEMUN    0
-#define APR_HAVE_SCTP           0
-
-/*  APR Feature Macros */
-#define APR_HAS_SHARED_MEMORY     1
-#define APR_HAS_THREADS           1
-#define APR_HAS_SENDFILE          1
-#define APR_HAS_MMAP              1
-#define APR_HAS_FORK              1
-#define APR_HAS_RANDOM            1
-#define APR_HAS_OTHER_CHILD       1
-#define APR_HAS_DSO               1
-#define APR_HAS_SO_ACCEPTFILTER   0
-#define APR_HAS_UNICODE_FS        0
-#define APR_HAS_PROC_INVOKED      0
-#define APR_HAS_USER              1
-#define APR_HAS_LARGE_FILES       0
-#define APR_HAS_XTHREAD_FILES     0
-#define APR_HAS_OS_UUID           0
-
-/* APR sets APR_FILES_AS_SOCKETS to 1 on systems where it is possible
- * to poll on files/pipes.  On such a system, the application can
- * call apr_socket_from_file() to get an APR socket representation and 
- * then pass the socket representation to apr_poll_socket_add().
- */
-#define APR_FILES_AS_SOCKETS      1
-
-/* Not all platforms have a real INADDR_NONE.  This macro replaces INADDR_NONE
- * on all platforms.
- */
-#define APR_INADDR_NONE           INADDR_NONE
-
-/* This macro indicates whether or not EBCDIC is the native character set.
- */
-#define APR_CHARSET_EBCDIC        0
-
-/* If we have a TCP implementation that can be "corked", what flag
- * do we use?
- */
-#define APR_TCP_NOPUSH_FLAG       TCP_CORK
-
-/* Is the TCP_NODELAY socket option inherited from listening sockets?
-*/
-#define APR_TCP_NODELAY_INHERITED 1
-
-/* Is the O_NONBLOCK flag inherited from listening sockets?
-*/
-#define APR_O_NONBLOCK_INHERITED 0
-
-/* Typedefs that APR needs. */
-
-typedef  unsigned char           apr_byte_t;
-
-typedef  short           apr_int16_t;
-typedef  unsigned short  apr_uint16_t;
-                                               
-typedef  int             apr_int32_t;
-typedef  unsigned int    apr_uint32_t;
-                                               
-typedef  long            apr_int64_t;
-typedef  unsigned long   apr_uint64_t;
-
-typedef  size_t          apr_size_t;
-typedef  ssize_t         apr_ssize_t;
-typedef  off_t           apr_off_t;
-typedef  socklen_t       apr_socklen_t;
-
-typedef unsigned long            apr_ino_t;
-
-#define APR_SIZEOF_VOIDP 8
-
-/* Mechanisms to properly type numeric literals */
-#define APR_INT64_C(val) INT64_C(val)
-
-/* Definitions that APR programs need to work properly. */
-
-/** 
- * Thread callbacks from APR functions must be declared with APR_THREAD_FUNC, 
- * so that they follow the platform's calling convention.
- * @example
- */
-/** void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data);
- */
-#define APR_THREAD_FUNC
-
-/**
- * The public APR functions are declared with APR_DECLARE(), so they may
- * use the most appropriate calling convention.  Public APR functions with 
- * variable arguments must use APR_DECLARE_NONSTD().
- *
- * @remark Both the declaration and implementations must use the same macro.
- * @example
- */
-/** APR_DECLARE(rettype) apr_func(args)
- * @see APR_DECLARE_NONSTD @see APR_DECLARE_DATA
- * @remark Note that when APR compiles the library itself, it passes the 
- * symbol -DAPR_DECLARE_EXPORT to the compiler on some platforms (e.g. Win32) 
- * to export public symbols from the dynamic library build.\n
- * The user must define the APR_DECLARE_STATIC when compiling to target
- * the static APR library on some platforms (e.g. Win32.)  The public symbols 
- * are neither exported nor imported when APR_DECLARE_STATIC is defined.\n
- * By default, compiling an application and including the APR public
- * headers, without defining APR_DECLARE_STATIC, will prepare the code to be
- * linked to the dynamic library.
- */
-#define APR_DECLARE(type)            type 
-
-/**
- * The public APR functions using variable arguments are declared with 
- * APR_DECLARE_NONSTD(), as they must follow the C language calling convention.
- * @see APR_DECLARE @see APR_DECLARE_DATA
- * @remark Both the declaration and implementations must use the same macro.
- * @example
- */
-/** APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
- */
-#define APR_DECLARE_NONSTD(type)     type
-
-/**
- * The public APR variables are declared with AP_MODULE_DECLARE_DATA.
- * This assures the appropriate indirection is invoked at compile time.
- * @see APR_DECLARE @see APR_DECLARE_NONSTD
- * @remark Note that the declaration and implementations use different forms,
- * but both must include the macro.
- * @example
- */
-/** extern APR_DECLARE_DATA type apr_variable;\n
- * APR_DECLARE_DATA type apr_variable = value;
- */
-#define APR_DECLARE_DATA
-
-/* Define APR_SSIZE_T_FMT.  
- * If ssize_t is an integer we define it to be "d",
- * if ssize_t is a long int we define it to be "ld",
- * if ssize_t is neither we declare an error here.
- * I looked for a better way to define this here, but couldn't find one, so
- * to find the logic for this definition search for "ssize_t_fmt" in
- * configure.in.
- */
-#define APR_SSIZE_T_FMT "ld"
-
-/* And APR_SIZE_T_FMT */
-#define APR_SIZE_T_FMT "ld"
-
-/* And APR_OFF_T_FMT */
-#define APR_OFF_T_FMT "ld"
-
-/* And APR_PID_T_FMT */
-#define APR_PID_T_FMT "d"
-
-/* And APR_INT64_T_FMT */
-#define APR_INT64_T_FMT "ld"
-#define APR_INT64_T_FMT_LEN 2
-
-/* And APR_UINT64_T_FMT */
-#define APR_UINT64_T_FMT "lu"
-#define APR_UINT64_T_FMT_LEN 2
-
-/* And APR_UINT64_T_HEX_FMT */
-#define APR_UINT64_T_HEX_FMT "lx"
-#define APR_UINT64_T_HEX_FMT_LEN  (sizeof(APR_UINT64_T_HEX_FMT) - 1)
-
-/* Deal with atoi64 variables ... these should move to apr_private.h */
-#define APR_HAVE_INT64_STRFN  1
-#define APR_INT64_STRFN	      strtol
-
-/* are we going to force the generic atomic operations */
-#define APR_FORCE_ATOMIC_GENERIC 1
-
-/* Does the proc mutex lock threads too */
-#define APR_PROC_MUTEX_IS_GLOBAL      0
-
-/* Local machine definition for console and log output. */
-#define APR_EOL_STR              "\n"
-
-
-#if APR_HAVE_SYS_WAIT_H
-#ifdef WEXITSTATUS
-#define apr_wait_t       int
-#else
-#define apr_wait_t       union wait
-#define WEXITSTATUS(status)    (int)((status).w_retcode)
-#define WTERMSIG(status)       (int)((status).w_termsig)
-#endif /* !WEXITSTATUS */
-#endif /* HAVE_SYS_WAIT_H */
-
-#if defined(PATH_MAX)
-#define APR_PATH_MAX       PATH_MAX
-#elif defined(_POSIX_PATH_MAX)
-#define APR_PATH_MAX       _POSIX_PATH_MAX
-#else
-#error no decision has been made on APR_PATH_MAX for your platform
-#endif
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* APR_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr.h.in b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr.h.in
deleted file mode 100644
index e6dfdc29..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr.h.in
+++ /dev/null
@@ -1,414 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#ifndef APR_H
-#define APR_H
-
-/* GENERATED FILE WARNING!  DO NOT EDIT apr.h
- *
- * You must modify apr.h.in instead.
- *
- * And please, make an effort to stub apr.hw and apr.hnw in the process.
- */
-
-/**
- * @file apr.h
- * @brief APR Platform Definitions
- * @remark This is a generated header generated from include/apr.h.in by
- * ./configure, or copied from include/apr.hw or include/apr.hnw 
- * for Win32 or Netware by those build environments, respectively.
- */
-
-/**
- * @defgroup APR Apache Portability Runtime library
- * @{
- */
-/**
- * @defgroup apr_platform Platform Definitions
- * @{
- * @warning
- * <strong><em>The actual values of macros and typedefs on this page<br>
- * are platform specific and should NOT be relied upon!</em></strong>
- */
-
-/* So that we can use inline on some critical functions, and use
- * GNUC attributes (such as to get -Wall warnings for printf-like
- * functions).  Only do this in gcc 2.7 or later ... it may work
- * on earlier stuff, but why chance it.
- *
- * We've since discovered that the gcc shipped with NeXT systems
- * as "cc" is completely broken.  It claims to be __GNUC__ and so
- * on, but it doesn't implement half of the things that __GNUC__
- * means.  In particular it's missing inline and the __attribute__
- * stuff.  So we hack around it.  PR#1613. -djg
- */
-#if !defined(__GNUC__) || __GNUC__ < 2 || \
-    (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ||\
-    defined(NEXT)
-#ifndef __attribute__
-#define __attribute__(__x)
-#endif
-#define APR_INLINE
-#define APR_HAS_INLINE		0
-#else
-#define APR_INLINE __inline__
-#define APR_HAS_INLINE		1
-#endif
-
-#define APR_HAVE_ARPA_INET_H     @arpa_ineth@
-#define APR_HAVE_CONIO_H         @conioh@
-#define APR_HAVE_CRYPT_H         @crypth@
-#define APR_HAVE_CTYPE_H         @ctypeh@
-#define APR_HAVE_DIRENT_H        @direnth@
-#define APR_HAVE_ERRNO_H         @errnoh@
-#define APR_HAVE_FCNTL_H         @fcntlh@
-#define APR_HAVE_IO_H            @ioh@
-#define APR_HAVE_LIMITS_H        @limitsh@
-#define APR_HAVE_NETDB_H         @netdbh@
-#define APR_HAVE_NETINET_IN_H    @netinet_inh@
-#define APR_HAVE_NETINET_SCTP_H  @netinet_sctph@
-#define APR_HAVE_NETINET_SCTP_UIO_H @netinet_sctp_uioh@
-#define APR_HAVE_NETINET_TCP_H   @netinet_tcph@
-#define APR_HAVE_PTHREAD_H       @pthreadh@
-#define APR_HAVE_SEMAPHORE_H     @semaphoreh@
-#define APR_HAVE_SIGNAL_H        @signalh@
-#define APR_HAVE_STDARG_H        @stdargh@
-#define APR_HAVE_STDINT_H        @stdint@
-#define APR_HAVE_STDIO_H         @stdioh@
-#define APR_HAVE_STDLIB_H        @stdlibh@
-#define APR_HAVE_STRING_H        @stringh@
-#define APR_HAVE_STRINGS_H       @stringsh@
-#define APR_HAVE_SYS_IOCTL_H     @sys_ioctlh@
-#define APR_HAVE_SYS_SENDFILE_H  @sys_sendfileh@
-#define APR_HAVE_SYS_SIGNAL_H    @sys_signalh@
-#define APR_HAVE_SYS_SOCKET_H    @sys_socketh@
-#define APR_HAVE_SYS_SOCKIO_H    @sys_sockioh@
-#define APR_HAVE_SYS_SYSLIMITS_H @sys_syslimitsh@
-#define APR_HAVE_SYS_TIME_H      @sys_timeh@
-#define APR_HAVE_SYS_TYPES_H     @sys_typesh@
-#define APR_HAVE_SYS_UIO_H       @sys_uioh@
-#define APR_HAVE_SYS_UN_H        @sys_unh@
-#define APR_HAVE_SYS_WAIT_H      @sys_waith@
-#define APR_HAVE_TIME_H          @timeh@
-#define APR_HAVE_UNISTD_H        @unistdh@
-
-/** @} */
-
-/* We don't include our conditional headers within the doxyblocks 
- * or the extern "C" namespace 
- */
-
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#if APR_HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS)
-/* C99 7.18.4 requires that stdint.h only exposes INT64_C 
- * and UINT64_C for C++ implementations if this is defined: */
-#define __STDC_CONSTANT_MACROS
-#endif
-
-#if APR_HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-#if APR_HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-
-#ifdef OS2
-#define INCL_DOS
-#define INCL_DOSERRORS
-#include <os2.h>
-#endif
-
-/* header files for PATH_MAX, _POSIX_PATH_MAX */
-#if APR_HAVE_LIMITS_H
-#include <limits.h>
-#else
-#if APR_HAVE_SYS_SYSLIMITS_H
-#include <sys/syslimits.h>
-#endif
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @addtogroup apr_platform
- * @ingroup APR 
- * @{
- */
-
-#define APR_HAVE_SHMEM_MMAP_TMP     @havemmaptmp@
-#define APR_HAVE_SHMEM_MMAP_SHM     @havemmapshm@
-#define APR_HAVE_SHMEM_MMAP_ZERO    @havemmapzero@
-#define APR_HAVE_SHMEM_SHMGET_ANON  @haveshmgetanon@
-#define APR_HAVE_SHMEM_SHMGET       @haveshmget@
-#define APR_HAVE_SHMEM_MMAP_ANON    @havemmapanon@
-#define APR_HAVE_SHMEM_BEOS         @havebeosarea@
-
-#define APR_USE_SHMEM_MMAP_TMP     @usemmaptmp@
-#define APR_USE_SHMEM_MMAP_SHM     @usemmapshm@
-#define APR_USE_SHMEM_MMAP_ZERO    @usemmapzero@
-#define APR_USE_SHMEM_SHMGET_ANON  @useshmgetanon@
-#define APR_USE_SHMEM_SHMGET       @useshmget@
-#define APR_USE_SHMEM_MMAP_ANON    @usemmapanon@
-#define APR_USE_SHMEM_BEOS         @usebeosarea@
-
-#define APR_USE_FLOCK_SERIALIZE           @flockser@ 
-#define APR_USE_SYSVSEM_SERIALIZE         @sysvser@
-#define APR_USE_POSIXSEM_SERIALIZE        @posixser@
-#define APR_USE_FCNTL_SERIALIZE           @fcntlser@
-#define APR_USE_PROC_PTHREAD_SERIALIZE    @procpthreadser@ 
-#define APR_USE_PTHREAD_SERIALIZE         @pthreadser@ 
-
-#define APR_HAS_FLOCK_SERIALIZE           @hasflockser@
-#define APR_HAS_SYSVSEM_SERIALIZE         @hassysvser@
-#define APR_HAS_POSIXSEM_SERIALIZE        @hasposixser@
-#define APR_HAS_FCNTL_SERIALIZE           @hasfcntlser@
-#define APR_HAS_PROC_PTHREAD_SERIALIZE    @hasprocpthreadser@
-#define APR_HAS_RWLOCK_SERIALIZE          @hasrwlockser@
-
-#define APR_PROCESS_LOCK_IS_GLOBAL        @proclockglobal@
-
-#define APR_HAVE_CORKABLE_TCP   @have_corkable_tcp@ 
-#define APR_HAVE_GETRLIMIT      @have_getrlimit@
-#define APR_HAVE_IN_ADDR        @have_in_addr@
-#define APR_HAVE_INET_ADDR      @have_inet_addr@
-#define APR_HAVE_INET_NETWORK   @have_inet_network@
-#define APR_HAVE_IPV6           @have_ipv6@
-#define APR_HAVE_MEMMOVE        @have_memmove@
-#define APR_HAVE_SETRLIMIT      @have_setrlimit@
-#define APR_HAVE_SIGACTION      @have_sigaction@
-#define APR_HAVE_SIGSUSPEND     @have_sigsuspend@
-#define APR_HAVE_SIGWAIT        @have_sigwait@
-#define APR_HAVE_STRCASECMP     @have_strcasecmp@
-#define APR_HAVE_STRDUP         @have_strdup@
-#define APR_HAVE_STRICMP        @have_stricmp@
-#define APR_HAVE_STRNCASECMP    @have_strncasecmp@
-#define APR_HAVE_STRNICMP       @have_strnicmp@
-#define APR_HAVE_STRSTR         @have_strstr@
-#define APR_HAVE_MEMCHR         @have_memchr@
-#define APR_HAVE_STRUCT_RLIMIT  @struct_rlimit@
-#define APR_HAVE_UNION_SEMUN    @have_union_semun@
-#define APR_HAVE_SCTP           @have_sctp@
-
-/*  APR Feature Macros */
-#define APR_HAS_SHARED_MEMORY     @sharedmem@
-#define APR_HAS_THREADS           @threads@
-#define APR_HAS_SENDFILE          @sendfile@
-#define APR_HAS_MMAP              @mmap@
-#define APR_HAS_FORK              @fork@
-#define APR_HAS_RANDOM            @rand@
-#define APR_HAS_OTHER_CHILD       @oc@
-#define APR_HAS_DSO               @aprdso@
-#define APR_HAS_SO_ACCEPTFILTER   @acceptfilter@
-#define APR_HAS_UNICODE_FS        0
-#define APR_HAS_PROC_INVOKED      0
-#define APR_HAS_USER              1
-#define APR_HAS_LARGE_FILES       0
-#define APR_HAS_XTHREAD_FILES     0
-#define APR_HAS_OS_UUID           0
-
-/* APR sets APR_FILES_AS_SOCKETS to 1 on systems where it is possible
- * to poll on files/pipes.  On such a system, the application can
- * call apr_socket_from_file() to get an APR socket representation and 
- * then pass the socket representation to apr_poll_socket_add().
- */
-#define APR_FILES_AS_SOCKETS      @file_as_socket@
-
-/* Not all platforms have a real INADDR_NONE.  This macro replaces INADDR_NONE
- * on all platforms.
- */
-#define APR_INADDR_NONE           @apr_inaddr_none@
-
-/* This macro indicates whether or not EBCDIC is the native character set.
- */
-#define APR_CHARSET_EBCDIC        @apr_charset_ebcdic@
-
-/* If we have a TCP implementation that can be "corked", what flag
- * do we use?
- */
-#define APR_TCP_NOPUSH_FLAG       @apr_tcp_nopush_flag@
-
-/* Is the TCP_NODELAY socket option inherited from listening sockets?
-*/
-#define APR_TCP_NODELAY_INHERITED @tcp_nodelay_inherited@
-
-/* Is the O_NONBLOCK flag inherited from listening sockets?
-*/
-#define APR_O_NONBLOCK_INHERITED @o_nonblock_inherited@
-
-/* Typedefs that APR needs. */
-
-typedef  unsigned char           apr_byte_t;
-
-typedef  @short_value@           apr_int16_t;
-typedef  unsigned @short_value@  apr_uint16_t;
-                                               
-typedef  @int_value@             apr_int32_t;
-typedef  unsigned @int_value@    apr_uint32_t;
-                                               
-typedef  @long_value@            apr_int64_t;
-typedef  unsigned @long_value@   apr_uint64_t;
-
-typedef  @size_t_value@          apr_size_t;
-typedef  @ssize_t_value@         apr_ssize_t;
-typedef  @off_t_value@           apr_off_t;
-typedef  @socklen_t_value@       apr_socklen_t;
-
-typedef @ino_t_value@            apr_ino_t;
-
-#define APR_SIZEOF_VOIDP @voidp_size@
-
-/* Mechanisms to properly type numeric literals */
-@int64_literal@
-
-/* Definitions that APR programs need to work properly. */
-
-/** 
- * Thread callbacks from APR functions must be declared with APR_THREAD_FUNC, 
- * so that they follow the platform's calling convention.
- * @example
- */
-/** void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data);
- */
-#define APR_THREAD_FUNC
-
-/**
- * The public APR functions are declared with APR_DECLARE(), so they may
- * use the most appropriate calling convention.  Public APR functions with 
- * variable arguments must use APR_DECLARE_NONSTD().
- *
- * @remark Both the declaration and implementations must use the same macro.
- * @example
- */
-/** APR_DECLARE(rettype) apr_func(args)
- * @see APR_DECLARE_NONSTD @see APR_DECLARE_DATA
- * @remark Note that when APR compiles the library itself, it passes the 
- * symbol -DAPR_DECLARE_EXPORT to the compiler on some platforms (e.g. Win32) 
- * to export public symbols from the dynamic library build.\n
- * The user must define the APR_DECLARE_STATIC when compiling to target
- * the static APR library on some platforms (e.g. Win32.)  The public symbols 
- * are neither exported nor imported when APR_DECLARE_STATIC is defined.\n
- * By default, compiling an application and including the APR public
- * headers, without defining APR_DECLARE_STATIC, will prepare the code to be
- * linked to the dynamic library.
- */
-#define APR_DECLARE(type)            type 
-
-/**
- * The public APR functions using variable arguments are declared with 
- * APR_DECLARE_NONSTD(), as they must follow the C language calling convention.
- * @see APR_DECLARE @see APR_DECLARE_DATA
- * @remark Both the declaration and implementations must use the same macro.
- * @example
- */
-/** APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
- */
-#define APR_DECLARE_NONSTD(type)     type
-
-/**
- * The public APR variables are declared with AP_MODULE_DECLARE_DATA.
- * This assures the appropriate indirection is invoked at compile time.
- * @see APR_DECLARE @see APR_DECLARE_NONSTD
- * @remark Note that the declaration and implementations use different forms,
- * but both must include the macro.
- * @example
- */
-/** extern APR_DECLARE_DATA type apr_variable;\n
- * APR_DECLARE_DATA type apr_variable = value;
- */
-#define APR_DECLARE_DATA
-
-/* Define APR_SSIZE_T_FMT.  
- * If ssize_t is an integer we define it to be "d",
- * if ssize_t is a long int we define it to be "ld",
- * if ssize_t is neither we declare an error here.
- * I looked for a better way to define this here, but couldn't find one, so
- * to find the logic for this definition search for "ssize_t_fmt" in
- * configure.in.
- */
-@ssize_t_fmt@
-
-/* And APR_SIZE_T_FMT */
-@size_t_fmt@
-
-/* And APR_OFF_T_FMT */
-@off_t_fmt@
-
-/* And APR_PID_T_FMT */
-@pid_t_fmt@
-
-/* And APR_INT64_T_FMT */
-@int64_t_fmt@
-@int64_t_fmt_len@
-
-/* And APR_UINT64_T_FMT */
-@uint64_t_fmt@
-@uint64_t_fmt_len@
-
-/* And APR_UINT64_T_HEX_FMT */
-@uint64_t_hex_fmt@
-#define APR_UINT64_T_HEX_FMT_LEN  (sizeof(APR_UINT64_T_HEX_FMT) - 1)
-
-/* Deal with atoi64 variables ... these should move to apr_private.h */
-#define APR_HAVE_INT64_STRFN  @have_int64_strfn@
-#define APR_INT64_STRFN	      @int64_strfn@
-
-/* are we going to force the generic atomic operations */
-#define APR_FORCE_ATOMIC_GENERIC @apr_force_atomic_generic@
-
-/* Does the proc mutex lock threads too */
-#define APR_PROC_MUTEX_IS_GLOBAL      @proc_mutex_is_global@
-
-/* Local machine definition for console and log output. */
-#define APR_EOL_STR              "@eolstr@"
-
-
-#if APR_HAVE_SYS_WAIT_H
-#ifdef WEXITSTATUS
-#define apr_wait_t       int
-#else
-#define apr_wait_t       union wait
-#define WEXITSTATUS(status)    (int)((status).w_retcode)
-#define WTERMSIG(status)       (int)((status).w_termsig)
-#endif /* !WEXITSTATUS */
-#endif /* HAVE_SYS_WAIT_H */
-
-#if defined(PATH_MAX)
-#define APR_PATH_MAX       PATH_MAX
-#elif defined(_POSIX_PATH_MAX)
-#define APR_PATH_MAX       _POSIX_PATH_MAX
-#else
-#error no decision has been made on APR_PATH_MAX for your platform
-#endif
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* APR_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr.h.save b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr.h.save
deleted file mode 100644
index 276e0ab6..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr.h.save
+++ /dev/null
@@ -1,414 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#ifndef APR_H
-#define APR_H
-
-/* GENERATED FILE WARNING!  DO NOT EDIT apr.h
- *
- * You must modify apr.h.in instead.
- *
- * And please, make an effort to stub apr.hw and apr.hnw in the process.
- */
-
-/**
- * @file apr.h
- * @brief APR Platform Definitions
- * @remark This is a generated header generated from include/apr.h.in by
- * ./configure, or copied from include/apr.hw or include/apr.hnw 
- * for Win32 or Netware by those build environments, respectively.
- */
-
-/**
- * @defgroup APR Apache Portability Runtime library
- * @{
- */
-/**
- * @defgroup apr_platform Platform Definitions
- * @{
- * @warning
- * <strong><em>The actual values of macros and typedefs on this page<br>
- * are platform specific and should NOT be relied upon!</em></strong>
- */
-
-/* So that we can use inline on some critical functions, and use
- * GNUC attributes (such as to get -Wall warnings for printf-like
- * functions).  Only do this in gcc 2.7 or later ... it may work
- * on earlier stuff, but why chance it.
- *
- * We've since discovered that the gcc shipped with NeXT systems
- * as "cc" is completely broken.  It claims to be __GNUC__ and so
- * on, but it doesn't implement half of the things that __GNUC__
- * means.  In particular it's missing inline and the __attribute__
- * stuff.  So we hack around it.  PR#1613. -djg
- */
-#if !defined(__GNUC__) || __GNUC__ < 2 || \
-    (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ||\
-    defined(NEXT)
-#ifndef __attribute__
-#define __attribute__(__x)
-#endif
-#define APR_INLINE
-#define APR_HAS_INLINE		0
-#else
-#define APR_INLINE __inline__
-#define APR_HAS_INLINE		1
-#endif
-
-#define APR_HAVE_ARPA_INET_H     1
-#define APR_HAVE_CONIO_H         0
-#define APR_HAVE_CRYPT_H         1
-#define APR_HAVE_CTYPE_H         1
-#define APR_HAVE_DIRENT_H        1
-#define APR_HAVE_ERRNO_H         1
-#define APR_HAVE_FCNTL_H         1
-#define APR_HAVE_IO_H            0
-#define APR_HAVE_LIMITS_H        1
-#define APR_HAVE_NETDB_H         1
-#define APR_HAVE_NETINET_IN_H    1
-#define APR_HAVE_NETINET_SCTP_H  0
-#define APR_HAVE_NETINET_SCTP_UIO_H 0
-#define APR_HAVE_NETINET_TCP_H   1
-#define APR_HAVE_PTHREAD_H       1
-#define APR_HAVE_SEMAPHORE_H     1
-#define APR_HAVE_SIGNAL_H        1
-#define APR_HAVE_STDARG_H        1
-#define APR_HAVE_STDINT_H        1
-#define APR_HAVE_STDIO_H         1
-#define APR_HAVE_STDLIB_H        1
-#define APR_HAVE_STRING_H        1
-#define APR_HAVE_STRINGS_H       1
-#define APR_HAVE_SYS_IOCTL_H     1
-#define APR_HAVE_SYS_SENDFILE_H  1
-#define APR_HAVE_SYS_SIGNAL_H    1
-#define APR_HAVE_SYS_SOCKET_H    1
-#define APR_HAVE_SYS_SOCKIO_H    0
-#define APR_HAVE_SYS_SYSLIMITS_H 0
-#define APR_HAVE_SYS_TIME_H      1
-#define APR_HAVE_SYS_TYPES_H     1
-#define APR_HAVE_SYS_UIO_H       1
-#define APR_HAVE_SYS_UN_H        1
-#define APR_HAVE_SYS_WAIT_H      1
-#define APR_HAVE_TIME_H          1
-#define APR_HAVE_UNISTD_H        1
-
-/** @} */
-
-/* We don't include our conditional headers within the doxyblocks 
- * or the extern "C" namespace 
- */
-
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#if APR_HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-#if defined(__cplusplus) && !defined(__STDC_CONSTANT_MACROS)
-/* C99 7.18.4 requires that stdint.h only exposes INT64_C 
- * and UINT64_C for C++ implementations if this is defined: */
-#define __STDC_CONSTANT_MACROS
-#endif
-
-#if APR_HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-#if APR_HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-
-#ifdef OS2
-#define INCL_DOS
-#define INCL_DOSERRORS
-#include <os2.h>
-#endif
-
-/* header files for PATH_MAX, _POSIX_PATH_MAX */
-#if APR_HAVE_LIMITS_H
-#include <limits.h>
-#else
-#if APR_HAVE_SYS_SYSLIMITS_H
-#include <sys/syslimits.h>
-#endif
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @addtogroup apr_platform
- * @ingroup APR 
- * @{
- */
-
-#define APR_HAVE_SHMEM_MMAP_TMP     1
-#define APR_HAVE_SHMEM_MMAP_SHM     1
-#define APR_HAVE_SHMEM_MMAP_ZERO    1
-#define APR_HAVE_SHMEM_SHMGET_ANON  1
-#define APR_HAVE_SHMEM_SHMGET       1
-#define APR_HAVE_SHMEM_MMAP_ANON    1
-#define APR_HAVE_SHMEM_BEOS         0
-
-#define APR_USE_SHMEM_MMAP_TMP     0
-#define APR_USE_SHMEM_MMAP_SHM     0
-#define APR_USE_SHMEM_MMAP_ZERO    0
-#define APR_USE_SHMEM_SHMGET_ANON  0
-#define APR_USE_SHMEM_SHMGET       1
-#define APR_USE_SHMEM_MMAP_ANON    1
-#define APR_USE_SHMEM_BEOS         0
-
-#define APR_USE_FLOCK_SERIALIZE           0 
-#define APR_USE_SYSVSEM_SERIALIZE         1
-#define APR_USE_POSIXSEM_SERIALIZE        0
-#define APR_USE_FCNTL_SERIALIZE           0
-#define APR_USE_PROC_PTHREAD_SERIALIZE    0 
-#define APR_USE_PTHREAD_SERIALIZE         1 
-
-#define APR_HAS_FLOCK_SERIALIZE           1
-#define APR_HAS_SYSVSEM_SERIALIZE         1
-#define APR_HAS_POSIXSEM_SERIALIZE        0
-#define APR_HAS_FCNTL_SERIALIZE           1
-#define APR_HAS_PROC_PTHREAD_SERIALIZE    1
-#define APR_HAS_RWLOCK_SERIALIZE          0
-
-#define APR_PROCESS_LOCK_IS_GLOBAL        0
-
-#define APR_HAVE_CORKABLE_TCP   1 
-#define APR_HAVE_GETRLIMIT      1
-#define APR_HAVE_IN_ADDR        1
-#define APR_HAVE_INET_ADDR      1
-#define APR_HAVE_INET_NETWORK   1
-#define APR_HAVE_IPV6           1
-#define APR_HAVE_MEMMOVE        1
-#define APR_HAVE_SETRLIMIT      1
-#define APR_HAVE_SIGACTION      1
-#define APR_HAVE_SIGSUSPEND     1
-#define APR_HAVE_SIGWAIT        1
-#define APR_HAVE_STRCASECMP     1
-#define APR_HAVE_STRDUP         1
-#define APR_HAVE_STRICMP        0
-#define APR_HAVE_STRNCASECMP    1
-#define APR_HAVE_STRNICMP       0
-#define APR_HAVE_STRSTR         1
-#define APR_HAVE_MEMCHR         1
-#define APR_HAVE_STRUCT_RLIMIT  1
-#define APR_HAVE_UNION_SEMUN    0
-#define APR_HAVE_SCTP           0
-
-/*  APR Feature Macros */
-#define APR_HAS_SHARED_MEMORY     1
-#define APR_HAS_THREADS           1
-#define APR_HAS_SENDFILE          1
-#define APR_HAS_MMAP              1
-#define APR_HAS_FORK              1
-#define APR_HAS_RANDOM            1
-#define APR_HAS_OTHER_CHILD       1
-#define APR_HAS_DSO               1
-#define APR_HAS_SO_ACCEPTFILTER   0
-#define APR_HAS_UNICODE_FS        0
-#define APR_HAS_PROC_INVOKED      0
-#define APR_HAS_USER              1
-#define APR_HAS_LARGE_FILES       0
-#define APR_HAS_XTHREAD_FILES     0
-#define APR_HAS_OS_UUID           0
-
-/* APR sets APR_FILES_AS_SOCKETS to 1 on systems where it is possible
- * to poll on files/pipes.  On such a system, the application can
- * call apr_socket_from_file() to get an APR socket representation and 
- * then pass the socket representation to apr_poll_socket_add().
- */
-#define APR_FILES_AS_SOCKETS      1
-
-/* Not all platforms have a real INADDR_NONE.  This macro replaces INADDR_NONE
- * on all platforms.
- */
-#define APR_INADDR_NONE           INADDR_NONE
-
-/* This macro indicates whether or not EBCDIC is the native character set.
- */
-#define APR_CHARSET_EBCDIC        0
-
-/* If we have a TCP implementation that can be "corked", what flag
- * do we use?
- */
-#define APR_TCP_NOPUSH_FLAG       TCP_CORK
-
-/* Is the TCP_NODELAY socket option inherited from listening sockets?
-*/
-#define APR_TCP_NODELAY_INHERITED 1
-
-/* Is the O_NONBLOCK flag inherited from listening sockets?
-*/
-#define APR_O_NONBLOCK_INHERITED 0
-
-/* Typedefs that APR needs. */
-
-typedef  unsigned char           apr_byte_t;
-
-typedef  short           apr_int16_t;
-typedef  unsigned short  apr_uint16_t;
-                                               
-typedef  int             apr_int32_t;
-typedef  unsigned int    apr_uint32_t;
-                                               
-typedef  long            apr_int64_t;
-typedef  unsigned long   apr_uint64_t;
-
-typedef  size_t          apr_size_t;
-typedef  ssize_t         apr_ssize_t;
-typedef  off_t           apr_off_t;
-typedef  socklen_t       apr_socklen_t;
-
-typedef unsigned long            apr_ino_t;
-
-#define APR_SIZEOF_VOIDP 8
-
-/* Mechanisms to properly type numeric literals */
-#define APR_INT64_C(val) INT64_C(val)
-
-/* Definitions that APR programs need to work properly. */
-
-/** 
- * Thread callbacks from APR functions must be declared with APR_THREAD_FUNC, 
- * so that they follow the platform's calling convention.
- * @example
- */
-/** void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data);
- */
-#define APR_THREAD_FUNC
-
-/**
- * The public APR functions are declared with APR_DECLARE(), so they may
- * use the most appropriate calling convention.  Public APR functions with 
- * variable arguments must use APR_DECLARE_NONSTD().
- *
- * @remark Both the declaration and implementations must use the same macro.
- * @example
- */
-/** APR_DECLARE(rettype) apr_func(args)
- * @see APR_DECLARE_NONSTD @see APR_DECLARE_DATA
- * @remark Note that when APR compiles the library itself, it passes the 
- * symbol -DAPR_DECLARE_EXPORT to the compiler on some platforms (e.g. Win32) 
- * to export public symbols from the dynamic library build.\n
- * The user must define the APR_DECLARE_STATIC when compiling to target
- * the static APR library on some platforms (e.g. Win32.)  The public symbols 
- * are neither exported nor imported when APR_DECLARE_STATIC is defined.\n
- * By default, compiling an application and including the APR public
- * headers, without defining APR_DECLARE_STATIC, will prepare the code to be
- * linked to the dynamic library.
- */
-#define APR_DECLARE(type)            type 
-
-/**
- * The public APR functions using variable arguments are declared with 
- * APR_DECLARE_NONSTD(), as they must follow the C language calling convention.
- * @see APR_DECLARE @see APR_DECLARE_DATA
- * @remark Both the declaration and implementations must use the same macro.
- * @example
- */
-/** APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
- */
-#define APR_DECLARE_NONSTD(type)     type
-
-/**
- * The public APR variables are declared with AP_MODULE_DECLARE_DATA.
- * This assures the appropriate indirection is invoked at compile time.
- * @see APR_DECLARE @see APR_DECLARE_NONSTD
- * @remark Note that the declaration and implementations use different forms,
- * but both must include the macro.
- * @example
- */
-/** extern APR_DECLARE_DATA type apr_variable;\n
- * APR_DECLARE_DATA type apr_variable = value;
- */
-#define APR_DECLARE_DATA
-
-/* Define APR_SSIZE_T_FMT.  
- * If ssize_t is an integer we define it to be "d",
- * if ssize_t is a long int we define it to be "ld",
- * if ssize_t is neither we declare an error here.
- * I looked for a better way to define this here, but couldn't find one, so
- * to find the logic for this definition search for "ssize_t_fmt" in
- * configure.in.
- */
-#define APR_SSIZE_T_FMT "ld"
-
-/* And APR_SIZE_T_FMT */
-#define APR_SIZE_T_FMT "ld"
-
-/* And APR_OFF_T_FMT */
-#define APR_OFF_T_FMT "ld"
-
-/* And APR_PID_T_FMT */
-#define APR_PID_T_FMT "d"
-
-/* And APR_INT64_T_FMT */
-#define APR_INT64_T_FMT "ld"
-#define APR_INT64_T_FMT_LEN 2
-
-/* And APR_UINT64_T_FMT */
-#define APR_UINT64_T_FMT "lu"
-#define APR_UINT64_T_FMT_LEN 2
-
-/* And APR_UINT64_T_HEX_FMT */
-#define APR_UINT64_T_HEX_FMT "lx"
-#define APR_UINT64_T_HEX_FMT_LEN  (sizeof(APR_UINT64_T_HEX_FMT) - 1)
-
-/* Deal with atoi64 variables ... these should move to apr_private.h */
-#define APR_HAVE_INT64_STRFN  1
-#define APR_INT64_STRFN	      strtol
-
-/* are we going to force the generic atomic operations */
-#define APR_FORCE_ATOMIC_GENERIC 1
-
-/* Does the proc mutex lock threads too */
-#define APR_PROC_MUTEX_IS_GLOBAL      0
-
-/* Local machine definition for console and log output. */
-#define APR_EOL_STR              "\n"
-
-
-#if APR_HAVE_SYS_WAIT_H
-#ifdef WEXITSTATUS
-#define apr_wait_t       int
-#else
-#define apr_wait_t       union wait
-#define WEXITSTATUS(status)    (int)((status).w_retcode)
-#define WTERMSIG(status)       (int)((status).w_termsig)
-#endif /* !WEXITSTATUS */
-#endif /* HAVE_SYS_WAIT_H */
-
-#if defined(PATH_MAX)
-#define APR_PATH_MAX       PATH_MAX
-#elif defined(_POSIX_PATH_MAX)
-#define APR_PATH_MAX       _POSIX_PATH_MAX
-#else
-#error no decision has been made on APR_PATH_MAX for your platform
-#endif
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* APR_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr.hnw b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr.hnw
deleted file mode 100644
index 919e058c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr.hnw
+++ /dev/null
@@ -1,348 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#ifndef APR_H
-#define APR_H
-
-/* GENERATED FILE WARNING!  DO NOT EDIT apr.h
- *
- * You must modify apr.hnw instead.
- *
- * And please, make an effort to stub apr.hw and apr.h.in in the process.
- *
- * This is the NetWare specific version of apr.h.  It is copied from
- * apr.hnw at the start of a NetWare build by prebuildNW.bat. 
- */
-
-/**
- * @file apr.h
- * @brief APR Platform Definitions
- * @remark This is a generated header generated from include/apr.h.in by
- * ./configure, or copied from include/apr.hw or include/apr.hnw 
- * for Win32 or Netware by those build environments, respectively.
- */
-
-#if defined(NETWARE) || defined(DOXYGEN)
-
-#define FD_SETSIZE 1024
-
-#include <sys/types.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include <nks/thread.h>
-#include <nks/synch.h>
-#include <nks/time.h>
-#include <signal.h>
-#include <novsock2.h>
-#include <sys/types.h>
-
-#ifdef NW_BUILD_IPV6
-#include <novtcpip.h>
-#endif
-
-#define _POSIX_THREAD_SAFE_FUNCTIONS    1
-#define READDIR_IS_THREAD_SAFE          1
-
-/* Keep #include'd headers from within the __cplusplus or doxyblocks */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @defgroup apr_platform Platform Definitions
- * @ingroup APR 
- * @{
- */
-
-#define APR_INLINE 
-#define APR_HAS_INLINE		0
-#ifndef __attribute__
-#define __attribute__(__x)
-#endif
-#define ENUM_BITFIELD(e,n,w)  signed int n : w
-
-#define APR_HAVE_ARPA_INET_H    0
-#define APR_HAVE_CONIO_H        0
-#define APR_HAVE_CRYPT_H        0
-#define APR_HAVE_CTYPE_H        1
-#define APR_HAVE_DIRENT_H       1
-#define APR_HAVE_ERRNO_H        1
-#define APR_HAVE_FCNTL_H        1
-#define APR_HAVE_IO_H           0
-#define APR_HAVE_LIMITS_H       1
-#define APR_HAVE_NETDB_H        0
-#define APR_HAVE_NETINET_IN_H   0
-#define APR_HAVE_NETINET_SCTP_H 0
-#define APR_HAVE_NETINET_SCTP_UIO_H 0
-#define APR_HAVE_NETINET_TCP_H  0
-#define APR_HAVE_PTHREAD_H      0
-#define APR_HAVE_SIGNAL_H       1
-#define APR_HAVE_STDARG_H       1
-#define APR_HAVE_STDINT_H       0
-#define APR_HAVE_STDIO_H        1
-#define APR_HAVE_STDLIB_H       1
-#define APR_HAVE_STRING_H       1
-#define APR_HAVE_STRINGS_H      0
-#define APR_HAVE_STRTOLL	1
-#define APR_HAVE_SYS_SENDFILE_H 0
-#define APR_HAVE_SYS_SIGNAL_H   0
-#define APR_HAVE_SYS_SOCKET_H   0
-#define APR_HAVE_SYS_SOCKIO_H   0
-#define APR_HAVE_SYS_SYSLIMITS_H 0
-#define APR_HAVE_SYS_TIME_H     0
-#define APR_HAVE_SYS_TYPES_H    1
-#define APR_HAVE_SYS_UIO_H      1
-#define APR_HAVE_SYS_UN_H       0
-#define APR_HAVE_SYS_WAIT_H     0
-#define APR_HAVE_TIME_H         1
-#define APR_HAVE_UNISTD_H       1
-
-#define APR_HAVE_SHMEM_MMAP_TMP     0
-#define APR_HAVE_SHMEM_MMAP_SHM     0
-#define APR_HAVE_SHMEM_MMAP_ZERO    0
-#define APR_HAVE_SHMEM_SHMGET_ANON  0
-#define APR_HAVE_SHMEM_SHMGET       0
-#define APR_HAVE_SHMEM_MMAP_ANON    0
-#define APR_HAVE_SHMEM_BEOS         0
-
-#define APR_USE_SHMEM_MMAP_TMP     0
-#define APR_USE_SHMEM_MMAP_SHM     0
-#define APR_USE_SHMEM_MMAP_ZERO    0
-#define APR_USE_SHMEM_SHMGET_ANON  0
-#define APR_USE_SHMEM_SHMGET       0
-#define APR_USE_SHMEM_MMAP_ANON    0
-#define APR_USE_SHMEM_BEOS         0
-
-#define APR_USE_FLOCK_SERIALIZE           0 
-#define APR_USE_SYSVSEM_SERIALIZE         0
-#define APR_USE_FCNTL_SERIALIZE           0
-#define APR_USE_PROC_PTHREAD_SERIALIZE    0 
-#define APR_USE_PTHREAD_SERIALIZE         0
-
-#define APR_HAS_FLOCK_SERIALIZE           0
-#define APR_HAS_SYSVSEM_SERIALIZE         0
-#define APR_HAS_FCNTL_SERIALIZE           0
-#define APR_HAS_PROC_PTHREAD_SERIALIZE    0
-#define APR_HAS_RWLOCK_SERIALIZE          0 
-
-#define APR_HAS_LOCK_CREATE_NP            0
-
-#define APR_PROCESS_LOCK_IS_GLOBAL        1
-
-#define APR_FILE_BASED_SHM      0
-
-#define APR_HAVE_CORKABLE_TCP	0
-#define APR_HAVE_GETRLIMIT      0
-#define APR_HAVE_ICONV          0
-#define APR_HAVE_IN_ADDR        1
-#define APR_HAVE_INET_ADDR      1
-#define APR_HAVE_INET_NETWORK   0
-#ifdef NW_BUILD_IPV6
-#define APR_HAVE_IPV6           1
-#else
-#define APR_HAVE_IPV6           0
-#endif
-#define APR_HAVE_MEMCHR         1
-#define APR_HAVE_MEMMOVE        1
-#define APR_HAVE_SETRLIMIT      0
-#define APR_HAVE_SIGACTION      0
-#define APR_HAVE_SIGSUSPEND     0
-#define APR_HAVE_SIGWAIT        0
-#define APR_HAVE_STRCASECMP     1
-#define APR_HAVE_STRDUP         1
-#define APR_HAVE_STRICMP        1
-#define APR_HAVE_STRNCASECMP    1
-#define APR_HAVE_STRNICMP       1
-#define APR_HAVE_STRSTR         1
-#define APR_HAVE_STRUCT_RLIMIT  0
-#define APR_HAVE_UNION_SEMUN    0
-#define APR_HAVE_SCTP           0
-
-/*  APR Feature Macros */
-#define APR_HAS_SHARED_MEMORY     0
-#define APR_HAS_THREADS           1
-#define APR_HAS_SENDFILE          0
-#define APR_HAS_MMAP              0
-#define APR_HAS_FORK              0
-#define APR_HAS_RANDOM            1
-#define APR_HAS_OTHER_CHILD       0
-#define APR_HAS_DSO               1
-#define APR_HAS_SO_ACCEPTFILTER   0
-#define APR_HAS_UNICODE_FS        0
-#define APR_HAS_PROC_INVOKED      0
-#define APR_HAS_USER              1
-#define APR_HAS_LARGE_FILES       0
-#define APR_HAS_XTHREAD_FILES     0
-#define APR_HAS_OS_UUID           0
-
-/* Netware can poll on files/pipes.
- */
-#define APR_FILES_AS_SOCKETS      1
-
-/* Not all platforms have a real INADDR_NONE.  This macro replaces INADDR_NONE
- * on all platforms.
- */
-#define APR_INADDR_NONE           INADDR_NONE
-
-/* This macro indicates whether or not EBCDIC is the native character set.
- */
-#define APR_CHARSET_EBCDIC        0
-
-/* Is the TCP_NODELAY socket option inherited from listening sockets?
-*/
-#define APR_TCP_NODELAY_INHERITED 1
-
-/* Is the O_NONBLOCK flag inherited from listening sockets?
-*/
-#define APR_O_NONBLOCK_INHERITED  1
-
-/* Typedefs that APR needs. */
-
-typedef  unsigned char     apr_byte_t;
-
-typedef  short             apr_int16_t;
-typedef  unsigned short    apr_uint16_t;
-                                               
-typedef  int               apr_int32_t;
-typedef  unsigned int      apr_uint32_t;
-                                               
-typedef  long long		   apr_int64_t;
-typedef  unsigned long long apr_uint64_t;
-
-typedef  size_t            apr_size_t;
-typedef  ssize_t           apr_ssize_t;
-typedef  off_t             apr_off_t;
-typedef  int               apr_socklen_t;
-
-typedef apr_uint64_t       apr_ino_t;
-
-#ifdef UNKNOWN_NETWARE_64BIT_FLAG_NEEDED
-#define APR_SIZEOF_VOIDP   8
-#else
-#define APR_SIZEOF_VOIDP   4
-#endif
-
-/* Mechanisms to properly type numeric literals */
-
-#ifdef __GNUC__
-#define APR_INT64_C(val) (val)
-#else
-#define APR_INT64_C(val) (val##i64)
-#endif
-
-/* PROC mutex is a GLOBAL mutex on Netware */
-#define APR_PROC_MUTEX_IS_GLOBAL      1
-
-/* Definitions that APR programs need to work properly. */
-
-/** 
- * Thread callbacks from APR functions must be declared with APR_THREAD_FUNC, 
- * so that they follow the platform's calling convention.
- * @example
- */
-/** void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data);
- */
-#define APR_THREAD_FUNC
-
-/**
- * The public APR functions are declared with APR_DECLARE(), so they may
- * use the most appropriate calling convention.  Public APR functions with 
- * variable arguments must use APR_DECLARE_NONSTD().
- *
- * @remark Both the declaration and implementations must use the same macro.
- * @example
- */
-/** APR_DECLARE(rettype) apr_func(args)
- * @see APR_DECLARE_NONSTD @see APR_DECLARE_DATA
- * @remark Note that when APR compiles the library itself, it passes the 
- * symbol -DAPR_DECLARE_EXPORT to the compiler on some platforms (e.g. Win32) 
- * to export public symbols from the dynamic library build.\n
- * The user must define the APR_DECLARE_STATIC when compiling to target
- * the static APR library on some platforms (e.g. Win32.)  The public symbols 
- * are neither exported nor imported when APR_DECLARE_STATIC is defined.\n
- * By default, compiling an application and including the APR public
- * headers, without defining APR_DECLARE_STATIC, will prepare the code to be
- * linked to the dynamic library.
- */
-#define APR_DECLARE(type)            type 
-
-/**
- * The public APR functions using variable arguments are declared with 
- * APR_DECLARE_NONSTD(), as they must follow the C language calling convention.
- * @see APR_DECLARE @see APR_DECLARE_DATA
- * @remark Both the declaration and implementations must use the same macro.
- * @example
- */
-/** APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
- */
-#define APR_DECLARE_NONSTD(type)     type
-
-/**
- * The public APR variables are declared with AP_MODULE_DECLARE_DATA.
- * This assures the appropriate indirection is invoked at compile time.
- * @see APR_DECLARE @see APR_DECLARE_NONSTD
- * @remark Note that the declaration and implementations use different forms,
- * but both must include the macro.
- * @example
- */
-/** extern APR_DECLARE_DATA type apr_variable;\n
- * APR_DECLARE_DATA type apr_variable = value;
- */
-#define APR_DECLARE_DATA
-
-#define APR_SSIZE_T_FMT          "d"
-
-#define APR_SIZE_T_FMT           "d"
-
-#define APR_OFF_T_FMT            "ld"
-
-#define APR_PID_T_FMT            "d"
-
-/* Local machine definition for console and log output. */
-#define APR_EOL_STR              "\r\n"
-
-typedef int apr_wait_t;
-
-#define APR_PATH_MAX PATH_MAX
-
-#define APR_INT64_T_FMT          "lld"
-#define APR_INT64_T_FMT_LEN      3
-#define APR_UINT64_T_FMT         "llu"
-#define APR_UINT64_T_FMT_LEN     3
-#define APR_UINT64_T_HEX_FMT     "llx"
-#define APR_UINT64_T_HEX_FMT_LEN (sizeof(APR_UINT64_T_HEX_FMT) - 1)
-#define APR_TIME_T_FMT APR_INT64_T_FMT
-
-/* Deal with atoi64 variables ... these should move to apr_private.h */
-#define APR_HAVE_INT64_STRFN  1
-#define APR_INT64_STRFN	      strtoll
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NETWARE */
-
-#endif /* APR_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr.hw b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr.hw
deleted file mode 100644
index 920891fd..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr.hw
+++ /dev/null
@@ -1,541 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#ifndef APR_H
-#define APR_H
-
-/* GENERATED FILE WARNING!  DO NOT EDIT apr.h
- *
- * You must modify apr.hw instead.
- *
- * And please, make an effort to stub apr.hnw and apr.h.in in the process.
- *
- * This is the Win32 specific version of apr.h.  It is copied from
- * apr.hw by the apr.dsp and libapr.dsp projects. 
- */
-
-/**
- * @file apr.h
- * @brief APR Platform Definitions
- * @remark This is a generated header generated from include/apr.h.in by
- * ./configure, or copied from include/apr.hw or include/apr.hnw 
- * for Win32 or Netware by those build environments, respectively.
- */
-
-#if defined(WIN32) || defined(DOXYGEN)
-
-/* Ignore most warnings (back down to /W3) for poorly constructed headers
- */
-#if defined(_MSC_VER) && _MSC_VER >= 1200
-#pragma warning(push, 3)
-#endif
-
-/* disable or reduce the frequency of...
- *   C4057: indirection to slightly different base types
- *   C4075: slight indirection changes (unsigned short* vs short[])
- *   C4100: unreferenced formal parameter
- *   C4127: conditional expression is constant
- *   C4201: nonstandard extension nameless struct/unions
- *   C4244: int to char/short - precision loss
- *   C4514: unreferenced inline function removed
- */
-#pragma warning(disable: 4100 4127 4201 4514; once: 4057 4075 4244)
-
-/* Ignore Microsoft's interpretation of secure development
- * and the POSIX string handling API
- */
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-#ifndef _CRT_SECURE_NO_DEPRECATE
-#define _CRT_SECURE_NO_DEPRECATE
-#endif
-#pragma warning(disable: 4996)
-#endif
-
-/* Has windows.h already been included?  If so, our preferences don't matter,
- * but we will still need the winsock things no matter what was included.
- * If not, include a restricted set of windows headers to our tastes.
- */
-#ifndef _WINDOWS_
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#ifndef _WIN32_WINNT
-
-/* Restrict the server to a subset of Windows NT 4.0 header files by default
- */
-#define _WIN32_WINNT 0x0400
-#endif
-#ifndef NOUSER
-#define NOUSER
-#endif
-#ifndef NOMCX
-#define NOMCX
-#endif
-#ifndef NOIME
-#define NOIME
-#endif
-#include <windows.h>
-/* 
- * Add a _very_few_ declarations missing from the restricted set of headers
- * (If this list becomes extensive, re-enable the required headers above!)
- * winsock headers were excluded by WIN32_LEAN_AND_MEAN, so include them now
- */
-#define SW_HIDE             0
-#ifndef _WIN32_WCE
-#include <winsock2.h>
-#include <mswsock.h>
-#else
-#include <winsock.h>
-#endif
-#endif /* !_WINDOWS_ */
-
-/**
- * @defgroup apr_platform Platform Definitions
- * @ingroup APR 
- * @{
- */
-
-#define APR_INLINE __inline
-#define APR_HAS_INLINE          1
-#if !defined(__GNUC__) && !defined(__attribute__)
-#define __attribute__(__x)
-#endif
-
-#define NO_USE_SIGACTION
-
-#ifndef _WIN32_WCE
-#define APR_HAVE_ARPA_INET_H    0
-#define APR_HAVE_CONIO_H        1
-#define APR_HAVE_CRYPT_H        0
-#define APR_HAVE_CTYPE_H        1
-#define APR_HAVE_DIRENT_H       0
-#define APR_HAVE_ERRNO_H        1
-#define APR_HAVE_FCNTL_H        1
-#define APR_HAVE_IO_H           1
-#define APR_HAVE_LIMITS_H       1
-#define APR_HAVE_NETDB_H        0
-#define APR_HAVE_NETINET_IN_H   0
-#define APR_HAVE_NETINET_SCTP_H 0
-#define APR_HAVE_NETINET_SCTP_UIO_H 0
-#define APR_HAVE_NETINET_TCP_H  0
-#define APR_HAVE_PTHREAD_H      0
-#define APR_HAVE_SIGNAL_H       1
-#define APR_HAVE_STDARG_H       1
-#define APR_HAVE_STDINT_H       0
-#define APR_HAVE_STDIO_H        1
-#define APR_HAVE_STDLIB_H       1
-#define APR_HAVE_STRING_H       1
-#define APR_HAVE_STRINGS_H      0
-#define APR_HAVE_SYS_SENDFILE_H 0
-#define APR_HAVE_SYS_SIGNAL_H   0
-#define APR_HAVE_SYS_SOCKET_H   0
-#define APR_HAVE_SYS_SOCKIO_H   0
-#define APR_HAVE_SYS_SYSLIMITS_H 0
-#define APR_HAVE_SYS_TIME_H     0
-#define APR_HAVE_SYS_TYPES_H    1
-#define APR_HAVE_SYS_UIO_H      0
-#define APR_HAVE_SYS_WAIT_H     0
-#define APR_HAVE_UNISTD_H       0
-#define APR_HAVE_STDDEF_H       1
-#define APR_HAVE_PROCESS_H      1
-#define APR_HAVE_TIME_H         1
-#else
-#define APR_HAVE_ARPA_INET_H    0
-#define APR_HAVE_CONIO_H        0
-#define APR_HAVE_CRYPT_H        0
-#define APR_HAVE_CTYPE_H        0
-#define APR_HAVE_DIRENT_H       0
-#define APR_HAVE_ERRNO_H        0
-#define APR_HAVE_FCNTL_H        0
-#define APR_HAVE_IO_H           0
-#define APR_HAVE_LIMITS_H       0
-#define APR_HAVE_NETDB_H        0
-#define APR_HAVE_NETINET_IN_H   0
-#define APR_HAVE_NETINET_TCP_H  0
-#define APR_HAVE_PTHREAD_H      0
-#define APR_HAVE_SIGNAL_H       0
-#define APR_HAVE_STDARG_H       0
-#define APR_HAVE_STDINT_H       0
-#define APR_HAVE_STDIO_H        1
-#define APR_HAVE_STDLIB_H       1
-#define APR_HAVE_STRING_H       1
-#define APR_HAVE_STRINGS_H      0
-#define APR_HAVE_SYS_SENDFILE_H 0
-#define APR_HAVE_SYS_SIGNAL_H   0
-#define APR_HAVE_SYS_SOCKET_H   0
-#define APR_HAVE_SYS_SYSLIMITS_H 0
-#define APR_HAVE_SYS_TIME_H     0
-#define APR_HAVE_SYS_TYPES_H    0
-#define APR_HAVE_SYS_UIO_H      0
-#define APR_HAVE_SYS_WAIT_H     0
-#define APR_HAVE_UNISTD_H       0
-#define APR_HAVE_STDDEF_H       0
-#define APR_HAVE_PROCESS_H      0
-#define APR_HAVE_TIME_H         0
-#endif
-
-#define APR_USE_FLOCK_SERIALIZE           0 
-#define APR_USE_SYSVSEM_SERIALIZE         0
-#define APR_USE_FCNTL_SERIALIZE           0
-#define APR_USE_PROC_PTHREAD_SERIALIZE    0 
-#define APR_USE_PTHREAD_SERIALIZE         0 
-
-#define APR_HAS_FLOCK_SERIALIZE           0
-#define APR_HAS_SYSVSEM_SERIALIZE         0
-#define APR_HAS_FCNTL_SERIALIZE           0
-#define APR_HAS_PROC_PTHREAD_SERIALIZE    0
-#define APR_HAS_RWLOCK_SERIALIZE          0
-
-#define APR_HAS_LOCK_CREATE_NP            0
-
-#define APR_PROCESS_LOCK_IS_GLOBAL        0
-
-#define APR_USES_ANONYMOUS_SHM            0
-#define APR_USES_FILEBASED_SHM            0
-#define APR_USES_KEYBASED_SHM             0
-
-#define APR_FILE_BASED_SHM      0
-#define APR_MEM_BASED_SHM       0
-
-#define APR_HAVE_CORKABLE_TCP   0
-#define APR_HAVE_GETRLIMIT      0
-#define APR_HAVE_ICONV          0
-#define APR_HAVE_IN_ADDR        1
-#define APR_HAVE_INET_ADDR      1
-#define APR_HAVE_INET_NETWORK   0
-#define APR_HAVE_IPV6           0
-#define APR_HAVE_MEMMOVE        1
-#define APR_HAVE_SETRLIMIT      0
-#define APR_HAVE_SIGACTION      0
-#define APR_HAVE_SIGSUSPEND     0
-#define APR_HAVE_SIGWAIT        0
-#define APR_HAVE_STRCASECMP     0
-#define APR_HAVE_STRDUP         1
-#define APR_HAVE_STRNCASECMP    0
-#define APR_HAVE_STRSTR         1
-#define APR_HAVE_MEMCHR         1
-#define APR_HAVE_STRUCT_RLIMIT  0
-#define APR_HAVE_UNION_SEMUN    0
-#define APR_HAVE_SCTP           0
-
-#ifndef _WIN32_WCE
-#define APR_HAVE_STRICMP        1
-#define APR_HAVE_STRNICMP       1
-#else
-#define APR_HAVE_STRICMP        0
-#define APR_HAVE_STRNICMP       0
-#endif
-
-/** @} */
-
-/* We don't include our conditional headers within the doxyblocks 
- * or the extern "C" namespace 
- */
-
-#if APR_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#if APR_HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if APR_HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-#if APR_HAVE_TIME_H
-#include <time.h>
-#endif
-#if APR_HAVE_PROCESS_H
-#include <process.h>
-#endif
-#if APR_HAVE_IPV6
-#include <ws2tcpip.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @addtogroup apr_platform
- * @ingroup APR 
- * @{
- */
-
-/*  APR Feature Macros */
-#define APR_HAS_SHARED_MEMORY     1
-#define APR_HAS_THREADS           1
-#define APR_HAS_MMAP              1
-#define APR_HAS_FORK              0
-#define APR_HAS_RANDOM            1
-#define APR_HAS_OTHER_CHILD       1
-#define APR_HAS_DSO               1
-#define APR_HAS_SO_ACCEPTFILTER   0
-#define APR_HAS_UNICODE_FS        1
-#define APR_HAS_PROC_INVOKED      1
-#ifndef _WIN32_WCE
-#define APR_HAS_SENDFILE          1
-#define APR_HAS_USER              1
-#define APR_HAS_LARGE_FILES       1
-#define APR_HAS_XTHREAD_FILES     1
-#else
-#define APR_HAS_SENDFILE          0
-#define APR_HAS_USER              0
-#define APR_HAS_LARGE_FILES       0
-#define APR_HAS_XTHREAD_FILES     0
-#endif
-#define APR_HAS_OS_UUID           1
-
-/* Win32 cannot poll [just yet] on files/pipes.
- */
-#define APR_FILES_AS_SOCKETS      0
-
-/* Not all platforms have a real INADDR_NONE.  This macro replaces INADDR_NONE
- * on all platforms.
- */
-#define APR_INADDR_NONE           INADDR_NONE
-
-/* This macro indicates whether or not EBCDIC is the native character set.
- */
-#define APR_CHARSET_EBCDIC        0
-
-/* Is the TCP_NODELAY socket option inherited from listening sockets?
- */
-#define APR_TCP_NODELAY_INHERITED 1
-
-/* Is the O_NONBLOCK flag inherited from listening sockets?
- */
-#define APR_O_NONBLOCK_INHERITED  1
-
-/* Typedefs that APR needs. */
-
-typedef  unsigned char     apr_byte_t;
-
-typedef  short             apr_int16_t;
-typedef  unsigned short    apr_uint16_t;
-                                               
-typedef  int               apr_int32_t;
-typedef  unsigned int      apr_uint32_t;
-                                               
-typedef  __int64           apr_int64_t;
-typedef  unsigned __int64  apr_uint64_t;
-
-typedef  size_t      apr_size_t;
-#if APR_HAVE_STDDEF_H
-typedef  ptrdiff_t   apr_ssize_t;
-#else
-typedef  int         apr_ssize_t;
-#endif
-#if APR_HAS_LARGE_FILES
-typedef  __int64     apr_off_t;
-#else
-typedef  int         apr_off_t;
-#endif
-typedef  int         apr_socklen_t;
-
-typedef apr_uint64_t       apr_ino_t;
-
-#ifdef WIN64
-#define APR_SIZEOF_VOIDP   8
-#else
-#define APR_SIZEOF_VOIDP   4
-#endif
-
-/* XXX These simply don't belong here, perhaps in apr_portable.h
- * based on some APR_HAVE_PID/GID/UID?
- */
-#ifndef __GNUC__
-typedef  int         pid_t;
-#endif
-typedef  int         uid_t;
-typedef  int         gid_t;
-
-/* Mechanisms to properly type numeric literals */
-
-#ifndef __GNUC__
-#define APR_INT64_C(val) (val##i64)
-#else
-#define APR_INT64_C(val) (val##LL)
-#endif
-
-
-#if APR_HAVE_IPV6
-
-/* Appears in later flavors, not the originals. */
-#ifndef in_addr6
-#define  in6_addr    in_addr6
-#endif
-
-#ifndef WS2TCPIP_INLINE
-#define IN6_IS_ADDR_V4MAPPED(a) \
-    (   (*(const apr_uint64_t *)(const void *)(&(a)->s6_addr[0]) == 0) \
-     && (*(const apr_uint32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff)))
-#endif
-
-#endif /* APR_HAS_IPV6 */
-
-/* Definitions that APR programs need to work properly. */
-
-/** 
- * Thread callbacks from APR functions must be declared with APR_THREAD_FUNC, 
- * so that they follow the platform's calling convention.
- * @example
- */
-/** void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data);
- */
-#define APR_THREAD_FUNC  __stdcall
-
-
-#if defined(DOXYGEN) || !defined(WIN32)
-
-/**
- * The public APR functions are declared with APR_DECLARE(), so they may
- * use the most appropriate calling convention.  Public APR functions with 
- * variable arguments must use APR_DECLARE_NONSTD().
- *
- * @remark Both the declaration and implementations must use the same macro.
- * @example
- */
-/** APR_DECLARE(rettype) apr_func(args)
- * @see APR_DECLARE_NONSTD @see APR_DECLARE_DATA
- * @remark Note that when APR compiles the library itself, it passes the 
- * symbol -DAPR_DECLARE_EXPORT to the compiler on some platforms (e.g. Win32) 
- * to export public symbols from the dynamic library build.\n
- * The user must define the APR_DECLARE_STATIC when compiling to target
- * the static APR library on some platforms (e.g. Win32.)  The public symbols 
- * are neither exported nor imported when APR_DECLARE_STATIC is defined.\n
- * By default, compiling an application and including the APR public
- * headers, without defining APR_DECLARE_STATIC, will prepare the code to be
- * linked to the dynamic library.
- */
-#define APR_DECLARE(type)            type 
-
-/**
- * The public APR functions using variable arguments are declared with 
- * APR_DECLARE_NONSTD(), as they must follow the C language calling convention.
- * @see APR_DECLARE @see APR_DECLARE_DATA
- * @remark Both the declaration and implementations must use the same macro.
- * @example
- */
-/** APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
- */
-#define APR_DECLARE_NONSTD(type)     type
-
-/**
- * The public APR variables are declared with AP_MODULE_DECLARE_DATA.
- * This assures the appropriate indirection is invoked at compile time.
- * @see APR_DECLARE @see APR_DECLARE_NONSTD
- * @remark Note that the declaration and implementations use different forms,
- * but both must include the macro.
- * @example
- */
-/** extern APR_DECLARE_DATA type apr_variable;\n
- * APR_DECLARE_DATA type apr_variable = value;
- */
-#define APR_DECLARE_DATA
-
-#elif defined(APR_DECLARE_STATIC)
-#define APR_DECLARE(type)            type __stdcall
-#define APR_DECLARE_NONSTD(type)     type
-#define APR_DECLARE_DATA
-#elif defined(APR_DECLARE_EXPORT)
-#define APR_DECLARE(type)            __declspec(dllexport) type __stdcall
-#define APR_DECLARE_NONSTD(type)     __declspec(dllexport) type
-#define APR_DECLARE_DATA             __declspec(dllexport)
-#else
-#define APR_DECLARE(type)            __declspec(dllimport) type __stdcall
-#define APR_DECLARE_NONSTD(type)     __declspec(dllimport) type
-#define APR_DECLARE_DATA             __declspec(dllimport)
-#endif
-
-#ifdef WIN64
-#define APR_SSIZE_T_FMT          "I64d"
-#define APR_SIZE_T_FMT           "I64d"
-#else
-#define APR_SSIZE_T_FMT          "d"
-#define APR_SIZE_T_FMT           "d"
-#endif
-
-#if APR_HAS_LARGE_FILES
-#define APR_OFF_T_FMT            "I64d"
-#else
-#define APR_OFF_T_FMT            "d"
-#endif
-
-#define APR_PID_T_FMT            "d"
-
-#define APR_INT64_T_FMT          "I64d"
-#define APR_INT64_T_FMT_LEN      4
-#define APR_UINT64_T_FMT         "I64u"
-#define APR_UINT64_T_FMT_LEN     4
-#define APR_UINT64_T_HEX_FMT     "I64x"
-#define APR_UINT64_T_HEX_FMT_LEN (sizeof(APR_UINT64_T_HEX_FMT) - 1)
-
-/* Deal with atoi64 variables ... these should move to apr_private.h */
-/* MSVC 7.0 introduced _strtoui64 */
-#if _MSC_VER >= 1300 && _INTEGRAL_MAX_BITS >= 64
-#define APR_HAVE_INT64_STRFN  1
-#define APR_INT64_STRFN	      _strtoui64
-#else
-#define APR_HAVE_INT64_STRFN  0
-#define APR_INT64_STRFN	      undef
-#endif
-
-/* Local machine definition for console and log output. */
-#define APR_EOL_STR              "\r\n"
-
-/* No difference between PROC and GLOBAL mutex */
-#define APR_PROC_MUTEX_IS_GLOBAL      1
-
-typedef int apr_wait_t;
-
-/* struct iovec is needed to emulate Unix writev */
-struct iovec {
-    char*      iov_base;
-    apr_size_t iov_len;
-};
-
-/* Nasty Win32 .h ommissions we really need */
-#define STDIN_FILENO  0
-#define STDOUT_FILENO 1
-#define STDERR_FILENO 2
-
-#if APR_HAS_UNICODE_FS
-/* An arbitrary size that is digestable. True max is a bit less than 32000 */
-#define APR_PATH_MAX 8192
-#else /* !APR_HAS_UNICODE_FS */
-#define APR_PATH_MAX MAX_PATH
-#endif
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-/* Done with badly written headers
- */
-#if defined(_MSC_VER) && _MSC_VER >= 1200
-#pragma warning(pop)
-#pragma warning(disable: 4996)
-#endif
-
-#endif /* WIN32 */
-
-#endif /* APR_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_allocator.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_allocator.h
deleted file mode 100644
index b880c4e2..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_allocator.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_ALLOCATOR_H
-#define APR_ALLOCATOR_H
-
-/**
- * @file apr_allocator.h
- * @brief APR Internal Memory Allocation
- */
-
-#include "apr.h"
-#include "apr_errno.h"
-#define APR_WANT_MEMFUNC /**< For no good reason? */
-#include "apr_want.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @defgroup apr_allocator Internal Memory Allocation
- * @ingroup APR 
- * @{
- */
-
-/** the allocator structure */
-typedef struct apr_allocator_t apr_allocator_t;
-/** the structure which holds information about the allocation */
-typedef struct apr_memnode_t apr_memnode_t;
-
-/** basic memory node structure */
-struct apr_memnode_t {
-    apr_memnode_t *next;            /**< next memnode */
-    apr_memnode_t **ref;            /**< reference to self */
-    apr_uint32_t   index;           /**< size */
-    apr_uint32_t   free_index;      /**< how much free */
-    char          *first_avail;     /**< pointer to first free memory */
-    char          *endp;            /**< pointer to end of free memory */
-};
-
-/** The base size of a memory node - aligned.  */
-#define APR_MEMNODE_T_SIZE APR_ALIGN_DEFAULT(sizeof(apr_memnode_t))
-
-/** Symbolic constants */
-#define APR_ALLOCATOR_MAX_FREE_UNLIMITED 0
-
-/**
- * Create a new allocator
- * @param allocator The allocator we have just created.
- *
- */
-APR_DECLARE(apr_status_t) apr_allocator_create(apr_allocator_t **allocator);
-
-/**
- * Destroy an allocator
- * @param allocator The allocator to be destroyed
- * @remark Any memnodes not given back to the allocator prior to destroying
- *         will _not_ be free()d.
- */
-APR_DECLARE(void) apr_allocator_destroy(apr_allocator_t *allocator);
-
-/**
- * Allocate a block of mem from the allocator
- * @param allocator The allocator to allocate from
- * @param size The size of the mem to allocate (excluding the
- *        memnode structure)
- */
-APR_DECLARE(apr_memnode_t *) apr_allocator_alloc(apr_allocator_t *allocator,
-                                                 apr_size_t size);
-
-/**
- * Free a block of mem, giving it back to the allocator
- * @param allocator The allocator to give the mem back to
- * @param memnode The memory node to return
- */
-APR_DECLARE(void) apr_allocator_free(apr_allocator_t *allocator,
-                                     apr_memnode_t *memnode);
-
-#include "apr_pools.h"
-
-/**
- * Set the owner of the allocator
- * @param allocator The allocator to set the owner for
- * @param pool The pool that is to own the allocator
- * @remark Typically pool is the highest level pool using the allocator
- */
-/*
- * XXX: see if we can come up with something a bit better.  Currently
- * you can make a pool an owner, but if the pool doesn't use the allocator
- * the allocator will never be destroyed.
- */
-APR_DECLARE(void) apr_allocator_owner_set(apr_allocator_t *allocator,
-                                          apr_pool_t *pool);
-
-/** @deprecated @see apr_allocator_owner_set */
-APR_DECLARE(void) apr_allocator_set_owner(apr_allocator_t *allocator,
-                                          apr_pool_t *pool);
-
-/**
- * Get the current owner of the allocator
- * @param allocator The allocator to get the owner from
- */
-APR_DECLARE(apr_pool_t *) apr_allocator_owner_get(apr_allocator_t *allocator);
-
-/** @deprecated @see apr_allocator_owner_get */
-APR_DECLARE(apr_pool_t *) apr_allocator_get_owner(
-                                  apr_allocator_t *allocator);
-
-/**
- * Set the current threshold at which the allocator should start
- * giving blocks back to the system.
- * @param allocator The allocator the set the threshold on
- * @param size The threshold.  0 == unlimited.
- */
-APR_DECLARE(void) apr_allocator_max_free_set(apr_allocator_t *allocator,
-                                             apr_size_t size);
-
-/** @deprecated @see apr_allocator_max_free_set */
-APR_DECLARE(void) apr_allocator_set_max_free(apr_allocator_t *allocator,
-                                             apr_size_t size);
-
-#include "apr_thread_mutex.h"
-
-#if APR_HAS_THREADS
-/**
- * Set a mutex for the allocator to use
- * @param allocator The allocator to set the mutex for
- * @param mutex The mutex
- */
-APR_DECLARE(void) apr_allocator_mutex_set(apr_allocator_t *allocator,
-                                          apr_thread_mutex_t *mutex);
-
-/** @deprecated @see apr_allocator_mutex_set */
-APR_DECLARE(void) apr_allocator_set_mutex(apr_allocator_t *allocator,
-                                          apr_thread_mutex_t *mutex);
-
-/**
- * Get the mutex currently set for the allocator
- * @param allocator The allocator
- */
-APR_DECLARE(apr_thread_mutex_t *) apr_allocator_mutex_get(
-                                      apr_allocator_t *allocator);
-
-/** @deprecated @see apr_allocator_mutex_get */
-APR_DECLARE(apr_thread_mutex_t *) apr_allocator_get_mutex(
-                                      apr_allocator_t *allocator);
-
-#endif /* APR_HAS_THREADS */
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !APR_ALLOCATOR_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_atomic.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_atomic.h
deleted file mode 100644
index 87889292..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_atomic.h
+++ /dev/null
@@ -1,314 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_ATOMIC_H
-#define APR_ATOMIC_H
-
-/**
- * @file apr_atomic.h
- * @brief APR Atomic Operations
- */
-
-#include "apr.h"
-#include "apr_pools.h"
-
-/* Platform includes for atomics */
-#if defined(NETWARE) || defined(__MVS__) /* OS/390 */
-#include <stdlib.h>
-#elif defined(__FreeBSD__)
-#include <machine/atomic.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @defgroup apr_atomic Atomic Operations
- * @ingroup APR 
- * @{
- */
-
-/* easiest way to get these documented for the moment */
-#if defined(DOXYGEN)
-/**
- * structure for holding a atomic value.
- * this number >only< has a 24 bit size on some platforms
- */
-typedef apr_atomic_t;
-
-/**
- * this function is required on some platforms to initialize the
- * atomic operation's internal structures
- * @param p pool
- * @return APR_SUCCESS on successful completion
- */
-apr_status_t apr_atomic_init(apr_pool_t *p);
-/**
- * read the value stored in a atomic variable
- * @param mem the pointer
- * @warning on certain platforms this number is not stored
- * directly in the pointer. in others it is 
- */
-apr_uint32_t apr_atomic_read(volatile apr_atomic_t *mem);
-/**
- * set the value for atomic.
- * @param mem the pointer
- * @param val the value
- */
-void apr_atomic_set(volatile apr_atomic_t *mem, apr_uint32_t val);
-/**
- * Add 'val' to the atomic variable
- * @param mem pointer to the atomic value
- * @param val the addition
- */
-void apr_atomic_add(volatile apr_atomic_t *mem, apr_uint32_t val);
-
-/**
- * increment the atomic variable by 1
- * @param mem pointer to the atomic value
- */
-void apr_atomic_inc(volatile apr_atomic_t *mem);
-
-/**
- * decrement the atomic variable by 1
- * @param mem pointer to the atomic value
- * @return zero if the value is zero, otherwise non-zero
- */
-int apr_atomic_dec(volatile apr_atomic_t *mem);
-
-/**
- * compare the atomic's value with cmp.
- * If they are the same swap the value with 'with'
- * @param mem pointer to the atomic value
- * @param with what to swap it with
- * @param cmp the value to compare it to
- * @return the old value of the atomic
- * @warning do not mix apr_atomic's with the CAS function.
- * on some platforms they may be implemented by different mechanisms
- */
-apr_uint32_t apr_atomic_cas(volatile apr_uint32_t *mem, long with, long cmp);
-
-/**
- * compare the pointer's value with cmp.
- * If they are the same swap the value with 'with'
- * @param mem pointer to the pointer
- * @param with what to swap it with
- * @param cmp the value to compare it to
- * @return the old value of the pointer
- */
-void *apr_atomic_casptr(volatile void **mem, void *with, const void *cmp);
-#else /* !DOXYGEN */
-
-/* The following definitions provide optimized, OS-specific
- * implementations of the APR atomic functions on various
- * platforms.  Any atomic operation that isn't redefined as
- * a macro here will be declared as a function later, and
- * apr_atomic.c will provide a mutex-based default implementation.
- */
-
-#if defined(WIN32)
-
-#define apr_atomic_t LONG
-
-#define apr_atomic_add(mem, val)     InterlockedExchangeAdd(mem,val)
-#define apr_atomic_dec(mem)          InterlockedDecrement(mem)
-#define apr_atomic_inc(mem)          InterlockedIncrement(mem)
-#define apr_atomic_set(mem, val)     InterlockedExchange(mem, val)
-#define apr_atomic_read(mem)         (*mem)
-#define apr_atomic_cas(mem,with,cmp) InterlockedCompareExchange(mem,with,cmp)
-#define apr_atomic_init(pool)        APR_SUCCESS
-#define apr_atomic_casptr(mem,with,cmp) InterlockedCompareExchangePointer(mem,with,cmp)
-
-#elif defined(NETWARE)
-
-#define apr_atomic_t unsigned long
-
-#define apr_atomic_add(mem, val)     atomic_add(mem,val)
-#define apr_atomic_inc(mem)          atomic_inc(mem)
-#define apr_atomic_set(mem, val)     (*mem = val)
-#define apr_atomic_read(mem)         (*mem)
-#define apr_atomic_init(pool)        APR_SUCCESS
-#define apr_atomic_cas(mem,with,cmp) atomic_cmpxchg((unsigned long *)(mem),(unsigned long)(cmp),(unsigned long)(with))
-    
-int apr_atomic_dec(apr_atomic_t *mem);
-void *apr_atomic_casptr(void **mem, void *with, const void *cmp);
-#define APR_OVERRIDE_ATOMIC_DEC 1
-#define APR_OVERRIDE_ATOMIC_CASPTR 1
-
-inline int apr_atomic_dec(apr_atomic_t *mem) 
-{
-    return (atomic_xchgadd(mem, 0xFFFFFFFF) - 1);
-}
-
-inline void *apr_atomic_casptr(void **mem, void *with, const void *cmp)
-{
-    return (void*)atomic_cmpxchg((unsigned long *)mem,(unsigned long)cmp,(unsigned long)with);
-}
-
-#elif defined(__FreeBSD__)
-
-#define apr_atomic_t apr_uint32_t
-#define apr_atomic_add(mem, val)     (atomic_add_int(mem,val),mem)
-#define apr_atomic_dec(mem)          (atomic_subtract_int(mem,1),mem)
-#define apr_atomic_inc(mem)          (atomic_add_int(mem,1),mem)
-#define apr_atomic_set(mem, val)     (atomic_set_int(mem, val),mem)
-#define apr_atomic_read(mem)         (*mem)
-
-#elif (defined(__linux__) || defined(__EMX__)) && defined(__i386__) && !APR_FORCE_ATOMIC_GENERIC
-
-#define apr_atomic_t apr_uint32_t
-#define apr_atomic_cas(mem,with,cmp) \
-({ apr_atomic_t prev; \
-    asm volatile ("lock; cmpxchgl %1, %2"              \
-         : "=a" (prev)               \
-         : "r" (with), "m" (*(mem)), "0"(cmp) \
-         : "memory"); \
-    prev;})
-
-#define apr_atomic_add(mem, val)                                \
-({ register apr_atomic_t last;                                  \
-   do {                                                         \
-       last = *(mem);                                           \
-   } while (apr_atomic_cas((mem), last + (val), last) != last); \
-  })
-
-#define apr_atomic_dec(mem)                                     \
-({ register apr_atomic_t last;                                  \
-   do {                                                         \
-       last = *(mem);                                           \
-   } while (apr_atomic_cas((mem), last - 1, last) != last);     \
-  (--last != 0); })
-
-#define apr_atomic_inc(mem)                                     \
-({ register apr_atomic_t last;                                  \
-   do {                                                         \
-       last = *(mem);                                           \
-   } while (apr_atomic_cas((mem), last + 1, last) != last);     \
-  })
-
-#define apr_atomic_set(mem, val)     (*(mem) = val)
-#define apr_atomic_read(mem)        (*(mem))
-#define apr_atomic_init(pool)        APR_SUCCESS
-
-#elif defined(__MVS__) /* OS/390 */
-
-#define apr_atomic_t cs_t
-
-apr_int32_t apr_atomic_add(volatile apr_atomic_t *mem, apr_int32_t val);
-apr_uint32_t apr_atomic_cas(volatile apr_atomic_t *mem, apr_uint32_t swap, 
-                            apr_uint32_t cmp);
-#define APR_OVERRIDE_ATOMIC_ADD 1
-#define APR_OVERRIDE_ATOMIC_CAS 1
-
-#define apr_atomic_inc(mem)          apr_atomic_add(mem, 1)
-#define apr_atomic_dec(mem)          apr_atomic_add(mem, -1)
-#define apr_atomic_init(pool)        APR_SUCCESS
-
-/* warning: the following two operations, _read and _set, are atomic
- * if the memory variables are aligned (the usual case).  
- * 
- * If you try really hard and manage to mis-align them, they are not 
- * guaranteed to be atomic on S/390.  But then your program will blow up 
- * with SIGBUS on a sparc, or with a S0C6 abend if you use the mis-aligned 
- * variables with other apr_atomic_* operations on OS/390.
- */
-
-#define apr_atomic_read(p)           (*p)
-#define apr_atomic_set(mem, val)     (*mem = val)
-
-#endif /* end big if-elseif switch for platform-specifics */
-
-
-/* Default implementation of the atomic API
- * The definitions above may override some or all of the
- * atomic functions with optimized, platform-specific versions.
- * Any operation that hasn't been overridden as a macro above
- * is declared as a function here, unless APR_OVERRIDE_ATOMIC_[OPERATION]
- * is defined.  (The purpose of the APR_OVERRIDE_ATOMIC_* is
- * to allow a platform to declare an apr_atomic_*() function
- * with a different signature than the default.)
- */
-
-#if !defined(apr_atomic_t)
-#define apr_atomic_t apr_uint32_t
-#endif
-
-#if !defined(apr_atomic_init) && !defined(APR_OVERRIDE_ATOMIC_INIT)
-apr_status_t apr_atomic_init(apr_pool_t *p);
-#endif
-
-#if !defined(apr_atomic_read) && !defined(APR_OVERRIDE_ATOMIC_READ)
-#define apr_atomic_read(p)  *p
-#endif
-
-#if !defined(apr_atomic_set) && !defined(APR_OVERRIDE_ATOMIC_SET)
-void apr_atomic_set(volatile apr_atomic_t *mem, apr_uint32_t val);
-#define APR_ATOMIC_NEED_DEFAULT_INIT 1
-#endif
-
-#if !defined(apr_atomic_add) && !defined(APR_OVERRIDE_ATOMIC_ADD)
-void apr_atomic_add(volatile apr_atomic_t *mem, apr_uint32_t val);
-#define APR_ATOMIC_NEED_DEFAULT_INIT 1
-#endif
-
-#if !defined(apr_atomic_inc) && !defined(APR_OVERRIDE_ATOMIC_INC)
-void apr_atomic_inc(volatile apr_atomic_t *mem);
-#define APR_ATOMIC_NEED_DEFAULT_INIT 1
-#endif
-
-#if !defined(apr_atomic_dec) && !defined(APR_OVERRIDE_ATOMIC_DEC)
-int apr_atomic_dec(volatile apr_atomic_t *mem);
-#define APR_ATOMIC_NEED_DEFAULT_INIT 1
-#endif
-
-#if !defined(apr_atomic_cas) && !defined(APR_OVERRIDE_ATOMIC_CAS)
-apr_uint32_t apr_atomic_cas(volatile apr_uint32_t *mem,long with,long cmp);
-#define APR_ATOMIC_NEED_DEFAULT_INIT 1
-#endif
-
-#if !defined(apr_atomic_casptr) && !defined(APR_OVERRIDE_ATOMIC_CASPTR)
-#if APR_SIZEOF_VOIDP == 4
-#define apr_atomic_casptr(mem, with, cmp) (void *)apr_atomic_cas((apr_uint32_t *)(mem), (long)(with), (long)cmp)
-#else
-void *apr_atomic_casptr(volatile void **mem, void *with, const void *cmp);
-#define APR_ATOMIC_NEED_DEFAULT_INIT 1
-#endif
-#endif
-
-#ifndef APR_ATOMIC_NEED_DEFAULT_INIT
-#define APR_ATOMIC_NEED_DEFAULT_INIT 0
-#endif
-
-/* If we're using the default versions of any of the atomic functions,
- * we'll need the atomic init to set up mutexes.  If a platform-specific
- * override above has replaced the atomic_init with a macro, it's an error.
- */
-#if APR_ATOMIC_NEED_DEFAULT_INIT
-#if defined(apr_atomic_init) || defined(APR_OVERRIDE_ATOMIC_INIT)
-#error Platform has redefined apr_atomic_init, but other default default atomics require a default apr_atomic_init
-#endif
-#endif /* APR_ATOMIC_NEED_DEFAULT_INIT */
-
-#endif /* !DOXYGEN */
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* !APR_ATOMIC_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_compat.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_compat.h
deleted file mode 100644
index 45500c0a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_compat.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_COMPAT_H
-#define APR_COMPAT_H
-
- /**
- * @file apr_compat.h
- * @brief APR Legacy Apache 1.3 Compatibility
- * @deprecated These defines are only present for historical purposes
- */
-
-/**
- * @defgroup apr_compat APR Legacy Apache 1.3 Compatibility
- * @ingroup APR 
- * @{
- */
-
-/* redefine 1.3.x symbols to those that now live in libapr */
-
-/** @see APR_INLINE */
-#define ap_inline APR_INLINE
-
-/** @deprecated @see apr_md5_ctx_t */
-#define ap_md5_ctx_t apr_md5_ctx_t
-/** @deprecated @see apr_md5_encode */
-#define ap_MD5Encode apr_md5_encode
-/** @deprecated @see apr_md5_final */
-#define ap_MD5Final apr_md5_final
-/** @deprecated @see apr_md5_init */
-#define ap_MD5Init apr_md5_init
-/** @deprecated @see apr_md5_update */
-#define ap_MD5Update apr_md5_update
-/** @deprecated @see apr_array_append */
-#define ap_append_arrays apr_array_append
-/** @deprecated @see apr_array_cat */
-#define ap_array_cat apr_array_cat
-/** @deprecated @see apr_array_header_t */
-#define ap_array_header_t apr_array_header_t
-/** @deprecated @see apr_array_pstrcat */
-#define ap_array_pstrcat apr_array_pstrcat
-/** @deprecated @see apr_pool_free_blocks_num_bytes */
-#define ap_bytes_in_free_blocks apr_pool_free_blocks_num_bytes
-/** @deprecated @see apr_pool_num_bytes */
-#define ap_bytes_in_pool apr_pool_num_bytes
-/** @deprecated @see apr_check_file_time */
-#define ap_check_file_time apr_check_file_time
-/** @deprecated @see apr_filetype_e */
-#define ap_filetype_e apr_filetype_e
-/** @deprecated @see apr_pool_cleanup_for_exec */
-#define ap_cleanup_for_exec apr_pool_cleanup_for_exec
-/** @deprecated @see apr_pool_clear */
-#define ap_clear_pool apr_pool_clear
-/** @deprecated @see apr_table_clear */
-#define ap_clear_table apr_table_clear
-/** @deprecated @see apr_array_copy */
-#define ap_copy_array apr_array_copy
-/** @deprecated @see apr_array_copy_hdr */
-#define ap_copy_array_hdr apr_array_copy_hdr
-/** @deprecated @see apr_table_copy */
-#define ap_copy_table apr_table_copy
-/** @deprecated @see apr_cpystrn */
-#define ap_cpystrn apr_cpystrn
-/** @deprecated @see apr_day_snames */
-#define ap_day_snames apr_day_snames
-/** @deprecated @see apr_pool_destroy */
-#define ap_destroy_pool apr_pool_destroy
-/** @deprecated @see apr_time_exp_t */
-#define ap_exploded_time_t apr_time_exp_t
-/** @deprecated @see apr_fnmatch */
-#define ap_fnmatch apr_fnmatch
-/** @deprecated @see apr_getopt */
-#define ap_getopt apr_getopt
-/** @deprecated @see apr_inet_addr */
-#define ap_inet_addr apr_inet_addr
-/** @deprecated @see apr_pool_alloc_init */
-#define ap_init_alloc apr_pool_alloc_init
-/** @deprecated @see apr_is_empty_table */
-#define ap_is_empty_table apr_is_empty_table
-/** @deprecated @see apr_fnmatch_test */
-#define ap_is_fnmatch apr_fnmatch_test
-/** @deprecated @see apr_pool_cleanup_kill */
-#define ap_kill_cleanup apr_pool_cleanup_kill
-/** @deprecated @see apr_array_make */
-#define ap_make_array apr_array_make
-/** @deprecated @see apr_pool_sub_make */
-#define ap_make_sub_pool apr_pool_sub_make
-/** @deprecated @see apr_table_make */
-#define ap_make_table apr_table_make
-/** @deprecated @see apr_month_snames */
-#define ap_month_snames apr_month_snames
-/** @deprecated @see apr_pool_note_subprocess*/
-#define ap_note_subprocess apr_pool_note_subprocess
-/** @deprecated @see apr_pool_cleanup_null */
-#define ap_null_cleanup apr_pool_cleanup_null
-/** @deprecated @see apr_filepath_merge */
-#define ap_os_canonical_filename apr_filepath_merge
-/** @deprecated @see apr_filepath_merge */
-#define ap_os_case_canonical_filename apr_filepath_merge
-/** @deprecated @see apr_dso_load */
-#define ap_os_dso_load apr_dso_load
-/** @deprecated @see apr_dso_unload */
-#define ap_os_dso_unload apr_dso_unload
-/** @deprecated @see apr_dso_sym */
-#define ap_os_dso_sym apr_dso_sym
-/** @deprecated @see apr_dso_error */
-#define ap_os_dso_error apr_dso_error
-/** @deprecated @see apr_filepath_merge
- *  @warning apr_filepath_merge rejects invalid filenames */
-#define ap_os_is_filename_valid apr_filepath_merge
-/** @deprecated @see apr_proc_kill */
-#define ap_os_kill apr_proc_kill
-/** @deprecated @see apr_filepath_merge */
-#define ap_os_systemcase_canonical_filename apr_filepath_merge
-/** @deprecated @see apr_table_overlap */
-#define ap_overlap_tables apr_table_overlap
-/** @deprecated @see apr_table_overlay */
-#define ap_overlay_tables apr_table_overlay
-/** @deprecated @see apr_palloc */
-#define ap_palloc apr_palloc
-/** @deprecated @see apr_pcalloc */
-#define ap_pcalloc apr_pcalloc
-/** @deprecated @see apr_pool_join */
-#define ap_pool_join apr_pool_join
-/** @deprecated @see apr_psprintf */
-#define ap_psprintf apr_psprintf
-/** @deprecated @see apr_pstrcat */
-#define ap_pstrcat apr_pstrcat
-/** @deprecated @see apr_pstrdup */
-#define ap_pstrdup apr_pstrdup
-/** @deprecated @see apr_pstrndup */
-#define ap_pstrndup apr_pstrndup
-/** @deprecated @see apr_array_push */
-#define ap_push_array apr_array_push
-/** @deprecated @see apr_pvsprintf */
-#define ap_pvsprintf apr_pvsprintf
-/** @deprecated @see apr_pool_cleanup_register */
-#define ap_register_cleanup apr_pool_cleanup_register
-/** @deprecated @see apr_proc_other_child_register */
-#define ap_register_other_child apr_proc_other_child_register
-/** @deprecated @see apr_pool_cleanup_run */
-#define ap_run_cleanup apr_pool_cleanup_run
-/** @deprecated @see apr_signal */
-#define ap_signal apr_signal
-/** @deprecated @see apr_snprintf */
-#define ap_snprintf apr_snprintf
-/** @deprecated @see apr_table_add */
-#define ap_table_add apr_table_add
-/** @deprecated @see apr_table_addn */
-#define ap_table_addn apr_table_addn
-/** @deprecated @see apr_table_do */
-#define ap_table_do apr_table_do
-/** @deprecated @see apr_table_elts */
-#define ap_table_elts apr_table_elts
-/** @deprecated @see apr_table_get */
-#define ap_table_get apr_table_get
-/** @deprecated @see apr_table_merge */
-#define ap_table_merge apr_table_merge
-/** @deprecated @see apr_table_mergen */
-#define ap_table_mergen apr_table_mergen
-/** @deprecated @see apr_table_set */
-#define ap_table_set apr_table_set
-/** @deprecated @see apr_table_setn */
-#define ap_table_setn apr_table_setn
-/** @deprecated @see apr_table_unset */
-#define ap_table_unset apr_table_unset
-/** @deprecated @see apr_proc_other_child_unregister */
-#define ap_unregister_other_child apr_proc_other_child_unregister
-/** @deprecated @see apr_password_validate */
-#define ap_validate_password apr_password_validate
-/** @deprecated @see apr_vformatter */
-#define ap_vformatter apr_vformatter
-/** @deprecated @see apr_vsnprintf */
-#define ap_vsnprintf apr_vsnprintf
-/** @deprecated @see apr_wait_t */
-#define ap_wait_t apr_wait_t
-
-/** @deprecated @see apr_isalnum */
-#define ap_isalnum apr_isalnum
-/** @deprecated @see apr_isalpha*/
-#define ap_isalpha apr_isalpha
-/** @deprecated @see apr_iscntrl */
-#define ap_iscntrl apr_iscntrl
-/** @deprecated @see apr_isdigit */
-#define ap_isdigit apr_isdigit
-/** @deprecated @see apr_isgraph */
-#define ap_isgraph apr_isgraph
-/** @deprecated @see apr_islower */
-#define ap_islower apr_islower
-/** @deprecated @see apr_isascii */
-#define ap_isascii apr_isascii
-/** @deprecated @see apr_isprint */
-#define ap_isprint apr_isprint
-/** @deprecated @see apr_ispunct */
-#define ap_ispunct apr_ispunct
-/** @deprecated @see apr_isspace */
-#define ap_isspace apr_isspace
-/** @deprecated @see apr_isupper */
-#define ap_isupper apr_isupper
-/** @deprecated @see apr_isxdigit */
-#define ap_isxdigit apr_isxdigit
-/** @deprecated @see apr_tolower */
-#define ap_tolower apr_tolower
-/** @deprecated @see apr_toupper */
-#define ap_toupper apr_toupper
-
-/** @deprecated @see APR_USEC_PER_SEC */
-#define AP_USEC_PER_SEC APR_USEC_PER_SEC
-/** @deprecated @see APR_RFC822_DATE_LEN */
-#define AP_RFC822_DATE_LEN APR_RFC822_DATE_LEN
-/** @deprecated @see APR_OVERLAP_TABLES_MERGE */
-#define AP_OVERLAP_TABLES_MERGE APR_OVERLAP_TABLES_MERGE
-/** @deprecated @see APR_OVERLAP_TABLES_SET */
-#define AP_OVERLAP_TABLES_SET APR_OVERLAP_TABLES_SET
-
-/** @} */
-
-#endif /* APR_COMPAT_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_dso.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_dso.h
deleted file mode 100644
index ac701cfd..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_dso.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_DSO_DOT_H
-#define APR_DSO_DOT_H
-
-/**
- * @file apr_dso.h
- * @brief APR Dynamic Object Handling Routines
- */
-
-#include "apr.h"
-#include "apr_pools.h"
-#include "apr_errno.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @defgroup apr_dso Dynamic Object Handling
- * @ingroup APR 
- * @{
- */
-
-#if APR_HAS_DSO || defined(DOXYGEN)
-
-/**
- * Structure for referencing dynamic objects
- */
-typedef struct apr_dso_handle_t       apr_dso_handle_t;
-
-/**
- * Structure for referencing symbols from dynamic objects
- */
-typedef void *                        apr_dso_handle_sym_t;
-
-/**
- * Load a DSO library.
- * @param res_handle Location to store new handle for the DSO.
- * @param path Path to the DSO library
- * @param ctx Pool to use.
- * @bug We aught to provide an alternative to RTLD_GLOBAL, which
- * is the only supported method of loading DSOs today.
- */
-APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, 
-                                       const char *path, apr_pool_t *ctx);
-
-/**
- * Close a DSO library.
- * @param handle handle to close.
- */
-APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle);
-
-/**
- * Load a symbol from a DSO handle.
- * @param ressym Location to store the loaded symbol
- * @param handle handle to load the symbol from.
- * @param symname Name of the symbol to load.
- */
-APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym, 
-                                      apr_dso_handle_t *handle,
-                                      const char *symname);
-
-/**
- * Report more information when a DSO function fails.
- * @param dso The dso handle that has been opened
- * @param buf Location to store the dso error
- * @param bufsize The size of the provided buffer
- */
-APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *dso, char *buf, apr_size_t bufsize);
-
-#endif /* APR_HAS_DSO */
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_env.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_env.h
deleted file mode 100644
index 05419c37..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_env.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_ENV_H
-#define APR_ENV_H
-/**
- * @file apr_env.h
- * @brief APR Environment functions
- */
-#include "apr_errno.h"
-#include "apr_pools.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup apr_env Functions for manupulating the environment
- * @ingroup APR 
- * @{
- */
-
-/**
- * Get the value of an environment variable
- * @param value the returned value, allocated from @a pool
- * @param envvar the name of the environment variable
- * @param pool where to allocate @a value and any temporary storage from
- */
-APR_DECLARE(apr_status_t) apr_env_get(char **value, const char *envvar,
-                                      apr_pool_t *pool);
-
-/**
- * Set the value of an environment variable
- * @param envvar the name of the environment variable
- * @param value the value to set
- * @param pool where to allocate temporary storage from
- */
-APR_DECLARE(apr_status_t) apr_env_set(const char *envvar, const char *value,
-                                      apr_pool_t *pool);
-
-/**
- * Delete a variable from the environment
- * @param envvar the name of the environment variable
- * @param pool where to allocate temporary storage from
- */
-APR_DECLARE(apr_status_t) apr_env_delete(const char *envvar, apr_pool_t *pool);
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ! APR_ENV_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_errno.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_errno.h
deleted file mode 100644
index 9d1d8447..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_errno.h
+++ /dev/null
@@ -1,1219 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_ERRNO_H
-#define APR_ERRNO_H
-
-/**
- * @file apr_errno.h
- * @brief APR Error Codes
- */
-
-#include "apr.h"
-
-#if APR_HAVE_ERRNO_H
-#include <errno.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup apr_errno Error Codes
- * @ingroup APR 
- * @{
- */
-
-/**
- * Type for specifying an error or status code.
- */
-typedef int apr_status_t;
-
-/**
- * Return a human readable string describing the specified error.
- * @param statcode The error code the get a string for.
- * @param buf A buffer to hold the error string.
- * @param bufsize Size of the buffer to hold the string.
- */
-APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf, 
-                                 apr_size_t bufsize);
-
-#if defined(DOXYGEN)
-/**
- * @def APR_FROM_OS_ERROR(os_err_type syserr)
- * Fold a platform specific error into an apr_status_t code.
- * @return apr_status_t
- * @param e The platform os error code.
- * @warning  macro implementation; the syserr argument may be evaluated
- *      multiple times.
- */
-#define APR_FROM_OS_ERROR(e) (e == 0 ? APR_SUCCESS : e + APR_OS_START_SYSERR)
-
-/**
- * @def APR_TO_OS_ERROR(apr_status_t statcode)
- * @return os_err_type
- * Fold an apr_status_t code back to the native platform defined error.
- * @param e The apr_status_t folded platform os error code.
- * @warning  macro implementation; the statcode argument may be evaluated
- *      multiple times.  If the statcode was not created by apr_get_os_error 
- *      or APR_FROM_OS_ERROR, the results are undefined.
- */
-#define APR_TO_OS_ERROR(e) (e == 0 ? APR_SUCCESS : e - APR_OS_START_SYSERR)
-
-/** @def apr_get_os_error()
- * @return apr_status_t the last platform error, folded into apr_status_t, on most platforms
- * @remark This retrieves errno, or calls a GetLastError() style function, and
- *      folds it with APR_FROM_OS_ERROR.  Some platforms (such as OS2) have no
- *      such mechanism, so this call may be unsupported.  Do NOT use this
- *      call for socket errors from socket, send, recv etc!
- */
-
-/** @def apr_set_os_error(e)
- * Reset the last platform error, unfolded from an apr_status_t, on some platforms
- * @param e The OS error folded in a prior call to APR_FROM_OS_ERROR()
- * @warning This is a macro implementation; the statcode argument may be evaluated
- *      multiple times.  If the statcode was not created by apr_get_os_error
- *      or APR_FROM_OS_ERROR, the results are undefined.  This macro sets
- *      errno, or calls a SetLastError() style function, unfolding statcode
- *      with APR_TO_OS_ERROR.  Some platforms (such as OS2) have no such
- *      mechanism, so this call may be unsupported.
- */
-
-/** @def apr_get_netos_error()
- * Return the last socket error, folded into apr_status_t, on all platforms
- * @remark This retrieves errno or calls a GetLastSocketError() style function,
- *      and folds it with APR_FROM_OS_ERROR.
- */
-
-/** @def apr_set_netos_error(e)
- * Reset the last socket error, unfolded from an apr_status_t
- * @param e The socket error folded in a prior call to APR_FROM_OS_ERROR()
- * @warning This is a macro implementation; the statcode argument may be evaluated
- *      multiple times.  If the statcode was not created by apr_get_os_error
- *      or APR_FROM_OS_ERROR, the results are undefined.  This macro sets
- *      errno, or calls a WSASetLastError() style function, unfolding 
- *      socketcode with APR_TO_OS_ERROR.
- */
-
-#endif /* defined(DOXYGEN) */
-
-/**
- * APR_OS_START_ERROR is where the APR specific error values start.
- */
-#define APR_OS_START_ERROR     20000
-/**
- * APR_OS_ERRSPACE_SIZE is the maximum number of errors you can fit
- *    into one of the error/status ranges below -- except for
- *    APR_OS_START_USERERR, which see.
- */
-#define APR_OS_ERRSPACE_SIZE 50000
-/**
- * APR_OS_START_STATUS is where the APR specific status codes start.
- */
-#define APR_OS_START_STATUS    (APR_OS_START_ERROR + APR_OS_ERRSPACE_SIZE)
-/**
- * APR_OS_START_USERERR are reserved for applications that use APR that
- *     layer their own error codes along with APR's.  Note that the
- *     error immediately following this one is set ten times farther
- *     away than usual, so that users of apr have a lot of room in
- *     which to declare custom error codes.
- */
-#define APR_OS_START_USERERR    (APR_OS_START_STATUS + APR_OS_ERRSPACE_SIZE)
-/**
- * APR_OS_START_USEERR is obsolete, defined for compatibility only.
- * Use APR_OS_START_USERERR instead.
- */
-#define APR_OS_START_USEERR     APR_OS_START_USERERR
-/**
- * APR_OS_START_CANONERR is where APR versions of errno values are defined
- *     on systems which don't have the corresponding errno.
- */
-#define APR_OS_START_CANONERR  (APR_OS_START_USERERR \
-                                 + (APR_OS_ERRSPACE_SIZE * 10))
-/**
- * APR_OS_START_EAIERR folds EAI_ error codes from getaddrinfo() into 
- *     apr_status_t values.
- */
-#define APR_OS_START_EAIERR    (APR_OS_START_CANONERR + APR_OS_ERRSPACE_SIZE)
-/**
- * APR_OS_START_SYSERR folds platform-specific system error values into 
- *     apr_status_t values.
- */
-#define APR_OS_START_SYSERR    (APR_OS_START_EAIERR + APR_OS_ERRSPACE_SIZE)
-
-/** no error. @see APR_STATUS_IS_SUCCESS */
-#define APR_SUCCESS 0
-
-/** 
- * @defgroup APR_Error APR Error Values
- * <PRE>
- * <b>APR ERROR VALUES</b>
- * APR_ENOSTAT      APR was unable to perform a stat on the file 
- * APR_ENOPOOL      APR was not provided a pool with which to allocate memory
- * APR_EBADDATE     APR was given an invalid date 
- * APR_EINVALSOCK   APR was given an invalid socket
- * APR_ENOPROC      APR was not given a process structure
- * APR_ENOTIME      APR was not given a time structure
- * APR_ENODIR       APR was not given a directory structure
- * APR_ENOLOCK      APR was not given a lock structure
- * APR_ENOPOLL      APR was not given a poll structure
- * APR_ENOSOCKET    APR was not given a socket
- * APR_ENOTHREAD    APR was not given a thread structure
- * APR_ENOTHDKEY    APR was not given a thread key structure
- * APR_ENOSHMAVAIL  There is no more shared memory available
- * APR_EDSOOPEN     APR was unable to open the dso object.  For more 
- *                  information call apr_dso_error().
- * APR_EGENERAL     General failure (specific information not available)
- * APR_EBADIP       The specified IP address is invalid
- * APR_EBADMASK     The specified netmask is invalid
- * APR_ESYMNOTFOUND Could not find the requested symbol
- * </PRE>
- *
- * <PRE>
- * <b>APR STATUS VALUES</b>
- * APR_INCHILD        Program is currently executing in the child
- * APR_INPARENT       Program is currently executing in the parent
- * APR_DETACH         The thread is detached
- * APR_NOTDETACH      The thread is not detached
- * APR_CHILD_DONE     The child has finished executing
- * APR_CHILD_NOTDONE  The child has not finished executing
- * APR_TIMEUP         The operation did not finish before the timeout
- * APR_INCOMPLETE     The operation was incomplete although some processing
- *                    was performed and the results are partially valid
- * APR_BADCH          Getopt found an option not in the option string
- * APR_BADARG         Getopt found an option that is missing an argument 
- *                    and an argument was specified in the option string
- * APR_EOF            APR has encountered the end of the file
- * APR_NOTFOUND       APR was unable to find the socket in the poll structure
- * APR_ANONYMOUS      APR is using anonymous shared memory
- * APR_FILEBASED      APR is using a file name as the key to the shared memory
- * APR_KEYBASED       APR is using a shared key as the key to the shared memory
- * APR_EINIT          Ininitalizer value.  If no option has been found, but 
- *                    the status variable requires a value, this should be used
- * APR_ENOTIMPL       The APR function has not been implemented on this 
- *                    platform, either because nobody has gotten to it yet, 
- *                    or the function is impossible on this platform.
- * APR_EMISMATCH      Two passwords do not match.
- * APR_EABSOLUTE      The given path was absolute.
- * APR_ERELATIVE      The given path was relative.
- * APR_EINCOMPLETE    The given path was neither relative nor absolute.
- * APR_EABOVEROOT     The given path was above the root path.
- * APR_EBUSY          The given lock was busy.
- * APR_EPROC_UNKNOWN  The given process wasn't recognized by APR
- * </PRE>
- * @{
- */
-/** @see APR_STATUS_IS_ENOSTAT */
-#define APR_ENOSTAT        (APR_OS_START_ERROR + 1)
-/** @see APR_STATUS_IS_ENOPOOL */
-#define APR_ENOPOOL        (APR_OS_START_ERROR + 2)
-/* empty slot: +3 */
-/** @see APR_STATUS_IS_EBADDATE */
-#define APR_EBADDATE       (APR_OS_START_ERROR + 4)
-/** @see APR_STATUS_IS_EINVALSOCK */
-#define APR_EINVALSOCK     (APR_OS_START_ERROR + 5)
-/** @see APR_STATUS_IS_ENOPROC */
-#define APR_ENOPROC        (APR_OS_START_ERROR + 6)
-/** @see APR_STATUS_IS_ENOTIME */
-#define APR_ENOTIME        (APR_OS_START_ERROR + 7)
-/** @see APR_STATUS_IS_ENODIR */
-#define APR_ENODIR         (APR_OS_START_ERROR + 8)
-/** @see APR_STATUS_IS_ENOLOCK */
-#define APR_ENOLOCK        (APR_OS_START_ERROR + 9)
-/** @see APR_STATUS_IS_ENOPOLL */
-#define APR_ENOPOLL        (APR_OS_START_ERROR + 10)
-/** @see APR_STATUS_IS_ENOSOCKET */
-#define APR_ENOSOCKET      (APR_OS_START_ERROR + 11)
-/** @see APR_STATUS_IS_ENOTHREAD */
-#define APR_ENOTHREAD      (APR_OS_START_ERROR + 12)
-/** @see APR_STATUS_IS_ENOTHDKEY */
-#define APR_ENOTHDKEY      (APR_OS_START_ERROR + 13)
-/** @see APR_STATUS_IS_EGENERAL */
-#define APR_EGENERAL       (APR_OS_START_ERROR + 14)
-/** @see APR_STATUS_IS_ENOSHMAVAIL */
-#define APR_ENOSHMAVAIL    (APR_OS_START_ERROR + 15)
-/** @see APR_STATUS_IS_EBADIP */
-#define APR_EBADIP         (APR_OS_START_ERROR + 16)
-/** @see APR_STATUS_IS_EBADMASK */
-#define APR_EBADMASK       (APR_OS_START_ERROR + 17)
-/* empty slot: +18 */
-/** @see APR_STATUS_IS_EDSOPEN */
-#define APR_EDSOOPEN       (APR_OS_START_ERROR + 19)
-/** @see APR_STATUS_IS_EABSOLUTE */
-#define APR_EABSOLUTE      (APR_OS_START_ERROR + 20)
-/** @see APR_STATUS_IS_ERELATIVE */
-#define APR_ERELATIVE      (APR_OS_START_ERROR + 21)
-/** @see APR_STATUS_IS_EINCOMPLETE */
-#define APR_EINCOMPLETE    (APR_OS_START_ERROR + 22)
-/** @see APR_STATUS_IS_EABOVEROOT */
-#define APR_EABOVEROOT     (APR_OS_START_ERROR + 23)
-/** @see APR_STATUS_IS_EBADPATH */
-#define APR_EBADPATH       (APR_OS_START_ERROR + 24)
-/** @see APR_STATUS_IS_EPATHWILD */
-#define APR_EPATHWILD      (APR_OS_START_ERROR + 25)
-/** @see APR_STATUS_IS_ESYMNOTFOUND */
-#define APR_ESYMNOTFOUND   (APR_OS_START_ERROR + 26)
-/** @see APR_STATUS_IS_EPROC_UNKNOWN */
-#define APR_EPROC_UNKNOWN  (APR_OS_START_ERROR + 27)
-/** @} */
-
-/** 
- * @defgroup APR_STATUS_IS Status Value Tests
- * @warning For any particular error condition, more than one of these tests
- *      may match. This is because platform-specific error codes may not
- *      always match the semantics of the POSIX codes these tests (and the
- *      correcponding APR error codes) are named after. A notable example
- *      are the APR_STATUS_IS_ENOENT and APR_STATUS_IS_ENOTDIR tests on
- *      Win32 platforms. The programmer should always be aware of this and
- *      adjust the order of the tests accordingly.
- * @{
- */
-/** 
- * APR was unable to perform a stat on the file 
- * @warning always use this test, as platform-specific variances may meet this
- * more than one error code 
- */
-#define APR_STATUS_IS_ENOSTAT(s)        ((s) == APR_ENOSTAT)
-/** 
- * APR was not provided a pool with which to allocate memory 
- * @warning always use this test, as platform-specific variances may meet this
- * more than one error code 
- */
-#define APR_STATUS_IS_ENOPOOL(s)        ((s) == APR_ENOPOOL)
-/** APR was given an invalid date  */
-#define APR_STATUS_IS_EBADDATE(s)       ((s) == APR_EBADDATE)
-/** APR was given an invalid socket */
-#define APR_STATUS_IS_EINVALSOCK(s)     ((s) == APR_EINVALSOCK)
-/** APR was not given a process structure */
-#define APR_STATUS_IS_ENOPROC(s)        ((s) == APR_ENOPROC)
-/** APR was not given a time structure */
-#define APR_STATUS_IS_ENOTIME(s)        ((s) == APR_ENOTIME)
-/** APR was not given a directory structure */
-#define APR_STATUS_IS_ENODIR(s)         ((s) == APR_ENODIR)
-/** APR was not given a lock structure */
-#define APR_STATUS_IS_ENOLOCK(s)        ((s) == APR_ENOLOCK)
-/** APR was not given a poll structure */
-#define APR_STATUS_IS_ENOPOLL(s)        ((s) == APR_ENOPOLL)
-/** APR was not given a socket */
-#define APR_STATUS_IS_ENOSOCKET(s)      ((s) == APR_ENOSOCKET)
-/** APR was not given a thread structure */
-#define APR_STATUS_IS_ENOTHREAD(s)      ((s) == APR_ENOTHREAD)
-/** APR was not given a thread key structure */
-#define APR_STATUS_IS_ENOTHDKEY(s)      ((s) == APR_ENOTHDKEY)
-/** Generic Error which can not be put into another spot */
-#define APR_STATUS_IS_EGENERAL(s)       ((s) == APR_EGENERAL)
-/** There is no more shared memory available */
-#define APR_STATUS_IS_ENOSHMAVAIL(s)    ((s) == APR_ENOSHMAVAIL)
-/** The specified IP address is invalid */
-#define APR_STATUS_IS_EBADIP(s)         ((s) == APR_EBADIP)
-/** The specified netmask is invalid */
-#define APR_STATUS_IS_EBADMASK(s)       ((s) == APR_EBADMASK)
-/* empty slot: +18 */
-/** 
- * APR was unable to open the dso object.  
- * For more information call apr_dso_error().
- */
-#if defined(WIN32)
-#define APR_STATUS_IS_EDSOOPEN(s)       ((s) == APR_EDSOOPEN \
-                       || APR_TO_OS_ERROR(s) == ERROR_MOD_NOT_FOUND)
-#else
-#define APR_STATUS_IS_EDSOOPEN(s)       ((s) == APR_EDSOOPEN)
-#endif
-/** The given path was absolute. */
-#define APR_STATUS_IS_EABSOLUTE(s)      ((s) == APR_EABSOLUTE)
-/** The given path was relative. */
-#define APR_STATUS_IS_ERELATIVE(s)      ((s) == APR_ERELATIVE)
-/** The given path was neither relative nor absolute. */
-#define APR_STATUS_IS_EINCOMPLETE(s)    ((s) == APR_EINCOMPLETE)
-/** The given path was above the root path. */
-#define APR_STATUS_IS_EABOVEROOT(s)     ((s) == APR_EABOVEROOT)
-/** The given path was bad. */
-#define APR_STATUS_IS_EBADPATH(s)       ((s) == APR_EBADPATH)
-/** The given path contained wildcards. */
-#define APR_STATUS_IS_EPATHWILD(s)      ((s) == APR_EPATHWILD)
-/** Could not find the requested symbol.
- * For more information call apr_dso_error().
- */
-#if defined(WIN32)
-#define APR_STATUS_IS_ESYMNOTFOUND(s)   ((s) == APR_ESYMNOTFOUND \
-                       || APR_TO_OS_ERROR(s) == ERROR_PROC_NOT_FOUND)
-#else
-#define APR_STATUS_IS_ESYMNOTFOUND(s)   ((s) == APR_ESYMNOTFOUND)
-#endif
-/** The given process was not recognized by APR. */
-#define APR_STATUS_IS_EPROC_UNKNOWN(s)  ((s) == APR_EPROC_UNKNOWN)
-
-/** @} */
-
-/** 
- * @addtogroup APR_Error
- * @{
- */
-/** @see APR_STATUS_IS_INCHILD */
-#define APR_INCHILD        (APR_OS_START_STATUS + 1)
-/** @see APR_STATUS_IS_INPARENT */
-#define APR_INPARENT       (APR_OS_START_STATUS + 2)
-/** @see APR_STATUS_IS_DETACH */
-#define APR_DETACH         (APR_OS_START_STATUS + 3)
-/** @see APR_STATUS_IS_NOTDETACH */
-#define APR_NOTDETACH      (APR_OS_START_STATUS + 4)
-/** @see APR_STATUS_IS_CHILD_DONE */
-#define APR_CHILD_DONE     (APR_OS_START_STATUS + 5)
-/** @see APR_STATUS_IS_CHILD_NOTDONE */
-#define APR_CHILD_NOTDONE  (APR_OS_START_STATUS + 6)
-/** @see APR_STATUS_IS_TIMEUP */
-#define APR_TIMEUP         (APR_OS_START_STATUS + 7)
-/** @see APR_STATUS_IS_INCOMPLETE */
-#define APR_INCOMPLETE     (APR_OS_START_STATUS + 8)
-/* empty slot: +9 */
-/* empty slot: +10 */
-/* empty slot: +11 */
-/** @see APR_STATUS_IS_BADCH */
-#define APR_BADCH          (APR_OS_START_STATUS + 12)
-/** @see APR_STATUS_IS_BADARG */
-#define APR_BADARG         (APR_OS_START_STATUS + 13)
-/** @see APR_STATUS_IS_EOF */
-#define APR_EOF            (APR_OS_START_STATUS + 14)
-/** @see APR_STATUS_IS_NOTFOUND */
-#define APR_NOTFOUND       (APR_OS_START_STATUS + 15)
-/* empty slot: +16 */
-/* empty slot: +17 */
-/* empty slot: +18 */
-/** @see APR_STATUS_IS_ANONYMOUS */
-#define APR_ANONYMOUS      (APR_OS_START_STATUS + 19)
-/** @see APR_STATUS_IS_FILEBASED */
-#define APR_FILEBASED      (APR_OS_START_STATUS + 20)
-/** @see APR_STATUS_IS_KEYBASED */
-#define APR_KEYBASED       (APR_OS_START_STATUS + 21)
-/** @see APR_STATUS_IS_EINIT */
-#define APR_EINIT          (APR_OS_START_STATUS + 22)  
-/** @see APR_STATUS_IS_ENOTIMPL */
-#define APR_ENOTIMPL       (APR_OS_START_STATUS + 23)
-/** @see APR_STATUS_IS_EMISMATCH */
-#define APR_EMISMATCH      (APR_OS_START_STATUS + 24)
-/** @see APR_STATUS_IS_EBUSY */
-#define APR_EBUSY          (APR_OS_START_STATUS + 25)
-/** @} */
-
-/** 
- * @addtogroup APR_STATUS_IS
- * @{
- */
-/** 
- * Program is currently executing in the child 
- * @warning
- * always use this test, as platform-specific variances may meet this
- * more than one error code */
-#define APR_STATUS_IS_INCHILD(s)        ((s) == APR_INCHILD)
-/** 
- * Program is currently executing in the parent 
- * @warning
- * always use this test, as platform-specific variances may meet this
- * more than one error code 
- */
-#define APR_STATUS_IS_INPARENT(s)       ((s) == APR_INPARENT)
-/** 
- * The thread is detached 
- * @warning
- * always use this test, as platform-specific variances may meet this
- * more than one error code 
- */
-#define APR_STATUS_IS_DETACH(s)         ((s) == APR_DETACH)
-/** 
- * The thread is not detached 
- * @warning
- * always use this test, as platform-specific variances may meet this
- * more than one error code 
- */
-#define APR_STATUS_IS_NOTDETACH(s)      ((s) == APR_NOTDETACH)
-/** 
- * The child has finished executing
- * @warning
- * always use this test, as platform-specific variances may meet this
- * more than one error code 
- */
-#define APR_STATUS_IS_CHILD_DONE(s)     ((s) == APR_CHILD_DONE)
-/** 
- * The child has not finished executing
- * @warning
- * always use this test, as platform-specific variances may meet this
- * more than one error code 
- */
-#define APR_STATUS_IS_CHILD_NOTDONE(s)  ((s) == APR_CHILD_NOTDONE)
-/** 
- * The operation did not finish before the timeout
- * @warning
- * always use this test, as platform-specific variances may meet this
- * more than one error code 
- */
-#define APR_STATUS_IS_TIMEUP(s)         ((s) == APR_TIMEUP)
-/** 
- * The operation was incomplete although some processing was performed
- * and the results are partially valid.
- * @warning
- * always use this test, as platform-specific variances may meet this
- * more than one error code 
- */
-#define APR_STATUS_IS_INCOMPLETE(s)     ((s) == APR_INCOMPLETE)
-/* empty slot: +9 */
-/* empty slot: +10 */
-/* empty slot: +11 */
-/** 
- * Getopt found an option not in the option string
- * @warning
- * always use this test, as platform-specific variances may meet this
- * more than one error code 
- */
-#define APR_STATUS_IS_BADCH(s)          ((s) == APR_BADCH)
-/** 
- * Getopt found an option not in the option string and an argument was 
- * specified in the option string
- * @warning
- * always use this test, as platform-specific variances may meet this
- * more than one error code 
- */
-#define APR_STATUS_IS_BADARG(s)         ((s) == APR_BADARG)
-/** 
- * APR has encountered the end of the file
- * @warning
- * always use this test, as platform-specific variances may meet this
- * more than one error code 
- */
-#define APR_STATUS_IS_EOF(s)            ((s) == APR_EOF)
-/** 
- * APR was unable to find the socket in the poll structure
- * @warning
- * always use this test, as platform-specific variances may meet this
- * more than one error code 
- */
-#define APR_STATUS_IS_NOTFOUND(s)       ((s) == APR_NOTFOUND)
-/* empty slot: +16 */
-/* empty slot: +17 */
-/* empty slot: +18 */
-/** 
- * APR is using anonymous shared memory
- * @warning
- * always use this test, as platform-specific variances may meet this
- * more than one error code 
- */
-#define APR_STATUS_IS_ANONYMOUS(s)      ((s) == APR_ANONYMOUS)
-/** 
- * APR is using a file name as the key to the shared memory
- * @warning
- * always use this test, as platform-specific variances may meet this
- * more than one error code 
- */
-#define APR_STATUS_IS_FILEBASED(s)      ((s) == APR_FILEBASED)
-/** 
- * APR is using a shared key as the key to the shared memory
- * @warning
- * always use this test, as platform-specific variances may meet this
- * more than one error code 
- */
-#define APR_STATUS_IS_KEYBASED(s)       ((s) == APR_KEYBASED)
-/** 
- * Ininitalizer value.  If no option has been found, but 
- * the status variable requires a value, this should be used
- * @warning
- * always use this test, as platform-specific variances may meet this
- * more than one error code 
- */
-#define APR_STATUS_IS_EINIT(s)          ((s) == APR_EINIT)
-/** 
- * The APR function has not been implemented on this 
- * platform, either because nobody has gotten to it yet, 
- * or the function is impossible on this platform.
- * @warning
- * always use this test, as platform-specific variances may meet this
- * more than one error code 
- */
-#define APR_STATUS_IS_ENOTIMPL(s)       ((s) == APR_ENOTIMPL)
-/** 
- * Two passwords do not match.
- * @warning
- * always use this test, as platform-specific variances may meet this
- * more than one error code 
- */
-#define APR_STATUS_IS_EMISMATCH(s)      ((s) == APR_EMISMATCH)
-/** 
- * The given lock was busy
- * @warning always use this test, as platform-specific variances may meet this
- * more than one error code 
- */
-#define APR_STATUS_IS_EBUSY(s)          ((s) == APR_EBUSY)
-
-/** @} */
-
-/** 
- * @addtogroup APR_Error APR Error Values
- * @{
- */
-/* APR CANONICAL ERROR VALUES */
-/** @see APR_STATUS_IS_EACCES */
-#ifdef EACCES
-#define APR_EACCES EACCES
-#else
-#define APR_EACCES         (APR_OS_START_CANONERR + 1)
-#endif
-
-/** @see APR_STATUS_IS_EXIST */
-#ifdef EEXIST
-#define APR_EEXIST EEXIST
-#else
-#define APR_EEXIST         (APR_OS_START_CANONERR + 2)
-#endif
-
-/** @see APR_STATUS_IS_ENAMETOOLONG */
-#ifdef ENAMETOOLONG
-#define APR_ENAMETOOLONG ENAMETOOLONG
-#else
-#define APR_ENAMETOOLONG   (APR_OS_START_CANONERR + 3)
-#endif
-
-/** @see APR_STATUS_IS_ENOENT */
-#ifdef ENOENT
-#define APR_ENOENT ENOENT
-#else
-#define APR_ENOENT         (APR_OS_START_CANONERR + 4)
-#endif
-
-/** @see APR_STATUS_IS_ENOTDIR */
-#ifdef ENOTDIR
-#define APR_ENOTDIR ENOTDIR
-#else
-#define APR_ENOTDIR        (APR_OS_START_CANONERR + 5)
-#endif
-
-/** @see APR_STATUS_IS_ENOSPC */
-#ifdef ENOSPC
-#define APR_ENOSPC ENOSPC
-#else
-#define APR_ENOSPC         (APR_OS_START_CANONERR + 6)
-#endif
-
-/** @see APR_STATUS_IS_ENOMEM */
-#ifdef ENOMEM
-#define APR_ENOMEM ENOMEM
-#else
-#define APR_ENOMEM         (APR_OS_START_CANONERR + 7)
-#endif
-
-/** @see APR_STATUS_IS_EMFILE */
-#ifdef EMFILE
-#define APR_EMFILE EMFILE
-#else
-#define APR_EMFILE         (APR_OS_START_CANONERR + 8)
-#endif
-
-/** @see APR_STATUS_IS_ENFILE */
-#ifdef ENFILE
-#define APR_ENFILE ENFILE
-#else
-#define APR_ENFILE         (APR_OS_START_CANONERR + 9)
-#endif
-
-/** @see APR_STATUS_IS_EBADF */
-#ifdef EBADF
-#define APR_EBADF EBADF
-#else
-#define APR_EBADF          (APR_OS_START_CANONERR + 10)
-#endif
-
-/** @see APR_STATUS_IS_EINVAL */
-#ifdef EINVAL
-#define APR_EINVAL EINVAL
-#else
-#define APR_EINVAL         (APR_OS_START_CANONERR + 11)
-#endif
-
-/** @see APR_STATUS_IS_ESPIPE */
-#ifdef ESPIPE
-#define APR_ESPIPE ESPIPE
-#else
-#define APR_ESPIPE         (APR_OS_START_CANONERR + 12)
-#endif
-
-/** 
- * @see APR_STATUS_IS_EAGAIN 
- * @warning use APR_STATUS_IS_EAGAIN instead of just testing this value
- */
-#ifdef EAGAIN
-#define APR_EAGAIN EAGAIN
-#elif defined(EWOULDBLOCK)
-#define APR_EAGAIN EWOULDBLOCK
-#else
-#define APR_EAGAIN         (APR_OS_START_CANONERR + 13)
-#endif
-
-/** @see APR_STATUS_IS_EINTR */
-#ifdef EINTR
-#define APR_EINTR EINTR
-#else
-#define APR_EINTR          (APR_OS_START_CANONERR + 14)
-#endif
-
-/** @see APR_STATUS_IS_ENOTSOCK */
-#ifdef ENOTSOCK
-#define APR_ENOTSOCK ENOTSOCK
-#else
-#define APR_ENOTSOCK       (APR_OS_START_CANONERR + 15)
-#endif
-
-/** @see APR_STATUS_IS_ECONNREFUSED */
-#ifdef ECONNREFUSED
-#define APR_ECONNREFUSED ECONNREFUSED
-#else
-#define APR_ECONNREFUSED   (APR_OS_START_CANONERR + 16)
-#endif
-
-/** @see APR_STATUS_IS_EINPROGRESS */
-#ifdef EINPROGRESS
-#define APR_EINPROGRESS EINPROGRESS
-#else
-#define APR_EINPROGRESS    (APR_OS_START_CANONERR + 17)
-#endif
-
-/** 
- * @see APR_STATUS_IS_ECONNABORTED
- * @warning use APR_STATUS_IS_ECONNABORTED instead of just testing this value
- */
-
-#ifdef ECONNABORTED
-#define APR_ECONNABORTED ECONNABORTED
-#else
-#define APR_ECONNABORTED   (APR_OS_START_CANONERR + 18)
-#endif
-
-/** @see APR_STATUS_IS_ECONNRESET */
-#ifdef ECONNRESET
-#define APR_ECONNRESET ECONNRESET
-#else
-#define APR_ECONNRESET     (APR_OS_START_CANONERR + 19)
-#endif
-
-/** @see APR_STATUS_IS_ETIMEDOUT */
-#ifdef ETIMEDOUT
-#define APR_ETIMEDOUT ETIMEDOUT
-#else
-#define APR_ETIMEDOUT      (APR_OS_START_CANONERR + 20)
-#endif
-
-/** @see APR_STATUS_IS_EHOSTUNREACH */
-#ifdef EHOSTUNREACH
-#define APR_EHOSTUNREACH EHOSTUNREACH
-#else
-#define APR_EHOSTUNREACH   (APR_OS_START_CANONERR + 21)
-#endif
-
-/** @see APR_STATUS_IS_ENETUNREACH */
-#ifdef ENETUNREACH
-#define APR_ENETUNREACH ENETUNREACH
-#else
-#define APR_ENETUNREACH    (APR_OS_START_CANONERR + 22)
-#endif
-
-/** @see APR_STATUS_IS_EFTYPE */
-#ifdef EFTYPE
-#define APR_EFTYPE EFTYPE
-#else
-#define APR_EFTYPE        (APR_OS_START_CANONERR + 23)
-#endif
-
-/** @see APR_STATUS_IS_EPIPE */
-#ifdef EPIPE
-#define APR_EPIPE EPIPE
-#else
-#define APR_EPIPE         (APR_OS_START_CANONERR + 24)
-#endif
-
-/** @see APR_STATUS_IS_EXDEV */
-#ifdef EXDEV
-#define APR_EXDEV EXDEV
-#else
-#define APR_EXDEV         (APR_OS_START_CANONERR + 25)
-#endif
-
-/** @see APR_STATUS_IS_ENOTEMPTY */
-#ifdef ENOTEMPTY
-#define APR_ENOTEMPTY ENOTEMPTY
-#else
-#define APR_ENOTEMPTY     (APR_OS_START_CANONERR + 26)
-#endif
-
-/** @} */
-
-#if defined(OS2) && !defined(DOXYGEN)
-
-#define APR_FROM_OS_ERROR(e) (e == 0 ? APR_SUCCESS : e + APR_OS_START_SYSERR)
-#define APR_TO_OS_ERROR(e)   (e == 0 ? APR_SUCCESS : e - APR_OS_START_SYSERR)
-
-#define INCL_DOSERRORS
-#define INCL_DOS
-
-/* Leave these undefined.
- * OS2 doesn't rely on the errno concept.
- * The API calls always return a result codes which
- * should be filtered through APR_FROM_OS_ERROR().
- *
- * #define apr_get_os_error()   (APR_FROM_OS_ERROR(GetLastError()))
- * #define apr_set_os_error(e)  (SetLastError(APR_TO_OS_ERROR(e)))
- */
-
-/* A special case, only socket calls require this;
- */
-#define apr_get_netos_error()   (APR_FROM_OS_ERROR(errno))
-#define apr_set_netos_error(e)  (errno = APR_TO_OS_ERROR(e))
-
-/* And this needs to be greped away for good:
- */
-#define APR_OS2_STATUS(e) (APR_FROM_OS_ERROR(e))
-
-#define APR_STATUS_IS_SUCCESS(s)           ((s) == APR_SUCCESS \
-                || (s) == APR_OS_START_SYSERR + NO_ERROR)
-
-/* These can't sit in a private header, so in spite of the extra size, 
- * they need to be made available here.
- */
-#define SOCBASEERR              10000
-#define SOCEPERM                (SOCBASEERR+1)             /* Not owner */
-#define SOCESRCH                (SOCBASEERR+3)             /* No such process */
-#define SOCEINTR                (SOCBASEERR+4)             /* Interrupted system call */
-#define SOCENXIO                (SOCBASEERR+6)             /* No such device or address */
-#define SOCEBADF                (SOCBASEERR+9)             /* Bad file number */
-#define SOCEACCES               (SOCBASEERR+13)            /* Permission denied */
-#define SOCEFAULT               (SOCBASEERR+14)            /* Bad address */
-#define SOCEINVAL               (SOCBASEERR+22)            /* Invalid argument */
-#define SOCEMFILE               (SOCBASEERR+24)            /* Too many open files */
-#define SOCEPIPE                (SOCBASEERR+32)            /* Broken pipe */
-#define SOCEOS2ERR              (SOCBASEERR+100)           /* OS/2 Error */
-#define SOCEWOULDBLOCK          (SOCBASEERR+35)            /* Operation would block */
-#define SOCEINPROGRESS          (SOCBASEERR+36)            /* Operation now in progress */
-#define SOCEALREADY             (SOCBASEERR+37)            /* Operation already in progress */
-#define SOCENOTSOCK             (SOCBASEERR+38)            /* Socket operation on non-socket */
-#define SOCEDESTADDRREQ         (SOCBASEERR+39)            /* Destination address required */
-#define SOCEMSGSIZE             (SOCBASEERR+40)            /* Message too long */
-#define SOCEPROTOTYPE           (SOCBASEERR+41)            /* Protocol wrong type for socket */
-#define SOCENOPROTOOPT          (SOCBASEERR+42)            /* Protocol not available */
-#define SOCEPROTONOSUPPORT      (SOCBASEERR+43)            /* Protocol not supported */
-#define SOCESOCKTNOSUPPORT      (SOCBASEERR+44)            /* Socket type not supported */
-#define SOCEOPNOTSUPP           (SOCBASEERR+45)            /* Operation not supported on socket */
-#define SOCEPFNOSUPPORT         (SOCBASEERR+46)            /* Protocol family not supported */
-#define SOCEAFNOSUPPORT         (SOCBASEERR+47)            /* Address family not supported by protocol family */
-#define SOCEADDRINUSE           (SOCBASEERR+48)            /* Address already in use */
-#define SOCEADDRNOTAVAIL        (SOCBASEERR+49)            /* Can't assign requested address */
-#define SOCENETDOWN             (SOCBASEERR+50)            /* Network is down */
-#define SOCENETUNREACH          (SOCBASEERR+51)            /* Network is unreachable */
-#define SOCENETRESET            (SOCBASEERR+52)            /* Network dropped connection on reset */
-#define SOCECONNABORTED         (SOCBASEERR+53)            /* Software caused connection abort */
-#define SOCECONNRESET           (SOCBASEERR+54)            /* Connection reset by peer */
-#define SOCENOBUFS              (SOCBASEERR+55)            /* No buffer space available */
-#define SOCEISCONN              (SOCBASEERR+56)            /* Socket is already connected */
-#define SOCENOTCONN             (SOCBASEERR+57)            /* Socket is not connected */
-#define SOCESHUTDOWN            (SOCBASEERR+58)            /* Can't send after socket shutdown */
-#define SOCETOOMANYREFS         (SOCBASEERR+59)            /* Too many references: can't splice */
-#define SOCETIMEDOUT            (SOCBASEERR+60)            /* Connection timed out */
-#define SOCECONNREFUSED         (SOCBASEERR+61)            /* Connection refused */
-#define SOCELOOP                (SOCBASEERR+62)            /* Too many levels of symbolic links */
-#define SOCENAMETOOLONG         (SOCBASEERR+63)            /* File name too long */
-#define SOCEHOSTDOWN            (SOCBASEERR+64)            /* Host is down */
-#define SOCEHOSTUNREACH         (SOCBASEERR+65)            /* No route to host */
-#define SOCENOTEMPTY            (SOCBASEERR+66)            /* Directory not empty */
-
-/* APR CANONICAL ERROR TESTS */
-#define APR_STATUS_IS_EACCES(s)         ((s) == APR_EACCES \
-                || (s) == APR_OS_START_SYSERR + ERROR_ACCESS_DENIED \
-                || (s) == APR_OS_START_SYSERR + ERROR_SHARING_VIOLATION)
-#define APR_STATUS_IS_EEXIST(s)         ((s) == APR_EEXIST \
-                || (s) == APR_OS_START_SYSERR + ERROR_OPEN_FAILED \
-                || (s) == APR_OS_START_SYSERR + ERROR_FILE_EXISTS \
-                || (s) == APR_OS_START_SYSERR + ERROR_ALREADY_EXISTS \
-                || (s) == APR_OS_START_SYSERR + ERROR_ACCESS_DENIED)
-#define APR_STATUS_IS_ENAMETOOLONG(s)   ((s) == APR_ENAMETOOLONG \
-                || (s) == APR_OS_START_SYSERR + ERROR_FILENAME_EXCED_RANGE \
-                || (s) == APR_OS_START_SYSERR + SOCENAMETOOLONG)
-#define APR_STATUS_IS_ENOENT(s)         ((s) == APR_ENOENT \
-                || (s) == APR_OS_START_SYSERR + ERROR_FILE_NOT_FOUND \
-                || (s) == APR_OS_START_SYSERR + ERROR_PATH_NOT_FOUND \
-                || (s) == APR_OS_START_SYSERR + ERROR_NO_MORE_FILES \
-                || (s) == APR_OS_START_SYSERR + ERROR_OPEN_FAILED)
-#define APR_STATUS_IS_ENOTDIR(s)        ((s) == APR_ENOTDIR)
-#define APR_STATUS_IS_ENOSPC(s)         ((s) == APR_ENOSPC \
-                || (s) == APR_OS_START_SYSERR + ERROR_DISK_FULL)
-#define APR_STATUS_IS_ENOMEM(s)         ((s) == APR_ENOMEM)
-#define APR_STATUS_IS_EMFILE(s)         ((s) == APR_EMFILE \
-                || (s) == APR_OS_START_SYSERR + ERROR_TOO_MANY_OPEN_FILES)
-#define APR_STATUS_IS_ENFILE(s)         ((s) == APR_ENFILE)
-#define APR_STATUS_IS_EBADF(s)          ((s) == APR_EBADF \
-                || (s) == APR_OS_START_SYSERR + ERROR_INVALID_HANDLE)
-#define APR_STATUS_IS_EINVAL(s)         ((s) == APR_EINVAL \
-                || (s) == APR_OS_START_SYSERR + ERROR_INVALID_PARAMETER \
-                || (s) == APR_OS_START_SYSERR + ERROR_INVALID_FUNCTION)
-#define APR_STATUS_IS_ESPIPE(s)         ((s) == APR_ESPIPE \
-                || (s) == APR_OS_START_SYSERR + ERROR_NEGATIVE_SEEK)
-#define APR_STATUS_IS_EAGAIN(s)         ((s) == APR_EAGAIN \
-                || (s) == APR_OS_START_SYSERR + ERROR_NO_DATA \
-                || (s) == APR_OS_START_SYSERR + SOCEWOULDBLOCK \
-                || (s) == APR_OS_START_SYSERR + ERROR_LOCK_VIOLATION)
-#define APR_STATUS_IS_EINTR(s)          ((s) == APR_EINTR \
-                || (s) == APR_OS_START_SYSERR + SOCEINTR)
-#define APR_STATUS_IS_ENOTSOCK(s)       ((s) == APR_ENOTSOCK \
-                || (s) == APR_OS_START_SYSERR + SOCENOTSOCK)
-#define APR_STATUS_IS_ECONNREFUSED(s)   ((s) == APR_ECONNREFUSED \
-                || (s) == APR_OS_START_SYSERR + SOCECONNREFUSED)
-#define APR_STATUS_IS_EINPROGRESS(s)    ((s) == APR_EINPROGRESS \
-                || (s) == APR_OS_START_SYSERR + SOCEINPROGRESS)
-#define APR_STATUS_IS_ECONNABORTED(s)   ((s) == APR_ECONNABORTED \
-                || (s) == APR_OS_START_SYSERR + SOCECONNABORTED)
-#define APR_STATUS_IS_ECONNRESET(s)     ((s) == APR_ECONNRESET \
-                || (s) == APR_OS_START_SYSERR + SOCECONNRESET)
-#define APR_STATUS_IS_ETIMEDOUT(s)      ((s) == APR_ETIMEDOUT \
-                || (s) == APR_OS_START_SYSERR + SOCETIMEDOUT)    
-#define APR_STATUS_IS_EHOSTUNREACH(s)   ((s) == APR_EHOSTUNREACH \
-                || (s) == APR_OS_START_SYSERR + SOCEHOSTUNREACH)
-#define APR_STATUS_IS_ENETUNREACH(s)    ((s) == APR_ENETUNREACH \
-                || (s) == APR_OS_START_SYSERR + SOCENETUNREACH)
-#define APR_STATUS_IS_EFTYPE(s)         ((s) == APR_EFTYPE)
-#define APR_STATUS_IS_EPIPE(s)          ((s) == APR_EPIPE \
-                || (s) == APR_OS_START_SYSERR + ERROR_BROKEN_PIPE \
-                || (s) == APR_OS_START_SYSERR + SOCEPIPE)
-#define APR_STATUS_IS_EXDEV(s)          ((s) == APR_EXDEV \
-                || (s) == APR_OS_START_SYSERR + ERROR_NOT_SAME_DEVICE)
-#define APR_STATUS_IS_ENOTEMPTY(s)      ((s) == APR_ENOTEMPTY \
-                || (s) == APR_OS_START_SYSERR + ERROR_DIR_NOT_EMPTY \
-                || (s) == APR_OS_START_SYSERR + ERROR_ACCESS_DENIED)
-
-/*
-    Sorry, too tired to wrap this up for OS2... feel free to
-    fit the following into their best matches.
-
-    { ERROR_NO_SIGNAL_SENT,     ESRCH           },
-    { SOCEALREADY,              EALREADY        },
-    { SOCEDESTADDRREQ,          EDESTADDRREQ    },
-    { SOCEMSGSIZE,              EMSGSIZE        },
-    { SOCEPROTOTYPE,            EPROTOTYPE      },
-    { SOCENOPROTOOPT,           ENOPROTOOPT     },
-    { SOCEPROTONOSUPPORT,       EPROTONOSUPPORT },
-    { SOCESOCKTNOSUPPORT,       ESOCKTNOSUPPORT },
-    { SOCEOPNOTSUPP,            EOPNOTSUPP      },
-    { SOCEPFNOSUPPORT,          EPFNOSUPPORT    },
-    { SOCEAFNOSUPPORT,          EAFNOSUPPORT    },
-    { SOCEADDRINUSE,            EADDRINUSE      },
-    { SOCEADDRNOTAVAIL,         EADDRNOTAVAIL   },
-    { SOCENETDOWN,              ENETDOWN        },
-    { SOCENETRESET,             ENETRESET       },
-    { SOCENOBUFS,               ENOBUFS         },
-    { SOCEISCONN,               EISCONN         },
-    { SOCENOTCONN,              ENOTCONN        },
-    { SOCESHUTDOWN,             ESHUTDOWN       },
-    { SOCETOOMANYREFS,          ETOOMANYREFS    },
-    { SOCELOOP,                 ELOOP           },
-    { SOCEHOSTDOWN,             EHOSTDOWN       },
-    { SOCENOTEMPTY,             ENOTEMPTY       },
-    { SOCEPIPE,                 EPIPE           }
-*/
-
-#elif defined(WIN32) && !defined(DOXYGEN) /* !defined(OS2) */
-
-#define APR_FROM_OS_ERROR(e) (e == 0 ? APR_SUCCESS : e + APR_OS_START_SYSERR)
-#define APR_TO_OS_ERROR(e)   (e == 0 ? APR_SUCCESS : e - APR_OS_START_SYSERR)
-
-#define apr_get_os_error()   (APR_FROM_OS_ERROR(GetLastError()))
-#define apr_set_os_error(e)  (SetLastError(APR_TO_OS_ERROR(e)))
-
-/* A special case, only socket calls require this:
- */
-#define apr_get_netos_error()   (APR_FROM_OS_ERROR(WSAGetLastError()))
-#define apr_set_netos_error(e)   (WSASetLastError(APR_TO_OS_ERROR(e)))
-
-#define APR_STATUS_IS_SUCCESS(s)           ((s) == APR_SUCCESS \
-                || (s) == APR_OS_START_SYSERR + ERROR_SUCCESS)
-
-/* APR CANONICAL ERROR TESTS */
-#define APR_STATUS_IS_EACCES(s)         ((s) == APR_EACCES \
-                || (s) == APR_OS_START_SYSERR + ERROR_ACCESS_DENIED \
-                || (s) == APR_OS_START_SYSERR + ERROR_CANNOT_MAKE \
-                || (s) == APR_OS_START_SYSERR + ERROR_CURRENT_DIRECTORY \
-                || (s) == APR_OS_START_SYSERR + ERROR_DRIVE_LOCKED \
-                || (s) == APR_OS_START_SYSERR + ERROR_FAIL_I24 \
-                || (s) == APR_OS_START_SYSERR + ERROR_LOCK_VIOLATION \
-                || (s) == APR_OS_START_SYSERR + ERROR_LOCK_FAILED \
-                || (s) == APR_OS_START_SYSERR + ERROR_NOT_LOCKED \
-                || (s) == APR_OS_START_SYSERR + ERROR_NETWORK_ACCESS_DENIED \
-                || (s) == APR_OS_START_SYSERR + ERROR_SHARING_VIOLATION)
-#define APR_STATUS_IS_EEXIST(s)         ((s) == APR_EEXIST \
-                || (s) == APR_OS_START_SYSERR + ERROR_FILE_EXISTS \
-                || (s) == APR_OS_START_SYSERR + ERROR_ALREADY_EXISTS)
-#define APR_STATUS_IS_ENAMETOOLONG(s)   ((s) == APR_ENAMETOOLONG \
-                || (s) == APR_OS_START_SYSERR + ERROR_FILENAME_EXCED_RANGE \
-                || (s) == APR_OS_START_SYSERR + WSAENAMETOOLONG)
-#define APR_STATUS_IS_ENOENT(s)         ((s) == APR_ENOENT \
-                || (s) == APR_OS_START_SYSERR + ERROR_FILE_NOT_FOUND \
-                || (s) == APR_OS_START_SYSERR + ERROR_PATH_NOT_FOUND \
-                || (s) == APR_OS_START_SYSERR + ERROR_OPEN_FAILED \
-                || (s) == APR_OS_START_SYSERR + ERROR_NO_MORE_FILES)
-#define APR_STATUS_IS_ENOTDIR(s)        ((s) == APR_ENOTDIR \
-                || (s) == APR_OS_START_SYSERR + ERROR_PATH_NOT_FOUND \
-                || (s) == APR_OS_START_SYSERR + ERROR_BAD_NETPATH \
-                || (s) == APR_OS_START_SYSERR + ERROR_BAD_NET_NAME \
-                || (s) == APR_OS_START_SYSERR + ERROR_BAD_PATHNAME \
-                || (s) == APR_OS_START_SYSERR + ERROR_INVALID_DRIVE)
-#define APR_STATUS_IS_ENOSPC(s)         ((s) == APR_ENOSPC \
-                || (s) == APR_OS_START_SYSERR + ERROR_DISK_FULL)
-#define APR_STATUS_IS_ENOMEM(s)         ((s) == APR_ENOMEM \
-                || (s) == APR_OS_START_SYSERR + ERROR_ARENA_TRASHED \
-                || (s) == APR_OS_START_SYSERR + ERROR_NOT_ENOUGH_MEMORY \
-                || (s) == APR_OS_START_SYSERR + ERROR_INVALID_BLOCK \
-                || (s) == APR_OS_START_SYSERR + ERROR_NOT_ENOUGH_QUOTA \
-                || (s) == APR_OS_START_SYSERR + ERROR_OUTOFMEMORY)
-#define APR_STATUS_IS_EMFILE(s)         ((s) == APR_EMFILE \
-                || (s) == APR_OS_START_SYSERR + ERROR_TOO_MANY_OPEN_FILES)
-#define APR_STATUS_IS_ENFILE(s)         ((s) == APR_ENFILE)
-#define APR_STATUS_IS_EBADF(s)          ((s) == APR_EBADF \
-                || (s) == APR_OS_START_SYSERR + ERROR_INVALID_HANDLE \
-                || (s) == APR_OS_START_SYSERR + ERROR_INVALID_TARGET_HANDLE)
-#define APR_STATUS_IS_EINVAL(s)         ((s) == APR_EINVAL \
-                || (s) == APR_OS_START_SYSERR + ERROR_INVALID_ACCESS \
-                || (s) == APR_OS_START_SYSERR + ERROR_INVALID_DATA \
-                || (s) == APR_OS_START_SYSERR + ERROR_INVALID_FUNCTION \
-                || (s) == APR_OS_START_SYSERR + ERROR_INVALID_HANDLE \
-                || (s) == APR_OS_START_SYSERR + ERROR_INVALID_PARAMETER \
-                || (s) == APR_OS_START_SYSERR + ERROR_NEGATIVE_SEEK)
-#define APR_STATUS_IS_ESPIPE(s)         ((s) == APR_ESPIPE \
-                || (s) == APR_OS_START_SYSERR + ERROR_SEEK_ON_DEVICE \
-                || (s) == APR_OS_START_SYSERR + ERROR_NEGATIVE_SEEK)
-#define APR_STATUS_IS_EAGAIN(s)         ((s) == APR_EAGAIN \
-                || (s) == APR_OS_START_SYSERR + ERROR_NO_DATA \
-                || (s) == APR_OS_START_SYSERR + ERROR_NO_PROC_SLOTS \
-                || (s) == APR_OS_START_SYSERR + ERROR_NESTING_NOT_ALLOWED \
-                || (s) == APR_OS_START_SYSERR + ERROR_MAX_THRDS_REACHED \
-                || (s) == APR_OS_START_SYSERR + ERROR_LOCK_VIOLATION \
-                || (s) == APR_OS_START_SYSERR + WSAEWOULDBLOCK)
-#define APR_STATUS_IS_EINTR(s)          ((s) == APR_EINTR \
-                || (s) == APR_OS_START_SYSERR + WSAEINTR)
-#define APR_STATUS_IS_ENOTSOCK(s)       ((s) == APR_ENOTSOCK \
-                || (s) == APR_OS_START_SYSERR + WSAENOTSOCK)
-#define APR_STATUS_IS_ECONNREFUSED(s)   ((s) == APR_ECONNREFUSED \
-                || (s) == APR_OS_START_SYSERR + WSAECONNREFUSED)
-#define APR_STATUS_IS_EINPROGRESS(s)    ((s) == APR_EINPROGRESS \
-                || (s) == APR_OS_START_SYSERR + WSAEINPROGRESS)
-#define APR_STATUS_IS_ECONNABORTED(s)   ((s) == APR_ECONNABORTED \
-                || (s) == APR_OS_START_SYSERR + WSAECONNABORTED)
-#define APR_STATUS_IS_ECONNRESET(s)     ((s) == APR_ECONNRESET \
-                || (s) == APR_OS_START_SYSERR + ERROR_NETNAME_DELETED \
-                || (s) == APR_OS_START_SYSERR + WSAECONNRESET)
-#define APR_STATUS_IS_ETIMEDOUT(s)      ((s) == APR_ETIMEDOUT \
-                || (s) == APR_OS_START_SYSERR + WSAETIMEDOUT \
-                || (s) == APR_OS_START_SYSERR + WAIT_TIMEOUT)
-#define APR_STATUS_IS_EHOSTUNREACH(s)   ((s) == APR_EHOSTUNREACH \
-                || (s) == APR_OS_START_SYSERR + WSAEHOSTUNREACH)
-#define APR_STATUS_IS_ENETUNREACH(s)    ((s) == APR_ENETUNREACH \
-                || (s) == APR_OS_START_SYSERR + WSAENETUNREACH)
-#define APR_STATUS_IS_EFTYPE(s)         ((s) == APR_EFTYPE \
-                || (s) == APR_OS_START_SYSERR + ERROR_EXE_MACHINE_TYPE_MISMATCH \
-                || (s) == APR_OS_START_SYSERR + ERROR_INVALID_DLL \
-                || (s) == APR_OS_START_SYSERR + ERROR_INVALID_MODULETYPE \
-                || (s) == APR_OS_START_SYSERR + ERROR_BAD_EXE_FORMAT \
-                || (s) == APR_OS_START_SYSERR + ERROR_INVALID_EXE_SIGNATURE \
-                || (s) == APR_OS_START_SYSERR + ERROR_FILE_CORRUPT \
-                || (s) == APR_OS_START_SYSERR + ERROR_BAD_FORMAT)
-#define APR_STATUS_IS_EPIPE(s)          ((s) == APR_EPIPE \
-                || (s) == APR_OS_START_SYSERR + ERROR_BROKEN_PIPE)
-#define APR_STATUS_IS_EXDEV(s)          ((s) == APR_EXDEV \
-                || (s) == APR_OS_START_SYSERR + ERROR_NOT_SAME_DEVICE)
-#define APR_STATUS_IS_ENOTEMPTY(s)      ((s) == APR_ENOTEMPTY \
-                || (s) == APR_OS_START_SYSERR + ERROR_DIR_NOT_EMPTY)
-
-#elif defined(NETWARE) && !defined(DOXYGEN) /* !defined(OS2) && !defined(WIN32) */
-
-#define APR_FROM_OS_ERROR(e) (e == 0 ? APR_SUCCESS : e + APR_OS_START_SYSERR)
-#define APR_TO_OS_ERROR(e)   (e == 0 ? APR_SUCCESS : e - APR_OS_START_SYSERR)
-
-#define apr_get_os_error()    (errno)
-#define apr_set_os_error(e)   (errno = (e))
-
-/* A special case, only socket calls require this: */
-#define apr_get_netos_error()   (APR_FROM_OS_ERROR(WSAGetLastError()))
-#define apr_set_netos_error(e)  (WSASetLastError(APR_TO_OS_ERROR(e)))
-
-#define APR_STATUS_IS_SUCCESS(s)           ((s) == APR_SUCCESS)
-
-/* APR CANONICAL ERROR TESTS */
-#define APR_STATUS_IS_EACCES(s)         ((s) == APR_EACCES)
-#define APR_STATUS_IS_EEXIST(s)         ((s) == APR_EEXIST)
-#define APR_STATUS_IS_ENAMETOOLONG(s)   ((s) == APR_ENAMETOOLONG)
-#define APR_STATUS_IS_ENOENT(s)         ((s) == APR_ENOENT)
-#define APR_STATUS_IS_ENOTDIR(s)        ((s) == APR_ENOTDIR)
-#define APR_STATUS_IS_ENOSPC(s)         ((s) == APR_ENOSPC)
-#define APR_STATUS_IS_ENOMEM(s)         ((s) == APR_ENOMEM)
-#define APR_STATUS_IS_EMFILE(s)         ((s) == APR_EMFILE)
-#define APR_STATUS_IS_ENFILE(s)         ((s) == APR_ENFILE)
-#define APR_STATUS_IS_EBADF(s)          ((s) == APR_EBADF)
-#define APR_STATUS_IS_EINVAL(s)         ((s) == APR_EINVAL)
-#define APR_STATUS_IS_ESPIPE(s)         ((s) == APR_ESPIPE)
-
-#define APR_STATUS_IS_EAGAIN(s)         ((s) == APR_EAGAIN \
-                || (s) ==                       EWOULDBLOCK \
-                || (s) == APR_OS_START_SYSERR + WSAEWOULDBLOCK)
-#define APR_STATUS_IS_EINTR(s)          ((s) == APR_EINTR \
-                || (s) == APR_OS_START_SYSERR + WSAEINTR)
-#define APR_STATUS_IS_ENOTSOCK(s)       ((s) == APR_ENOTSOCK \
-                || (s) == APR_OS_START_SYSERR + WSAENOTSOCK)
-#define APR_STATUS_IS_ECONNREFUSED(s)   ((s) == APR_ECONNREFUSED \
-                || (s) == APR_OS_START_SYSERR + WSAECONNREFUSED)
-#define APR_STATUS_IS_EINPROGRESS(s)    ((s) == APR_EINPROGRESS \
-                || (s) == APR_OS_START_SYSERR + WSAEINPROGRESS)
-#define APR_STATUS_IS_ECONNABORTED(s)   ((s) == APR_ECONNABORTED \
-                || (s) == APR_OS_START_SYSERR + WSAECONNABORTED)
-#define APR_STATUS_IS_ECONNRESET(s)     ((s) == APR_ECONNRESET \
-                || (s) == APR_OS_START_SYSERR + WSAECONNRESET)
-#define APR_STATUS_IS_ETIMEDOUT(s)      ((s) == APR_ETIMEDOUT \
-                || (s) == APR_OS_START_SYSERR + WSAETIMEDOUT \
-                || (s) == APR_OS_START_SYSERR + WAIT_TIMEOUT)
-#define APR_STATUS_IS_EHOSTUNREACH(s)   ((s) == APR_EHOSTUNREACH \
-                || (s) == APR_OS_START_SYSERR + WSAEHOSTUNREACH)
-#define APR_STATUS_IS_ENETUNREACH(s)    ((s) == APR_ENETUNREACH \
-                || (s) == APR_OS_START_SYSERR + WSAENETUNREACH)
-#define APR_STATUS_IS_ENETDOWN(s)       ((s) == APR_OS_START_SYSERR + WSAENETDOWN)
-#define APR_STATUS_IS_EFTYPE(s)         ((s) == APR_EFTYPE)
-#define APR_STATUS_IS_EPIPE(s)          ((s) == APR_EPIPE)
-#define APR_STATUS_IS_EXDEV(s)          ((s) == APR_EXDEV)
-#define APR_STATUS_IS_ENOTEMPTY(s)      ((s) == APR_ENOTEMPTY)
-
-#else /* !defined(NETWARE) && !defined(OS2) && !defined(WIN32) */
-
-/*
- *  os error codes are clib error codes
- */
-#define APR_FROM_OS_ERROR(e)  (e)
-#define APR_TO_OS_ERROR(e)    (e)
-
-#define apr_get_os_error()    (errno)
-#define apr_set_os_error(e)   (errno = (e))
-
-/* A special case, only socket calls require this:
- */
-#define apr_get_netos_error() (errno)
-#define apr_set_netos_error(e) (errno = (e))
-/** @} */
-
-/** 
- * @addtogroup APR_STATUS_IS
- * @{
- */
-/** no error */
-#define APR_STATUS_IS_SUCCESS(s)        ((s) == APR_SUCCESS)
-
-/** permission denied */
-#define APR_STATUS_IS_EACCES(s)         ((s) == APR_EACCES)
-/** file exists */
-#define APR_STATUS_IS_EEXIST(s)         ((s) == APR_EEXIST)
-/** path name is too long */
-#define APR_STATUS_IS_ENAMETOOLONG(s)   ((s) == APR_ENAMETOOLONG)
-/**
- * no such file or directory
- * @remark
- * EMVSCATLG can be returned by the automounter on z/OS for
- * paths which do not exist.
- */
-#ifdef EMVSCATLG
-#define APR_STATUS_IS_ENOENT(s)         ((s) == APR_ENOENT \
-                                      || (s) == EMVSCATLG)
-#else
-#define APR_STATUS_IS_ENOENT(s)         ((s) == APR_ENOENT)
-#endif
-/** not a directory */
-#define APR_STATUS_IS_ENOTDIR(s)        ((s) == APR_ENOTDIR)
-/** no space left on device */
-#define APR_STATUS_IS_ENOSPC(s)         ((s) == APR_ENOSPC)
-/** not enough memory */
-#define APR_STATUS_IS_ENOMEM(s)         ((s) == APR_ENOMEM)
-/** too many open files */
-#define APR_STATUS_IS_EMFILE(s)         ((s) == APR_EMFILE)
-/** file table overflow */
-#define APR_STATUS_IS_ENFILE(s)         ((s) == APR_ENFILE)
-/** bad file # */
-#define APR_STATUS_IS_EBADF(s)          ((s) == APR_EBADF)
-/** invalid argument */
-#define APR_STATUS_IS_EINVAL(s)         ((s) == APR_EINVAL)
-/** illegal seek */
-#define APR_STATUS_IS_ESPIPE(s)         ((s) == APR_ESPIPE)
-
-/** operation would block */
-#if !defined(EWOULDBLOCK) || !defined(EAGAIN)
-#define APR_STATUS_IS_EAGAIN(s)         ((s) == APR_EAGAIN)
-#elif (EWOULDBLOCK == EAGAIN)
-#define APR_STATUS_IS_EAGAIN(s)         ((s) == APR_EAGAIN)
-#else
-#define APR_STATUS_IS_EAGAIN(s)         ((s) == APR_EAGAIN \
-                                      || (s) == EWOULDBLOCK)
-#endif
-
-/** interrupted system call */
-#define APR_STATUS_IS_EINTR(s)          ((s) == APR_EINTR)
-/** socket operation on a non-socket */
-#define APR_STATUS_IS_ENOTSOCK(s)       ((s) == APR_ENOTSOCK)
-/** Connection Refused */
-#define APR_STATUS_IS_ECONNREFUSED(s)   ((s) == APR_ECONNREFUSED)
-/** operation now in progress */
-#define APR_STATUS_IS_EINPROGRESS(s)    ((s) == APR_EINPROGRESS)
-
-/** 
- * Software caused connection abort 
- * @remark
- * EPROTO on certain older kernels really means ECONNABORTED, so we need to 
- * ignore it for them.  See discussion in new-httpd archives nh.9701 & nh.9603
- *
- * There is potentially a bug in Solaris 2.x x<6, and other boxes that 
- * implement tcp sockets in userland (i.e. on top of STREAMS).  On these
- * systems, EPROTO can actually result in a fatal loop.  See PR#981 for 
- * example.  It's hard to handle both uses of EPROTO.
- */
-#ifdef EPROTO
-#define APR_STATUS_IS_ECONNABORTED(s)    ((s) == APR_ECONNABORTED \
-                                       || (s) == EPROTO)
-#else
-#define APR_STATUS_IS_ECONNABORTED(s)    ((s) == APR_ECONNABORTED)
-#endif
-
-/** Connection Reset by peer */
-#define APR_STATUS_IS_ECONNRESET(s)      ((s) == APR_ECONNRESET)
-/** Operation timed out */
-#define APR_STATUS_IS_ETIMEDOUT(s)       ((s) == APR_ETIMEDOUT)    
-/** no route to host */
-#define APR_STATUS_IS_EHOSTUNREACH(s)    ((s) == APR_EHOSTUNREACH)
-/** network is unreachable */
-#define APR_STATUS_IS_ENETUNREACH(s)     ((s) == APR_ENETUNREACH)
-/** inappropiate file type or format */
-#define APR_STATUS_IS_EFTYPE(s)          ((s) == APR_EFTYPE)
-/** broken pipe */
-#define APR_STATUS_IS_EPIPE(s)           ((s) == APR_EPIPE)
-/** cross device link */
-#define APR_STATUS_IS_EXDEV(s)           ((s) == APR_EXDEV)
-/** Directory Not Empty */
-#define APR_STATUS_IS_ENOTEMPTY(s)       ((s) == APR_ENOTEMPTY || \
-                                          (s) == APR_EEXIST)
-/** @} */
-
-#endif /* !defined(NETWARE) && !defined(OS2) && !defined(WIN32) */
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ! APR_ERRNO_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_file_info.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_file_info.h
deleted file mode 100644
index 7e613d85..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_file_info.h
+++ /dev/null
@@ -1,421 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_FILE_INFO_H
-#define APR_FILE_INFO_H
-
-/**
- * @file apr_file_info.h
- * @brief APR File Information
- */
-
-#include "apr.h"
-#include "apr_user.h"
-#include "apr_pools.h"
-#include "apr_tables.h"
-#include "apr_time.h"
-#include "apr_errno.h"
-
-#if APR_HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup apr_file_info File Information
- * @ingroup APR 
- * @{
- */
-
-/* Many applications use the type member to determine the
- * existance of a file or initialization of the file info,
- * so the APR_NOFILE value must be distinct from APR_UNKFILE.
- */
-
-/** apr_filetype_e values for the filetype member of the 
- * apr_file_info_t structure
- * @warning: Not all of the filetypes below can be determined.
- * For example, a given platform might not correctly report 
- * a socket descriptor as APR_SOCK if that type isn't 
- * well-identified on that platform.  In such cases where
- * a filetype exists but cannot be described by the recognized
- * flags below, the filetype will be APR_UNKFILE.  If the
- * filetype member is not determined, the type will be APR_NOFILE.
- */
-
-typedef enum {
-    APR_NOFILE = 0,     /**< no file type determined */
-    APR_REG,            /**< a regular file */
-    APR_DIR,            /**< a directory */
-    APR_CHR,            /**< a character device */
-    APR_BLK,            /**< a block device */
-    APR_PIPE,           /**< a FIFO / pipe */
-    APR_LNK,            /**< a symbolic link */
-    APR_SOCK,           /**< a [unix domain] socket */
-    APR_UNKFILE = 127   /**< a file of some other unknown type */
-} apr_filetype_e; 
-
-/**
- * @defgroup apr_file_permissions File Permissions flags 
- * @{
- */
-
-#define APR_USETID      0x8000 /**< Set user id */
-#define APR_UREAD       0x0400 /**< Read by user */
-#define APR_UWRITE      0x0200 /**< Write by user */
-#define APR_UEXECUTE    0x0100 /**< Execute by user */
-
-#define APR_GSETID      0x4000 /**< Set group id */
-#define APR_GREAD       0x0040 /**< Read by group */
-#define APR_GWRITE      0x0020 /**< Write by group */
-#define APR_GEXECUTE    0x0010 /**< Execute by group */
-
-#define APR_WSTICKY     0x2000 /**< Sticky bit */
-#define APR_WREAD       0x0004 /**< Read by others */
-#define APR_WWRITE      0x0002 /**< Write by others */
-#define APR_WEXECUTE    0x0001 /**< Execute by others */
-
-#define APR_OS_DEFAULT  0x0FFF /**< use OS's default permissions */
-
-/* additional permission flags for apr_file_copy  and apr_file_append */
-#define APR_FILE_SOURCE_PERMS 0x1000 /**< Copy source file's permissions */
-
-/** @} */
-
-
-/**
- * Structure for referencing directories.
- */
-typedef struct apr_dir_t          apr_dir_t;
-/**
- * Structure for determining file permissions.
- */
-typedef apr_int32_t               apr_fileperms_t;
-#if (defined WIN32) || (defined NETWARE)
-/**
- * Structure for determining the device the file is on.
- */
-typedef apr_uint32_t              apr_dev_t;
-#else
-/**
- * Structure for determining the device the file is on.
- */
-typedef dev_t                     apr_dev_t;
-#endif
-
-/**
- * @defgroup apr_file_stat Stat Functions
- * @{
- */
-/** file info structure */
-typedef struct apr_finfo_t        apr_finfo_t;
-
-#define APR_FINFO_LINK   0x00000001 /**< Stat the link not the file itself if it is a link */
-#define APR_FINFO_MTIME  0x00000010 /**< Modification Time */
-#define APR_FINFO_CTIME  0x00000020 /**< Creation Time */
-#define APR_FINFO_ATIME  0x00000040 /**< Access Time */
-#define APR_FINFO_SIZE   0x00000100 /**< Size of the file */
-#define APR_FINFO_CSIZE  0x00000200 /**< Storage size consumed by the file */
-#define APR_FINFO_DEV    0x00001000 /**< Device */
-#define APR_FINFO_INODE  0x00002000 /**< Inode */
-#define APR_FINFO_NLINK  0x00004000 /**< Number of links */
-#define APR_FINFO_TYPE   0x00008000 /**< Type */
-#define APR_FINFO_USER   0x00010000 /**< User */
-#define APR_FINFO_GROUP  0x00020000 /**< Group */
-#define APR_FINFO_UPROT  0x00100000 /**< User protection bits */
-#define APR_FINFO_GPROT  0x00200000 /**< Group protection bits */
-#define APR_FINFO_WPROT  0x00400000 /**< World protection bits */
-#define APR_FINFO_ICASE  0x01000000 /**< if dev is case insensitive */
-#define APR_FINFO_NAME   0x02000000 /**< ->name in proper case */
-
-#define APR_FINFO_MIN    0x00008170 /**< type, mtime, ctime, atime, size */
-#define APR_FINFO_IDENT  0x00003000 /**< dev and inode */
-#define APR_FINFO_OWNER  0x00030000 /**< user and group */
-#define APR_FINFO_PROT   0x00700000 /**<  all protections */
-#define APR_FINFO_NORM   0x0073b170 /**<  an atomic unix apr_stat() */
-#define APR_FINFO_DIRENT 0x02000000 /**<  an atomic unix apr_dir_read() */
-
-/**
- * The file information structure.  This is analogous to the POSIX
- * stat structure.
- */
-struct apr_finfo_t {
-    /** Allocates memory and closes lingering handles in the specified pool */
-    apr_pool_t *pool;
-    /** The bitmask describing valid fields of this apr_finfo_t structure 
-     *  including all available 'wanted' fields and potentially more */
-    apr_int32_t valid;
-    /** The access permissions of the file.  Mimics Unix access rights. */
-    apr_fileperms_t protection;
-    /** The type of file.  One of APR_REG, APR_DIR, APR_CHR, APR_BLK, APR_PIPE, 
-     * APR_LNK or APR_SOCK.  If the type is undetermined, the value is APR_NOFILE.
-     * If the type cannot be determined, the value is APR_UNKFILE.
-     */
-    apr_filetype_e filetype;
-    /** The user id that owns the file */
-    apr_uid_t user;
-    /** The group id that owns the file */
-    apr_gid_t group;
-    /** The inode of the file. */
-    apr_ino_t inode;
-    /** The id of the device the file is on. */
-    apr_dev_t device;
-    /** The number of hard links to the file. */
-    apr_int32_t nlink;
-    /** The size of the file */
-    apr_off_t size;
-    /** The storage size consumed by the file */
-    apr_off_t csize;
-    /** The time the file was last accessed */
-    apr_time_t atime;
-    /** The time the file was last modified */
-    apr_time_t mtime;
-    /** The time the file was last changed */
-    apr_time_t ctime;
-    /** The pathname of the file (possibly unrooted) */
-    const char *fname;
-    /** The file's name (no path) in filesystem case */
-    const char *name;
-    /** The file's handle, if accessed (can be submitted to apr_duphandle) */
-    struct apr_file_t *filehand;
-};
-
-/**
- * get the specified file's stats.  The file is specified by filename, 
- * instead of using a pre-opened file.
- * @param finfo Where to store the information about the file, which is
- * never touched if the call fails.
- * @param fname The name of the file to stat.
- * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_
-                 values 
- * @param cont the pool to use to allocate the new file. 
- *
- * @note If @c APR_INCOMPLETE is returned all the fields in @a finfo may
- *       not be filled in, and you need to check the @c finfo->valid bitmask
- *       to verify that what you're looking for is there.
- */ 
-APR_DECLARE(apr_status_t) apr_stat(apr_finfo_t *finfo, const char *fname,
-                                   apr_int32_t wanted, apr_pool_t *cont);
-
-/**
- * get the specified file's stats.  The file is specified by filename, 
- * instead of using a pre-opened file.  If the file is a symlink, this function
- * will get the stats for the symlink not the file the symlink refers to.
- * @param finfo Where to store the information about the file, which is
- * never touched if the call fails.
- * @param fname The name of the file to stat.
- * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values 
- * @param cont the pool to use to allocate the new file. 
- * @deprecated This function is deprecated, it's equivalent to calling apr_stat with 
- * the wanted flag value APR_FINFO_LINK
- */ 
-APR_DECLARE(apr_status_t) apr_lstat(apr_finfo_t *finfo, const char *fname,
-                                    apr_int32_t wanted, apr_pool_t *cont);
-/** @} */
-/**
- * @defgroup apr_dir Directory Manipulation Functions
- * @{
- */
-
-/**
- * Open the specified directory.
- * @param new_dir The opened directory descriptor.
- * @param dirname The full path to the directory (use / on all systems)
- * @param cont The pool to use.
- */                        
-APR_DECLARE(apr_status_t) apr_dir_open(apr_dir_t **new_dir, 
-                                       const char *dirname, 
-                                       apr_pool_t *cont);
-
-/**
- * close the specified directory. 
- * @param thedir the directory descriptor to close.
- */                        
-APR_DECLARE(apr_status_t) apr_dir_close(apr_dir_t *thedir);
-
-/**
- * Read the next entry from the specified directory. 
- * @param finfo the file info structure and filled in by apr_dir_read
- * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_
-                 values 
- * @param thedir the directory descriptor returned from apr_dir_open
- * @remark No ordering is guaranteed for the entries read.
- *
- * @note If @c APR_INCOMPLETE is returned all the fields in @a finfo may
- *       not be filled in, and you need to check the @c finfo->valid bitmask
- *       to verify that what you're looking for is there.
- */                        
-APR_DECLARE(apr_status_t) apr_dir_read(apr_finfo_t *finfo, apr_int32_t wanted,
-                                       apr_dir_t *thedir);
-
-/**
- * Rewind the directory to the first entry.
- * @param thedir the directory descriptor to rewind.
- */                        
-APR_DECLARE(apr_status_t) apr_dir_rewind(apr_dir_t *thedir);
-/** @} */
-
-/**
- * @defgroup apr_filepath Filepath Manipulation Functions
- * @{
- */
-
-/** Cause apr_filepath_merge to fail if addpath is above rootpath */
-#define APR_FILEPATH_NOTABOVEROOT   0x01
-
-/** internal: Only meaningful with APR_FILEPATH_NOTABOVEROOT */
-#define APR_FILEPATH_SECUREROOTTEST 0x02
-
-/** Cause apr_filepath_merge to fail if addpath is above rootpath,
- * even given a rootpath /foo/bar and an addpath ../bar/bash
- */
-#define APR_FILEPATH_SECUREROOT     0x03
-
-/** Fail apr_filepath_merge if the merged path is relative */
-#define APR_FILEPATH_NOTRELATIVE    0x04
-
-/** Fail apr_filepath_merge if the merged path is absolute */
-#define APR_FILEPATH_NOTABSOLUTE    0x08
-
-/** Return the file system's native path format (e.g. path delimiters
- * of ':' on MacOS9, '\' on Win32, etc.) */
-#define APR_FILEPATH_NATIVE         0x10
-
-/** Resolve the true case of existing directories and file elements
- * of addpath, (resolving any aliases on Win32) and append a proper 
- * trailing slash if a directory
- */
-#define APR_FILEPATH_TRUENAME       0x20
-
-/**
- * Extract the rootpath from the given filepath
- * @param rootpath the root file path returned with APR_SUCCESS or APR_EINCOMPLETE
- * @param filepath the pathname to parse for its root component
- * @param flags the desired rules to apply, from
- * <PRE>
- *      APR_FILEPATH_NATIVE    Use native path seperators (e.g. '\' on Win32)
- *      APR_FILEPATH_TRUENAME  Tests that the root exists, and makes it proper
- * </PRE>
- * @param p the pool to allocate the new path string from
- * @remark on return, filepath points to the first non-root character in the
- * given filepath.  In the simplest example, given a filepath of "/foo", 
- * returns the rootpath of "/" and filepath points at "foo".  This is far 
- * more complex on other platforms, which will canonicalize the root form
- * to a consistant format, given the APR_FILEPATH_TRUENAME flag, and also
- * test for the validity of that root (e.g., that a drive d:/ or network 
- * share //machine/foovol/). 
- * The function returns APR_ERELATIVE if filepath isn't rooted (an
- * error), APR_EINCOMPLETE if the root path is ambigious (but potentially
- * legitimate, e.g. "/" on Windows is incomplete because it doesn't specify
- * the drive letter), or APR_EBADPATH if the root is simply invalid.
- * APR_SUCCESS is returned if filepath is an absolute path.
- */
-APR_DECLARE(apr_status_t) apr_filepath_root(const char **rootpath, 
-                                            const char **filepath, 
-                                            apr_int32_t flags,
-                                            apr_pool_t *p);
-
-/**
- * Merge additional file path onto the previously processed rootpath
- * @param newpath the merged paths returned
- * @param rootpath the root file path (NULL uses the current working path)
- * @param addpath the path to add to the root path
- * @param flags the desired APR_FILEPATH_ rules to apply when merging
- * @param p the pool to allocate the new path string from
- * @remark if the flag APR_FILEPATH_TRUENAME is given, and the addpath 
- * contains wildcard characters ('*', '?') on platforms that don't support 
- * such characters within filenames, the paths will be merged, but the 
- * result code will be APR_EPATHWILD, and all further segments will not
- * reflect the true filenames including the wildcard and following segments.
- */                        
-APR_DECLARE(apr_status_t) apr_filepath_merge(char **newpath, 
-                                             const char *rootpath,
-                                             const char *addpath, 
-                                             apr_int32_t flags,
-                                             apr_pool_t *p);
-
-/**
- * Split a search path into separate components
- * @param pathelts the returned components of the search path
- * @param liststr the search path (e.g., <tt>getenv("PATH")</tt>)
- * @param p the pool to allocate the array and path components from
- * @remark empty path componenta do not become part of @a pathelts.
- * @remark the path separator in @a liststr is system specific;
- * e.g., ':' on Unix, ';' on Windows, etc.
- */
-APR_DECLARE(apr_status_t) apr_filepath_list_split(apr_array_header_t **pathelts,
-                                                  const char *liststr,
-                                                  apr_pool_t *p);
-
-/**
- * Merge a list of search path components into a single search path
- * @param liststr the returned search path; may be NULL if @a pathelts is empty
- * @param pathelts the components of the search path
- * @param p the pool to allocate the search path from
- * @remark emtpy strings in the source array are ignored.
- * @remark the path separator in @a liststr is system specific;
- * e.g., ':' on Unix, ';' on Windows, etc.
- */
-APR_DECLARE(apr_status_t) apr_filepath_list_merge(char **liststr,
-                                                  apr_array_header_t *pathelts,
-                                                  apr_pool_t *p);
-
-/**
- * Return the default file path (for relative file names)
- * @param path the default path string returned
- * @param flags optional flag APR_FILEPATH_NATIVE to retrieve the
- *              default file path in os-native format.
- * @param p the pool to allocate the default path string from
- */
-APR_DECLARE(apr_status_t) apr_filepath_get(char **path, apr_int32_t flags,
-                                           apr_pool_t *p);
-
-/**
- * Set the default file path (for relative file names)
- * @param path the default path returned
- * @param p the pool to allocate any working storage
- */
-APR_DECLARE(apr_status_t) apr_filepath_set(const char *path, apr_pool_t *p);
-
-/** The FilePath character encoding is unknown */
-#define APR_FILEPATH_ENCODING_UNKNOWN  0
-
-/** The FilePath character encoding is locale-dependent */
-#define APR_FILEPATH_ENCODING_LOCALE   1
-
-/** The FilePath character encoding is UTF-8 */
-#define APR_FILEPATH_ENCODING_UTF8     2
-
-/**
- * Determine the encoding used internally by the FilePath functions
- * @param style points to a variable which receives the encoding style flag
- * @param p the pool to allocate any working storage
- * @remark Use @c apr_os_locale_encoding and/or @c apr_os_default_encoding
- * to get the name of the path encoding if it's not UTF-8.
- */
-APR_DECLARE(apr_status_t) apr_filepath_encoding(int *style, apr_pool_t *p);
-/** @} */
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ! APR_FILE_INFO_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_file_io.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_file_io.h
deleted file mode 100644
index bfa7a1bf..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_file_io.h
+++ /dev/null
@@ -1,766 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_FILE_IO_H
-#define APR_FILE_IO_H
-
-/**
- * @file apr_file_io.h
- * @brief APR File I/O Handling
- */
-
-#include "apr.h"
-#include "apr_pools.h"
-#include "apr_time.h"
-#include "apr_errno.h"
-#include "apr_file_info.h"
-#include "apr_inherit.h"
-
-#define APR_WANT_STDIO          /**< for SEEK_* */
-#define APR_WANT_IOVEC          /**< for apr_file_writev */
-#include "apr_want.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup apr_file_io File I/O Handling Functions
- * @ingroup APR 
- * @{
- */
-
-/**
- * @defgroup apr_file_open_flags File Open Flags/Routines
- * @{
- */
-
-/* Note to implementors: Values in the range 0x00100000--0x80000000
-   are reserved for platform-specific values. */
-
-#define APR_READ       0x00001     /**< Open the file for reading */
-#define APR_WRITE      0x00002     /**< Open the file for writing */
-#define APR_CREATE     0x00004     /**< Create the file if not there */
-#define APR_APPEND     0x00008     /**< Append to the end of the file */
-#define APR_TRUNCATE   0x00010     /**< Open the file and truncate to 0 length */
-#define APR_BINARY     0x00020     /**< Open the file in binary mode */
-#define APR_EXCL       0x00040     /**< Open should fail if APR_CREATE and file
-                                        exists. */
-#define APR_BUFFERED   0x00080     /**< Open the file for buffered I/O */
-#define APR_DELONCLOSE 0x00100     /**< Delete the file after close */
-#define APR_XTHREAD    0x00200     /**< Platform dependent tag to open the file
-                                        for use across multiple threads */
-#define APR_SHARELOCK  0x00400     /**< Platform dependent support for higher
-                                        level locked read/write access to support
-                                        writes across process/machines */
-#define APR_FILE_NOCLEANUP 0x00800 /**< Do not register a cleanup when the file
-                                        is opened */
-#define APR_SENDFILE_ENABLED 0x01000 /**< Advisory flag that this file should
-                                          support apr_sendfile operation */
-#define APR_LARGEFILE   0x04000    /**< Platform dependent flag to enable large file
-                                        support; WARNING see below. */
-
-/** @warning The APR_LARGEFILE flag only has effect on some platforms
- * where sizeof(apr_off_t) == 4.  Where implemented, it allows opening
- * and writing to a file which exceeds the size which can be
- * represented by apr_off_t (2 gigabytes).  When a file's size does
- * exceed 2Gb, apr_file_info_get() will fail with an error on the
- * descriptor, likewise apr_stat()/apr_lstat() will fail on the
- * filename.  apr_dir_read() will fail with APR_INCOMPLETE on a
- * directory entry for a large file depending on the particular
- * APR_FINFO_* flags.  Generally, it is not recommended to use this
- * flag. */
-
-/** @} */
-
-/**
- * @defgroup apr_file_seek_flags File Seek Flags
- * @{
- */
-
-/* flags for apr_file_seek */
-/** Set the file position */
-#define APR_SET SEEK_SET
-/** Current */
-#define APR_CUR SEEK_CUR
-/** Go to end of file */
-#define APR_END SEEK_END
-/** @} */
-
-/**
- * @defgroup apr_file_attrs_set_flags File Attribute Flags
- * @{
- */
-
-/* flags for apr_file_attrs_set */
-#define APR_FILE_ATTR_READONLY   0x01          /**< File is read-only */
-#define APR_FILE_ATTR_EXECUTABLE 0x02          /**< File is executable */
-#define APR_FILE_ATTR_HIDDEN     0x04          /**< File is hidden */
-/** @} */
-
-/** File attributes */
-typedef apr_uint32_t apr_fileattrs_t;
-
-/** should be same as whence type in lseek, POSIX defines this as int */
-typedef int       apr_seek_where_t;
-
-/**
- * Structure for referencing files.
- */
-typedef struct apr_file_t         apr_file_t;
-
-/* File lock types/flags */
-/**
- * @defgroup apr_file_lock_types File Lock Types
- * @{
- */
-
-#define APR_FLOCK_SHARED        1       /**< Shared lock. More than one process
-                                           or thread can hold a shared lock
-                                           at any given time. Essentially,
-                                           this is a "read lock", preventing
-                                           writers from establishing an
-                                           exclusive lock. */
-#define APR_FLOCK_EXCLUSIVE     2       /**< Exclusive lock. Only one process
-                                           may hold an exclusive lock at any
-                                           given time. This is analogous to
-                                           a "write lock". */
-
-#define APR_FLOCK_TYPEMASK      0x000F  /**< mask to extract lock type */
-#define APR_FLOCK_NONBLOCK      0x0010  /**< do not block while acquiring the
-                                           file lock */
-/** @} */
-
-/**
- * Open the specified file.
- * @param newf The opened file descriptor.
- * @param fname The full path to the file (using / on all systems)
- * @param flag Or'ed value of:
- * <PRE>
- *         APR_READ              open for reading
- *         APR_WRITE             open for writing
- *         APR_CREATE            create the file if not there
- *         APR_APPEND            file ptr is set to end prior to all writes
- *         APR_TRUNCATE          set length to zero if file exists
- *         APR_BINARY            not a text file (This flag is ignored on 
- *                               UNIX because it has no meaning)
- *         APR_BUFFERED          buffer the data.  Default is non-buffered
- *         APR_EXCL              return error if APR_CREATE and file exists
- *         APR_DELONCLOSE        delete the file after closing.
- *         APR_XTHREAD           Platform dependent tag to open the file
- *                               for use across multiple threads
- *         APR_SHARELOCK         Platform dependent support for higher
- *                               level locked read/write access to support
- *                               writes across process/machines
- *         APR_FILE_NOCLEANUP    Do not register a cleanup with the pool 
- *                               passed in on the <EM>cont</EM> argument (see below).
- *                               The apr_os_file_t handle in apr_file_t will not
- *                               be closed when the pool is destroyed.
- *         APR_SENDFILE_ENABLED  Open with appropriate platform semantics
- *                               for sendfile operations.  Advisory only,
- *                               apr_sendfile does not check this flag.
- * </PRE>
- * @param perm Access permissions for file.
- * @param pool The pool to use.
- * @remark If perm is APR_OS_DEFAULT and the file is being created, appropriate 
- *      default permissions will be used.  *arg1 must point to a valid file_t, 
- *      or NULL (in which case it will be allocated)
- */
-APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **newf, const char *fname,
-                                   apr_int32_t flag, apr_fileperms_t perm,
-                                   apr_pool_t *pool);
-
-/**
- * Close the specified file.
- * @param file The file descriptor to close.
- */
-APR_DECLARE(apr_status_t) apr_file_close(apr_file_t *file);
-
-/**
- * delete the specified file.
- * @param path The full path to the file (using / on all systems)
- * @param cont The pool to use.
- * @remark If the file is open, it won't be removed until all instances are closed.
- */
-APR_DECLARE(apr_status_t) apr_file_remove(const char *path, apr_pool_t *cont);
-
-/**
- * rename the specified file.
- * @param from_path The full path to the original file (using / on all systems)
- * @param to_path The full path to the new file (using / on all systems)
- * @param pool The pool to use.
- * @warning If a file exists at the new location, then it will be overwritten.  
- *      Moving files or directories across devices may not be possible.
- */
-APR_DECLARE(apr_status_t) apr_file_rename(const char *from_path, 
-                                          const char *to_path,
-                                          apr_pool_t *pool);
-
-/**
- * copy the specified file to another file.
- * @param from_path The full path to the original file (using / on all systems)
- * @param to_path The full path to the new file (using / on all systems)
- * @param perms Access permissions for the new file if it is created.
- *     In place of the usual or'd combination of file permissions, the
- *     value APR_FILE_SOURCE_PERMS may be given, in which case the source
- *     file's permissions are copied.
- * @param pool The pool to use.
- * @remark The new file does not need to exist, it will be created if required.
- * @warning If the new file already exists, its contents will be overwritten.
- */
-APR_DECLARE(apr_status_t) apr_file_copy(const char *from_path, 
-                                        const char *to_path,
-                                        apr_fileperms_t perms,
-                                        apr_pool_t *pool);
-
-/**
- * append the specified file to another file.
- * @param from_path The full path to the source file (using / on all systems)
- * @param to_path The full path to the destination file (using / on all systems)
- * @param perms Access permissions for the destination file if it is created.
- *     In place of the usual or'd combination of file permissions, the
- *     value APR_FILE_SOURCE_PERMS may be given, in which case the source
- *     file's permissions are copied.
- * @param pool The pool to use.
- * @remark The new file does not need to exist, it will be created if required.
- */
-APR_DECLARE(apr_status_t) apr_file_append(const char *from_path, 
-                                          const char *to_path,
-                                          apr_fileperms_t perms,
-                                          apr_pool_t *pool);
-
-/**
- * Are we at the end of the file
- * @param fptr The apr file we are testing.
- * @remark Returns APR_EOF if we are at the end of file, APR_SUCCESS otherwise.
- */
-APR_DECLARE(apr_status_t) apr_file_eof(apr_file_t *fptr);
-
-/**
- * open standard error as an apr file pointer.
- * @param thefile The apr file to use as stderr.
- * @param cont The pool to allocate the file out of.
- * 
- * @remark The only reason that the apr_file_open_std* functions exist
- * is that you may not always have a stderr/out/in on Windows.  This
- * is generally a problem with newer versions of Windows and services.
- * 
- * The other problem is that the C library functions generally work
- * differently on Windows and Unix.  So, by using apr_file_open_std*
- * functions, you can get a handle to an APR struct that works with
- * the APR functions which are supposed to work identically on all
- * platforms.
- */
-APR_DECLARE(apr_status_t) apr_file_open_stderr(apr_file_t **thefile,
-                                          apr_pool_t *cont);
-
-/**
- * open standard output as an apr file pointer.
- * @param thefile The apr file to use as stdout.
- * @param cont The pool to allocate the file out of.
- * 
- * @remark The only reason that the apr_file_open_std* functions exist
- * is that you may not always have a stderr/out/in on Windows.  This
- * is generally a problem with newer versions of Windows and services.
- * 
- * The other problem is that the C library functions generally work
- * differently on Windows and Unix.  So, by using apr_file_open_std*
- * functions, you can get a handle to an APR struct that works with
- * the APR functions which are supposed to work identically on all
- * platforms.
- */
-APR_DECLARE(apr_status_t) apr_file_open_stdout(apr_file_t **thefile,
-                                          apr_pool_t *cont);
-
-/**
- * open standard input as an apr file pointer.
- * @param thefile The apr file to use as stdin.
- * @param cont The pool to allocate the file out of.
- * 
- * @remark The only reason that the apr_file_open_std* functions exist
- * is that you may not always have a stderr/out/in on Windows.  This
- * is generally a problem with newer versions of Windows and services.
- * 
- * The other problem is that the C library functions generally work
- * differently on Windows and Unix.  So, by using apr_file_open_std*
- * functions, you can get a handle to an APR struct that works with
- * the APR functions which are supposed to work identically on all
- * platforms.
- */
-APR_DECLARE(apr_status_t) apr_file_open_stdin(apr_file_t **thefile,
-                                              apr_pool_t *cont);
-
-/**
- * Read data from the specified file.
- * @param thefile The file descriptor to read from.
- * @param buf The buffer to store the data to.
- * @param nbytes On entry, the number of bytes to read; on exit, the number of bytes read.
- * @remark apr_file_read will read up to the specified number of bytes, but 
- *         never more.  If there isn't enough data to fill that number of 
- *         bytes, all of the available data is read.  The third argument is 
- *         modified to reflect the number of bytes read.  If a char was put 
- *         back into the stream via ungetc, it will be the first character 
- *         returned. 
- *
- *         It is not possible for both bytes to be read and an APR_EOF or other 
- *         error to be returned.
- *
- *         APR_EINTR is never returned.
- */
-APR_DECLARE(apr_status_t) apr_file_read(apr_file_t *thefile, void *buf,
-                                   apr_size_t *nbytes);
-
-/**
- * Write data to the specified file.
- * @param thefile The file descriptor to write to.
- * @param buf The buffer which contains the data.
- * @param nbytes On entry, the number of bytes to write; on exit, the number 
- *               of bytes written.
- * @remark apr_file_write will write up to the specified number of bytes, but never 
- *      more.  If the OS cannot write that many bytes, it will write as many 
- *      as it can.  The third argument is modified to reflect the * number 
- *      of bytes written. 
- *
- *      It is possible for both bytes to be written and an error to be returned.
- *
- *      APR_EINTR is never returned.
- */
-APR_DECLARE(apr_status_t) apr_file_write(apr_file_t *thefile, const void *buf,
-                                    apr_size_t *nbytes);
-
-/**
- * Write data from iovec array to the specified file.
- * @param thefile The file descriptor to write to.
- * @param vec The array from which to get the data to write to the file.
- * @param nvec The number of elements in the struct iovec array. This must 
- *             be smaller than APR_MAX_IOVEC_SIZE.  If it isn't, the function 
- *             will fail with APR_EINVAL.
- * @param nbytes The number of bytes written.
- * @remark It is possible for both bytes to be written and an error to be returned.
- *      APR_EINTR is never returned.
- *
- *      apr_file_writev is available even if the underlying operating system 
- *
- *      doesn't provide writev().
- */
-APR_DECLARE(apr_status_t) apr_file_writev(apr_file_t *thefile,
-                                     const struct iovec *vec,
-                                     apr_size_t nvec, apr_size_t *nbytes);
-
-/**
- * Read data from the specified file, ensuring that the buffer is filled
- * before returning.
- * @param thefile The file descriptor to read from.
- * @param buf The buffer to store the data to.
- * @param nbytes The number of bytes to read.
- * @param bytes_read If non-NULL, this will contain the number of bytes read.
- * @remark apr_file_read will read up to the specified number of bytes, but never 
- *      more.  If there isn't enough data to fill that number of bytes, 
- *      then the process/thread will block until it is available or EOF 
- *      is reached.  If a char was put back into the stream via ungetc, 
- *      it will be the first character returned. 
- *
- *      It is possible for both bytes to be read and an error to be 
- *      returned.  And if *bytes_read is less than nbytes, an
- *      accompanying error is _always_ returned.
- *
- *      APR_EINTR is never returned.
- */
-APR_DECLARE(apr_status_t) apr_file_read_full(apr_file_t *thefile, void *buf,
-                                        apr_size_t nbytes,
-                                        apr_size_t *bytes_read);
-
-/**
- * Write data to the specified file, ensuring that all of the data is
- * written before returning.
- * @param thefile The file descriptor to write to.
- * @param buf The buffer which contains the data.
- * @param nbytes The number of bytes to write.
- * @param bytes_written If non-NULL, this will contain the number of bytes written.
- * @remark apr_file_write will write up to the specified number of bytes, but never 
- *      more.  If the OS cannot write that many bytes, the process/thread 
- *      will block until they can be written. Exceptional error such as 
- *      "out of space" or "pipe closed" will terminate with an error.
- *
- *      It is possible for both bytes to be written and an error to be 
- *      returned.  And if *bytes_written is less than nbytes, an
- *      accompanying error is _always_ returned.
- *
- *      APR_EINTR is never returned.
- */
-APR_DECLARE(apr_status_t) apr_file_write_full(apr_file_t *thefile, const void *buf,
-                                         apr_size_t nbytes, 
-                                         apr_size_t *bytes_written);
-
-/**
- * put a character into the specified file.
- * @param ch The character to write.
- * @param thefile The file descriptor to write to
- */
-APR_DECLARE(apr_status_t) apr_file_putc(char ch, apr_file_t *thefile);
-
-/**
- * get a character from the specified file.
- * @param ch The character to read into
- * @param thefile The file descriptor to read from
- */
-APR_DECLARE(apr_status_t) apr_file_getc(char *ch, apr_file_t *thefile);
-
-/**
- * put a character back onto a specified stream.
- * @param ch The character to write.
- * @param thefile The file descriptor to write to
- */
-APR_DECLARE(apr_status_t) apr_file_ungetc(char ch, apr_file_t *thefile);
-
-/**
- * Get a string from a specified file.
- * @param str The buffer to store the string in. 
- * @param len The length of the string
- * @param thefile The file descriptor to read from
- * @remark The buffer will be '\0'-terminated if any characters are stored.
- */
-APR_DECLARE(apr_status_t) apr_file_gets(char *str, int len, apr_file_t *thefile);
-
-/**
- * Put the string into a specified file.
- * @param str The string to write. 
- * @param thefile The file descriptor to write to
- */
-APR_DECLARE(apr_status_t) apr_file_puts(const char *str, apr_file_t *thefile);
-
-/**
- * Flush the file's buffer.
- * @param thefile The file descriptor to flush
- */
-APR_DECLARE(apr_status_t) apr_file_flush(apr_file_t *thefile);
-
-/**
- * duplicate the specified file descriptor.
- * @param new_file The structure to duplicate into. 
- * @param old_file The file to duplicate.
- * @param p The pool to use for the new file.
- * @remark *new_file must point to a valid apr_file_t, or point to NULL
- */         
-APR_DECLARE(apr_status_t) apr_file_dup(apr_file_t **new_file,
-                                      apr_file_t *old_file,
-                                      apr_pool_t *p);
-
-/**
- * duplicate the specified file descriptor and close the original
- * @param new_file The old file that is to be closed and reused
- * @param old_file The file to duplicate
- * @param p        The pool to use for the new file
- *
- * @remark new_file MUST point at a valid apr_file_t. It cannot be NULL
- */
-APR_DECLARE(apr_status_t) apr_file_dup2(apr_file_t *new_file,
-                                        apr_file_t *old_file,
-                                        apr_pool_t *p);
-
-/**
- * move the specified file descriptor to a new pool
- * @param new_file Pointer in which to return the new apr_file_t
- * @param old_file The file to move
- * @param p        The pool to which the descriptor is to be moved
- * @remark Unlike apr_file_dup2(), this function doesn't do an
- *         OS dup() operation on the underlying descriptor; it just
- *         moves the descriptor's apr_file_t wrapper to a new pool.
- * @remark The new pool need not be an ancestor of old_file's pool.
- * @remark After calling this function, old_file may not be used
- */
-APR_DECLARE(apr_status_t) apr_file_setaside(apr_file_t **new_file,
-                                            apr_file_t *old_file,
-                                            apr_pool_t *p);
-
-/**
- * Move the read/write file offset to a specified byte within a file.
- * @param thefile The file descriptor
- * @param where How to move the pointer, one of:
- * <PRE>
- *            APR_SET  --  set the offset to offset
- *            APR_CUR  --  add the offset to the current position 
- *            APR_END  --  add the offset to the current file size 
- * </PRE>
- * @param offset The offset to move the pointer to.
- * @remark The third argument is modified to be the offset the pointer
-          was actually moved to.
- */
-APR_DECLARE(apr_status_t) apr_file_seek(apr_file_t *thefile, 
-                                   apr_seek_where_t where,
-                                   apr_off_t *offset);
-
-/**
- * Create an anonymous pipe.
- * @param in The file descriptor to use as input to the pipe.
- * @param out The file descriptor to use as output from the pipe.
- * @param cont The pool to operate on.
- */
-APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, apr_file_t **out,
-                                          apr_pool_t *cont);
-
-/**
- * Create a named pipe.
- * @param filename The filename of the named pipe
- * @param perm The permissions for the newly created pipe.
- * @param cont The pool to operate on.
- */
-APR_DECLARE(apr_status_t) apr_file_namedpipe_create(const char *filename, 
-                                               apr_fileperms_t perm, 
-                                               apr_pool_t *cont);
-
-/**
- * Get the timeout value for a pipe or manipulate the blocking state.
- * @param thepipe The pipe we are getting a timeout for.
- * @param timeout The current timeout value in microseconds. 
- */
-APR_DECLARE(apr_status_t) apr_file_pipe_timeout_get(apr_file_t *thepipe, 
-                                               apr_interval_time_t *timeout);
-
-/**
- * Set the timeout value for a pipe or manipulate the blocking state.
- * @param thepipe The pipe we are setting a timeout on.
- * @param timeout The timeout value in microseconds.  Values < 0 mean wait 
- *        forever, 0 means do not wait at all.
- */
-APR_DECLARE(apr_status_t) apr_file_pipe_timeout_set(apr_file_t *thepipe, 
-                                               apr_interval_time_t timeout);
-
-/** file (un)locking functions. */
-
-/**
- * Establish a lock on the specified, open file. The lock may be advisory
- * or mandatory, at the discretion of the platform. The lock applies to
- * the file as a whole, rather than a specific range. Locks are established
- * on a per-thread/process basis; a second lock by the same thread will not
- * block.
- * @param thefile The file to lock.
- * @param type The type of lock to establish on the file.
- */
-APR_DECLARE(apr_status_t) apr_file_lock(apr_file_t *thefile, int type);
-
-/**
- * Remove any outstanding locks on the file.
- * @param thefile The file to unlock.
- */
-APR_DECLARE(apr_status_t) apr_file_unlock(apr_file_t *thefile);
-
-/**accessor and general file_io functions. */
-
-/**
- * return the file name of the current file.
- * @param new_path The path of the file.  
- * @param thefile The currently open file.
- */                     
-APR_DECLARE(apr_status_t) apr_file_name_get(const char **new_path, 
-                                           apr_file_t *thefile);
-
-/**
- * Return the data associated with the current file.
- * @param data The user data associated with the file.  
- * @param key The key to use for retreiving data associated with this file.
- * @param file The currently open file.
- */                     
-APR_DECLARE(apr_status_t) apr_file_data_get(void **data, const char *key, 
-                                           apr_file_t *file);
-
-/**
- * Set the data associated with the current file.
- * @param file The currently open file.
- * @param data The user data to associate with the file.  
- * @param key The key to use for assocaiteing data with the file.
- * @param cleanup The cleanup routine to use when the file is destroyed.
- */                     
-APR_DECLARE(apr_status_t) apr_file_data_set(apr_file_t *file, void *data,
-                                           const char *key,
-                                           apr_status_t (*cleanup)(void *));
-
-/**
- * Write a string to a file using a printf format.
- * @param fptr The file to write to.
- * @param format The format string
- * @param ... The values to substitute in the format string
- * @return The number of bytes written
- */ 
-APR_DECLARE_NONSTD(int) apr_file_printf(apr_file_t *fptr, 
-                                        const char *format, ...)
-        __attribute__((format(printf,2,3)));
-
-/**
- * set the specified file's permission bits.
- * @param fname The file (name) to apply the permissions to.
- * @param perms The permission bits to apply to the file.
- * @warning Some platforms may not be able to apply all of the available 
- *      permission bits; APR_INCOMPLETE will be returned if some permissions 
- *      are specified which could not be set.
- *
- *      Platforms which do not implement this feature will return APR_ENOTIMPL.
- */
-APR_DECLARE(apr_status_t) apr_file_perms_set(const char *fname,
-                                           apr_fileperms_t perms);
-
-/**
- * Set attributes of the specified file.
- * @param fname The full path to the file (using / on all systems)
- * @param attributes Or'd combination of
- * <PRE>
- *            APR_FILE_ATTR_READONLY   - make the file readonly
- *            APR_FILE_ATTR_EXECUTABLE - make the file executable
- *            APR_FILE_ATTR_HIDDEN     - make the file hidden
- * </PRE>
- * @param attr_mask Mask of valid bits in attributes.
- * @param cont the pool to use.
- * @remark This function should be used in preference to explict manipulation
- *      of the file permissions, because the operations to provide these
- *      attributes are platform specific and may involve more than simply
- *      setting permission bits.
- * @warning Platforms which do not implement this feature will return
- *      APR_ENOTIMPL.
- */
-APR_DECLARE(apr_status_t) apr_file_attrs_set(const char *fname,
-                                             apr_fileattrs_t attributes,
-                                             apr_fileattrs_t attr_mask,
-                                             apr_pool_t *cont);
-
-/**
- * Set the mtime of the specified file.
- * @param fname The full path to the file (using / on all systems)
- * @param mtime The mtime to apply to the file.
- * @param pool The pool to use.
- * @warning Platforms which do not implement this feature will return
- *      APR_ENOTIMPL.
- */
-APR_DECLARE(apr_status_t) apr_file_mtime_set(const char *fname,
-                                             apr_time_t mtime,
-                                             apr_pool_t *pool);
-
-/**
- * Create a new directory on the file system.
- * @param path the path for the directory to be created.  (use / on all systems)
- * @param perm Permissions for the new direcoty.
- * @param cont the pool to use.
- */                        
-APR_DECLARE(apr_status_t) apr_dir_make(const char *path, apr_fileperms_t perm, 
-                        apr_pool_t *cont);
-
-/** Creates a new directory on the file system, but behaves like
- * 'mkdir -p'. Creates intermediate directories as required. No error
- * will be reported if PATH already exists.
- * @param path the path for the directory to be created.  (use / on all systems)
- * @param perm Permissions for the new direcoty.
- * @param pool the pool to use.
- */
-APR_DECLARE(apr_status_t) apr_dir_make_recursive(const char *path,
-                                                 apr_fileperms_t perm,
-                                                 apr_pool_t *pool);
-
-/**
- * Remove directory from the file system.
- * @param path the path for the directory to be removed.  (use / on all systems)
- * @param cont the pool to use.
- */                        
-APR_DECLARE(apr_status_t) apr_dir_remove(const char *path, apr_pool_t *cont);
-
-/**
- * get the specified file's stats.
- * @param finfo Where to store the information about the file.
- * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values 
- * @param thefile The file to get information about.
- */ 
-APR_DECLARE(apr_status_t) apr_file_info_get(apr_finfo_t *finfo, 
-                                          apr_int32_t wanted,
-                                          apr_file_t *thefile);
-
-
-/**
- * Truncate the file's length to the specified offset
- * @param fp The file to truncate
- * @param offset The offset to truncate to.
- * @remark The read/write file offset is repositioned to offset.
- */
-APR_DECLARE(apr_status_t) apr_file_trunc(apr_file_t *fp, apr_off_t offset);
-
-/**
- * Retrieve the flags that were passed into apr_file_open()
- * when the file was opened.
- * @return apr_int32_t the flags
- */
-APR_DECLARE(apr_int32_t) apr_file_flags_get(apr_file_t *f);
-
-/**
- * Get the pool used by the file.
- */
-APR_POOL_DECLARE_ACCESSOR(file);
-
-/**
- * Set a file to be inherited by child processes.
- *
- */
-APR_DECLARE_INHERIT_SET(file);
-
-/** @deprecated @see apr_file_inherit_set */
-APR_DECLARE(void) apr_file_set_inherit(apr_file_t *file);
-
-/**
- * Unset a file from being inherited by child processes.
- */
-APR_DECLARE_INHERIT_UNSET(file);
-
-/** @deprecated @see apr_file_inherit_unset */
-APR_DECLARE(void) apr_file_unset_inherit(apr_file_t *file);
-
-/**
- * Open a temporary file
- * @param fp The apr file to use as a temporary file.
- * @param templ The template to use when creating a temp file.
- * @param flags The flags to open the file with. If this is zero,
- *              the file is opened with 
- *              APR_CREATE | APR_READ | APR_WRITE | APR_EXCL | APR_DELONCLOSE
- * @param p The pool to allocate the file out of.
- * @remark   
- * This function  generates  a unique temporary file name from template.  
- * The last six characters of template must be XXXXXX and these are replaced 
- * with a string that makes the filename unique. Since it will  be  modified,
- * template must not be a string constant, but should be declared as a character
- * array.  
- *
- */
-APR_DECLARE(apr_status_t) apr_file_mktemp(apr_file_t **fp, char *templ,
-                                          apr_int32_t flags, apr_pool_t *p);
-
-
-/**
- * Find an existing directory suitable as a temporary storage location.
- * @param temp_dir The temp directory.
- * @param p The pool to use for any necessary allocations.
- * @remark   
- * This function uses an algorithm to search for a directory that an
- * an application can use for temporary storage.  Once such a
- * directory is found, that location is cached by the library.  Thus,
- * callers only pay the cost of this algorithm once if that one time
- * is successful.
- *
- */
-APR_DECLARE(apr_status_t) apr_temp_dir_get(const char **temp_dir, 
-                                           apr_pool_t *p);
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ! APR_FILE_IO_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_fnmatch.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_fnmatch.h
deleted file mode 100644
index 8be40fc8..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_fnmatch.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)fnmatch.h	8.1 (Berkeley) 6/2/93
- */
-
-/* This file has been modified by the Apache Software Foundation. */
-#ifndef	_APR_FNMATCH_H_
-#define	_APR_FNMATCH_H_
-
-/**
- * @file apr_fnmatch.h
- * @brief APR FNMatch Functions
- */
-
-#include "apr_errno.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @defgroup apr_fnmatch Filename Matching Functions
- * @ingroup APR 
- * @{
- */
-
-#define APR_FNM_NOMATCH     1     /**< Match failed. */
- 
-#define APR_FNM_NOESCAPE    0x01  /**< Disable backslash escaping. */
-#define APR_FNM_PATHNAME    0x02  /**< Slash must be matched by slash. */
-#define APR_FNM_PERIOD      0x04  /**< Period must be matched by period. */
-#define APR_FNM_CASE_BLIND  0x08  /**< Compare characters case-insensitively.
-                                   * @remark This flag is an Apache addition 
-                                   */
-
-#define FNM_NOMATCH    APR_FNM_NOMATCH    /**< @deprecated @see APR_FNM_NOMATCH */
-#define FNM_NOESCAPE   APR_FNM_NOESCAPE   /**< @deprecated @see APR_FNM_NOESCAPE */
-#define FNM_PATHNAME   APR_FNM_PATHNAME   /**< @deprecated @see APR_FNM_PATHNAME */
-#define FNM_PERIOD     APR_FNM_PERIOD     /**< @deprecated @see APR_FNM_PERIOD */
-#define FNM_CASE_BLIND APR_FNM_CASE_BLIND /**< @deprecated @see APR_FNM_CASE_BLIND */
-
-/**
- * Try to match the string to the given pattern, return APR_SUCCESS if
- *    match, else return APR_FNM_NOMATCH.
- * @param pattern The pattern to match to
- * @param strings The string we are trying to match
- * @param flags flags to use in the match.  Bitwise OR of:
- * <PRE>
- *              APR_FNM_NOESCAPE       Disable backslash escaping
- *              APR_FNM_PATHNAME       Slash must be matched by slash
- *              APR_FNM_PERIOD         Period must be matched by period
- *              APR_FNM_CASE_BLIND     Compare characters case-insensitively.
- * </PRE>
- */
-
-APR_DECLARE(apr_status_t) apr_fnmatch(const char *pattern, 
-                                      const char *strings, int flags);
-
-/**
- * Determine if the given pattern is a regular expression.
- * @param pattern The pattern to search for glob characters.
- * @return non-zero if pattern has any glob characters in it
- */
-APR_DECLARE(int) apr_fnmatch_test(const char *pattern);
-
-/** @deprecated @see apr_fnmatch_test */
-APR_DECLARE(int) apr_is_fnmatch(const char *pattern);
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_APR_FNMATCH_H_ */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_general.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_general.h
deleted file mode 100644
index 10e150b9..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_general.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_GENERAL_H
-#define APR_GENERAL_H
-
-/**
- * @file apr_general.h
- * This is collection of oddballs that didn't fit anywhere else,
- * and might move to more appropriate headers with the release
- * of APR 1.0.
- * @brief APR Miscellaneous library routines
- */
-
-#include "apr.h"
-#include "apr_pools.h"
-#include "apr_errno.h"
-
-#if APR_HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup apr_general Miscellaneous library routines
- * @ingroup APR 
- * This is collection of oddballs that didn't fit anywhere else,
- * and might move to more appropriate headers with the release
- * of APR 1.0.
- * @{
- */
-
-/** FALSE */
-#ifndef FALSE
-#define FALSE 0
-#endif
-/** TRUE */
-#ifndef TRUE
-#define TRUE (!FALSE)
-#endif
-
-/** a space */
-#define APR_ASCII_BLANK  '\040'
-/** a carrige return */
-#define APR_ASCII_CR     '\015'
-/** a line feed */
-#define APR_ASCII_LF     '\012'
-/** a tab */
-#define APR_ASCII_TAB    '\011'
-
-/** signal numbers typedef */
-typedef int               apr_signum_t;
-
-/**
- * Finding offsets of elements within structures.
- * Taken from the X code... they've sweated portability of this stuff
- * so we don't have to.  Sigh...
- * @param p_type pointer type name
- * @param field  data field within the structure pointed to
- * @return offset
- */
-
-#if defined(CRAY) || (defined(__arm) && !defined(LINUX))
-#ifdef __STDC__
-#define APR_OFFSET(p_type,field) _Offsetof(p_type,field)
-#else
-#ifdef CRAY2
-#define APR_OFFSET(p_type,field) \
-        (sizeof(int)*((unsigned int)&(((p_type)NULL)->field)))
-
-#else /* !CRAY2 */
-
-#define APR_OFFSET(p_type,field) ((unsigned int)&(((p_type)NULL)->field))
-
-#endif /* !CRAY2 */
-#endif /* __STDC__ */
-#else /* ! (CRAY || __arm) */
-
-#define APR_OFFSET(p_type,field) \
-        ((long) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
-
-#endif /* !CRAY */
-
-/**
- * Finding offsets of elements within structures.
- * @param s_type structure type name
- * @param field  data field within the structure
- * @return offset
- */
-#if defined(offsetof) && !defined(__cplusplus)
-#define APR_OFFSETOF(s_type,field) offsetof(s_type,field)
-#else
-#define APR_OFFSETOF(s_type,field) APR_OFFSET(s_type*,field)
-#endif
-
-/** @deprecated @see APR_OFFSET */
-#define APR_XtOffset APR_OFFSET
-
-/** @deprecated @see APR_OFFSETOF */
-#define APR_XtOffsetOf APR_OFFSETOF
-
-#ifndef DOXYGEN
-
-/* A couple of prototypes for functions in case some platform doesn't 
- * have it
- */
-#if (!APR_HAVE_STRCASECMP) && (APR_HAVE_STRICMP) 
-#define strcasecmp(s1, s2) stricmp(s1, s2)
-#elif (!APR_HAVE_STRCASECMP)
-int strcasecmp(const char *a, const char *b);
-#endif
-
-#if (!APR_HAVE_STRNCASECMP) && (APR_HAVE_STRNICMP)
-#define strncasecmp(s1, s2, n) strnicmp(s1, s2, n)
-#elif (!APR_HAVE_STRNCASECMP)
-int strncasecmp(const char *a, const char *b, size_t n);
-#endif
-
-#endif
-
-/**
- * Alignment macros
- */
-
-/* APR_ALIGN() is only to be used to align on a power of 2 boundary */
-#define APR_ALIGN(size, boundary) \
-    (((size) + ((boundary) - 1)) & ~((boundary) - 1))
-
-/** Default alignment */
-#define APR_ALIGN_DEFAULT(size) APR_ALIGN(size, 8)
-
-
-/**
- * String and memory functions
- */
-
-/** Properly quote a value as a string in the C preprocessor */
-#define APR_STRINGIFY(n) APR_STRINGIFY_HELPER(n)
-/** Helper macro for APR_STRINGIFY */
-#define APR_STRINGIFY_HELPER(n) #n
-
-#if (!APR_HAVE_MEMMOVE)
-#define memmove(a,b,c) bcopy(b,a,c)
-#endif
-
-#if (!APR_HAVE_MEMCHR)
-void *memchr(const void *s, int c, size_t n);
-#endif
-
-/** @} */
-
-/**
- * @defgroup apr_library Library initialization and termination
- * @{
- */
-
-/**
- * Setup any APR internal data structures.  This MUST be the first function 
- * called for any APR library.
- * @remark See apr_app_initialize if this is an application, rather than
- * a library consumer of apr.
- */
-APR_DECLARE(apr_status_t) apr_initialize(void);
-
-/**
- * Set up an application with normalized argc, argv (and optionally env) in
- * order to deal with platform-specific oddities, such as Win32 services,
- * code pages and signals.  This must be the first function called for any
- * APR program.
- * @param argc Pointer to the argc that may be corrected
- * @param argv Pointer to the argv that may be corrected
- * @param env Pointer to the env that may be corrected, may be NULL
- * @remark See apr_initialize if this is a library consumer of apr.
- * Otherwise, this call is identical to apr_initialize, and must be closed
- * with a call to apr_terminate at the end of program execution.
- */
-APR_DECLARE(apr_status_t) apr_app_initialize(int *argc, 
-                                             char const * const * *argv, 
-                                             char const * const * *env);
-
-/**
- * Tear down any APR internal data structures which aren't torn down 
- * automatically.
- * @remark An APR program must call this function at termination once it 
- *         has stopped using APR services.  The APR developers suggest using
- *         atexit to ensure this is called.  When using APR from a language
- *         other than C that has problems with the calling convention, use
- *         apr_terminate2() instead.
- */
-APR_DECLARE_NONSTD(void) apr_terminate(void);
-
-/**
- * Tear down any APR internal data structures which aren't torn down 
- * automatically, same as apr_terminate
- * @remark An APR program must call either the apr_terminate or apr_terminate2 
- *         function once it it has finished using APR services.  The APR 
- *         developers suggest using atexit(apr_terminate) to ensure this is done.
- *         apr_terminate2 exists to allow non-c language apps to tear down apr, 
- *         while apr_terminate is recommended from c language applications.
- */
-APR_DECLARE(void) apr_terminate2(void);
-
-/** @} */
-
-/**
- * @defgroup apr_random Random Functions
- * @{
- */
-
-#if APR_HAS_RANDOM || defined(DOXYGEN)
-
-/* TODO: I'm not sure this is the best place to put this prototype...*/
-/**
- * Generate random bytes.
- * @param buf Buffer to fill with random bytes
- * @param length Length of buffer in bytes (becomes apr_size_t in APR 1.0)
- */
-#ifdef APR_ENABLE_FOR_1_0
-APR_DECLARE(apr_status_t) apr_generate_random_bytes(unsigned char * buf, 
-                                                    apr_size_t length);
-#else
-APR_DECLARE(apr_status_t) apr_generate_random_bytes(unsigned char * buf, 
-                                                    int length);
-#endif
-
-#endif
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ! APR_GENERAL_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_getopt.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_getopt.h
deleted file mode 100644
index 131aa4b3..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_getopt.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_GETOPT_H
-#define APR_GETOPT_H
-
-/**
- * @file apr_getopt.h
- * @brief APR Command Arguments (getopt)
- */
-
-#include "apr_pools.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup apr_getopt Command Argument Parsing
- * @ingroup APR 
- * @{
- */
-
-/** 
- * defintion of a error function 
- */
-typedef void (apr_getopt_err_fn_t)(void *arg, const char *err, ...);
-
-/** @see apr_getopt_t */
-typedef struct apr_getopt_t apr_getopt_t;
-
-/**
- * Structure to store command line argument information.
- */ 
-struct apr_getopt_t {
-    /** context for processing */
-    apr_pool_t *cont;
-    /** function to print error message (NULL == no messages) */
-    apr_getopt_err_fn_t *errfn;
-    /** user defined first arg to pass to error message  */
-    void *errarg;
-    /** index into parent argv vector */
-    int ind;
-    /** character checked for validity */
-    int opt;
-    /** reset getopt */
-    int reset;
-    /** count of arguments */
-    int argc;
-    /** array of pointers to arguments */
-    const char **argv;
-    /** argument associated with option */
-    char const* place;
-    /** set to nonzero to support interleaving options with regular args */
-    int interleave;
-    /** start of non-option arguments skipped for interleaving */
-    int skip_start;
-    /** end of non-option arguments skipped for interleaving */
-    int skip_end;
-};
-
-/** @see apr_getopt_option_t */
-typedef struct apr_getopt_option_t apr_getopt_option_t;
-
-/**
- * Structure used to describe options that getopt should search for.
- */
-struct apr_getopt_option_t {
-    /** long option name, or NULL if option has no long name */
-    const char *name;
-    /** option letter, or a value greater than 255 if option has no letter */
-    int optch;
-    /** nonzero if option takes an argument */
-    int has_arg;
-    /** a description of the option */
-    const char *description;
-};
-
-/**
- * Initialize the arguments for parsing by apr_getopt().
- * @param os   The options structure created for apr_getopt()
- * @param cont The pool to operate on
- * @param argc The number of arguments to parse
- * @param argv The array of arguments to parse
- * @remark Arguments 2 and 3 are most commonly argc and argv from main(argc, argv)
- * The errfn is initialized to fprintf(stderr... but may be overridden.
- */
-APR_DECLARE(apr_status_t) apr_getopt_init(apr_getopt_t **os, apr_pool_t *cont,
-                                      int argc, const char * const *argv);
-
-/**
- * Parse the options initialized by apr_getopt_init().
- * @param os     The apr_opt_t structure returned by apr_getopt_init()
- * @param opts   A string of characters that are acceptable options to the 
- *               program.  Characters followed by ":" are required to have an 
- *               option associated
- * @param option_ch  The next option character parsed
- * @param option_arg The argument following the option character:
- * @return There are four potential status values on exit. They are:
- * <PRE>
- *             APR_EOF      --  No more options to parse
- *             APR_BADCH    --  Found a bad option character
- *             APR_BADARG   --  No argument followed the option flag
- *             APR_SUCCESS  --  The next option was found.
- * </PRE>
- */
-APR_DECLARE(apr_status_t) apr_getopt(apr_getopt_t *os, const char *opts, 
-                                     char *option_ch, const char **option_arg);
-
-/**
- * Parse the options initialized by apr_getopt_init(), accepting long
- * options beginning with "--" in addition to single-character
- * options beginning with "-".
- * @param os     The apr_getopt_t structure created by apr_getopt_init()
- * @param opts   A pointer to a list of apr_getopt_option_t structures, which
- *               can be initialized with { "name", optch, has_args }.  has_args
- *               is nonzero if the option requires an argument.  A structure
- *               with an optch value of 0 terminates the list.
- * @param option_ch  Receives the value of "optch" from the apr_getopt_option_t
- *                   structure corresponding to the next option matched.
- * @param option_arg Receives the argument following the option, if any.
- * @return There are four potential status values on exit.   They are:
- * <PRE>
- *             APR_EOF      --  No more options to parse
- *             APR_BADCH    --  Found a bad option character
- *             APR_BADARG   --  No argument followed the option flag
- *             APR_SUCCESS  --  The next option was found.
- * </PRE>
- * When APR_SUCCESS is returned, os->ind gives the index of the first
- * non-option argument.  On error, a message will be printed to stdout unless
- * os->err is set to 0.  If os->interleave is set to nonzero, options can come
- * after arguments, and os->argv will be permuted to leave non-option arguments
- * at the end (the original argv is unaffected).
- */
-APR_DECLARE(apr_status_t) apr_getopt_long(apr_getopt_t *os,
-					  const apr_getopt_option_t *opts,
-					  int *option_ch,
-                                          const char **option_arg);
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ! APR_GETOPT_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_global_mutex.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_global_mutex.h
deleted file mode 100644
index 9316001c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_global_mutex.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_GLOBAL_MUTEX_H
-#define APR_GLOBAL_MUTEX_H
-
-/**
- * @file apr_global_mutex.h
- * @brief APR Global Locking Routines
- */
-
-#include "apr.h"
-#include "apr_proc_mutex.h"    /* only for apr_lockmech_e */
-#include "apr_pools.h"
-#include "apr_errno.h"
-#if APR_PROC_MUTEX_IS_GLOBAL
-#include "apr_proc_mutex.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup APR_GlobalMutex Global Locking Routines
- * @ingroup APR 
- * @{
- */
-
-#if !APR_PROC_MUTEX_IS_GLOBAL || defined(DOXYGEN)
-
-/** Opaque global mutex structure. */
-typedef struct apr_global_mutex_t apr_global_mutex_t;
-
-/*   Function definitions */
-
-/**
- * Create and initialize a mutex that can be used to synchronize both
- * processes and threads. Note: There is considerable overhead in using
- * this API if only cross-process or cross-thread mutual exclusion is
- * required. See apr_proc_mutex.h and apr_thread_mutex.h for more
- * specialized lock routines.
- * @param mutex the memory address where the newly created mutex will be
- *        stored.
- * @param fname A file name to use if the lock mechanism requires one.  This
- *        argument should always be provided.  The lock code itself will
- *        determine if it should be used.
- * @param mech The mechanism to use for the interprocess lock, if any; one of
- * <PRE>
- *            APR_LOCK_FCNTL
- *            APR_LOCK_FLOCK
- *            APR_LOCK_SYSVSEM
- *            APR_LOCK_POSIXSEM
- *            APR_LOCK_PROC_PTHREAD
- *            APR_LOCK_DEFAULT     pick the default mechanism for the platform
- * </PRE>
- * @param pool the pool from which to allocate the mutex.
- * @warning Check APR_HAS_foo_SERIALIZE defines to see if the platform supports
- *          APR_LOCK_foo.  Only APR_LOCK_DEFAULT is portable.
- */
-APR_DECLARE(apr_status_t) apr_global_mutex_create(apr_global_mutex_t **mutex,
-                                                  const char *fname,
-                                                  apr_lockmech_e mech,
-                                                  apr_pool_t *pool);
-
-/**
- * Re-open a mutex in a child process.
- * @param mutex The newly re-opened mutex structure.
- * @param fname A file name to use if the mutex mechanism requires one.  This
- *              argument should always be provided.  The mutex code itself will
- *              determine if it should be used.  This filename should be the 
- *              same one that was passed to apr_global_mutex_create().
- * @param pool The pool to operate on.
- * @remark This function must be called to maintain portability, even
- *         if the underlying lock mechanism does not require it.
- */
-APR_DECLARE(apr_status_t) apr_global_mutex_child_init(
-                              apr_global_mutex_t **mutex,
-                              const char *fname,
-                              apr_pool_t *pool);
-
-/**
- * Acquire the lock for the given mutex. If the mutex is already locked,
- * the current thread will be put to sleep until the lock becomes available.
- * @param mutex the mutex on which to acquire the lock.
- */
-APR_DECLARE(apr_status_t) apr_global_mutex_lock(apr_global_mutex_t *mutex);
-
-/**
- * Attempt to acquire the lock for the given mutex. If the mutex has already
- * been acquired, the call returns immediately with APR_EBUSY. Note: it
- * is important that the APR_STATUS_IS_EBUSY(s) macro be used to determine
- * if the return value was APR_EBUSY, for portability reasons.
- * @param mutex the mutex on which to attempt the lock acquiring.
- */
-APR_DECLARE(apr_status_t) apr_global_mutex_trylock(apr_global_mutex_t *mutex);
-
-/**
- * Release the lock for the given mutex.
- * @param mutex the mutex from which to release the lock.
- */
-APR_DECLARE(apr_status_t) apr_global_mutex_unlock(apr_global_mutex_t *mutex);
-
-/**
- * Destroy the mutex and free the memory associated with the lock.
- * @param mutex the mutex to destroy.
- */
-APR_DECLARE(apr_status_t) apr_global_mutex_destroy(apr_global_mutex_t *mutex);
-
-/**
- * Get the pool used by this global_mutex.
- * @return apr_pool_t the pool
- */
-APR_POOL_DECLARE_ACCESSOR(global_mutex);
-
-#else /* APR_PROC_MUTEX_IS_GLOBAL */
-
-/* Some platforms [e.g. Win32] have cross process locks that are truly
- * global locks, since there isn't the concept of cross-process locks.
- * Define these platforms in terms of an apr_proc_mutex_t.
- */
-
-#define apr_global_mutex_t          apr_proc_mutex_t
-#define apr_global_mutex_create     apr_proc_mutex_create
-#define apr_global_mutex_child_init apr_proc_mutex_child_init
-#define apr_global_mutex_lock       apr_proc_mutex_lock
-#define apr_global_mutex_trylock    apr_proc_mutex_trylock
-#define apr_global_mutex_unlock     apr_proc_mutex_unlock
-#define apr_global_mutex_destroy    apr_proc_mutex_destroy
-#define apr_global_mutex_pool_get   apr_proc_mutex_pool_get
-
-#endif
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ndef APR_GLOBAL_MUTEX_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_hash.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_hash.h
deleted file mode 100644
index 87795c4a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_hash.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_HASH_H
-#define APR_HASH_H
-
-/**
- * @file apr_hash.h
- * @brief APR Hash Tables
- */
-
-#include "apr_pools.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @defgroup apr_hash Hash Tables
- * @ingroup APR 
- * @{
- */
-
-/**
- * When passing a key to apr_hash_set or apr_hash_get, this value can be
- * passed to indicate a string-valued key, and have apr_hash compute the
- * length automatically.
- *
- * @remark apr_hash will use strlen(key) for the length. The null-terminator
- *         is not included in the hash value (why throw a constant in?).
- *         Since the hash table merely references the provided key (rather
- *         than copying it), apr_hash_this() will return the null-term'd key.
- */
-#define APR_HASH_KEY_STRING     (-1)
-
-/**
- * Abstract type for hash tables.
- */
-typedef struct apr_hash_t apr_hash_t;
-
-/**
- * Abstract type for scanning hash tables.
- */
-typedef struct apr_hash_index_t apr_hash_index_t;
-
-/**
- * Create a hash table.
- * @param pool The pool to allocate the hash table out of
- * @return The hash table just created
-  */
-APR_DECLARE(apr_hash_t *) apr_hash_make(apr_pool_t *pool);
-
-/**
- * Make a copy of a hash table
- * @param pool The pool from which to allocate the new hash table
- * @param h The hash table to clone
- * @return The hash table just created
- * @remark Makes a shallow copy
- */
-APR_DECLARE(apr_hash_t *) apr_hash_copy(apr_pool_t *pool,
-                                        const apr_hash_t *h);
-
-/**
- * Associate a value with a key in a hash table.
- * @param ht The hash table
- * @param key Pointer to the key
- * @param klen Length of the key. Can be APR_HASH_KEY_STRING to use the string length.
- * @param val Value to associate with the key
- * @remark If the value is NULL the hash entry is deleted.
- */
-APR_DECLARE(void) apr_hash_set(apr_hash_t *ht, const void *key,
-                               apr_ssize_t klen, const void *val);
-
-/**
- * Look up the value associated with a key in a hash table.
- * @param ht The hash table
- * @param key Pointer to the key
- * @param klen Length of the key. Can be APR_HASH_KEY_STRING to use the string length.
- * @return Returns NULL if the key is not present.
- */
-APR_DECLARE(void *) apr_hash_get(apr_hash_t *ht, const void *key,
-                                 apr_ssize_t klen);
-
-/**
- * Start iterating over the entries in a hash table.
- * @param p The pool to allocate the apr_hash_index_t iterator. If this
- *          pool is NULL, then an internal, non-thread-safe iterator is used.
- * @param ht The hash table
- * @remark  There is no restriction on adding or deleting hash entries during
- * an iteration (although the results may be unpredictable unless all you do
- * is delete the current entry) and multiple iterations can be in
- * progress at the same time.
-
- * @example
- */
-/**
- * <PRE>
- * 
- * int sum_values(apr_pool_t *p, apr_hash_t *ht)
- * {
- *     apr_hash_index_t *hi;
- *     void *val;
- *     int sum = 0;
- *     for (hi = apr_hash_first(p, ht); hi; hi = apr_hash_next(hi)) {
- *         apr_hash_this(hi, NULL, NULL, &val);
- *         sum += *(int *)val;
- *     }
- *     return sum;
- * }
- * </PRE>
- */
-APR_DECLARE(apr_hash_index_t *) apr_hash_first(apr_pool_t *p, apr_hash_t *ht);
-
-/**
- * Continue iterating over the entries in a hash table.
- * @param hi The iteration state
- * @return a pointer to the updated iteration state.  NULL if there are no more  
- *         entries.
- */
-APR_DECLARE(apr_hash_index_t *) apr_hash_next(apr_hash_index_t *hi);
-
-/**
- * Get the current entry's details from the iteration state.
- * @param hi The iteration state
- * @param key Return pointer for the pointer to the key.
- * @param klen Return pointer for the key length.
- * @param val Return pointer for the associated value.
- * @remark The return pointers should point to a variable that will be set to the
- *         corresponding data, or they may be NULL if the data isn't interesting.
- */
-APR_DECLARE(void) apr_hash_this(apr_hash_index_t *hi, const void **key, 
-                                apr_ssize_t *klen, void **val);
-
-/**
- * Get the number of key/value pairs in the hash table.
- * @param ht The hash table
- * @return The number of key/value pairs in the hash table.
- */
-APR_DECLARE(unsigned int) apr_hash_count(apr_hash_t *ht);
-
-/**
- * Merge two hash tables into one new hash table. The values of the overlay
- * hash override the values of the base if both have the same key.
- * @param p The pool to use for the new hash table
- * @param overlay The table to add to the initial table
- * @param base The table that represents the initial values of the new table
- * @return A new hash table containing all of the data from the two passed in
- */
-APR_DECLARE(apr_hash_t *) apr_hash_overlay(apr_pool_t *p,
-                                           const apr_hash_t *overlay, 
-                                           const apr_hash_t *base);
-
-/**
- * Merge two hash tables into one new hash table. If the same key
- * is present in both tables, call the supplied merge function to
- * produce a merged value for the key in the new table.
- * @param p The pool to use for the new hash table
- * @param h1 The first of the tables to merge
- * @param h2 The second of the tables to merge
- * @param merger A callback function to merge values, or NULL to
- *  make values from h1 override values from h2 (same semantics as
- *  apr_hash_overlay())
- * @param data Client data to pass to the merger function
- * @return A new hash table containing all of the data from the two passed in
- */
-APR_DECLARE(apr_hash_t *) apr_hash_merge(apr_pool_t *p,
-                                         const apr_hash_t *h1,
-                                         const apr_hash_t *h2,
-                                         void * (*merger)(apr_pool_t *p,
-                                                     const void *key,
-                                                     apr_ssize_t klen,
-                                                     const void *h1_val,
-                                                     const void *h2_val,
-                                                     const void *data),
-                                         const void *data);
-
-/**
- * Get a pointer to the pool which the hash table was created in
- */
-APR_POOL_DECLARE_ACCESSOR(hash);
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* !APR_HASH_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_inherit.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_inherit.h
deleted file mode 100644
index b7f7480f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_inherit.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_INHERIT_H
-#define APR_INHERIT_H
-
-/**
- * @file apr_inherit.h 
- * @brief APR File Handle Inheritance Helpers
- * @remark This internal header includes internal declaration helpers 
- * for other headers to declare apr_foo_inherit_[un]set functions.
- */
-
-/**
- * Prototype for type-specific declarations of apr_foo_inherit_set 
- * functions.  
- * @remark Doxygen unwraps this macro (via doxygen.conf) to provide 
- * actual help for each specific occurance of apr_foo_inherit_set.
- * @remark the linkage is specified for APR. It would be possible to expand
- *       the macros to support other linkages.
- */
-#define APR_DECLARE_INHERIT_SET(type) \
-    APR_DECLARE(apr_status_t) apr_##type##_inherit_set( \
-                                          apr_##type##_t *the##type)
-
-/**
- * Prototype for type-specific declarations of apr_foo_inherit_unset 
- * functions.  
- * @remark Doxygen unwraps this macro (via doxygen.conf) to provide 
- * actual help for each specific occurance of apr_foo_inherit_unset.
- * @remark the linkage is specified for APR. It would be possible to expand
- *       the macros to support other linkages.
- */
-#define APR_DECLARE_INHERIT_UNSET(type) \
-    APR_DECLARE(apr_status_t) apr_##type##_inherit_unset( \
-                                          apr_##type##_t *the##type)
-
-#endif	/* ! APR_INHERIT_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_lib.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_lib.h
deleted file mode 100644
index 2d9ce534..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_lib.h
+++ /dev/null
@@ -1,228 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_LIB_H
-#define APR_LIB_H
-
-/**
- * @file apr_lib.h
- * This is collection of oddballs that didn't fit anywhere else,
- * and might move to more appropriate headers with the release
- * of APR 1.0.
- * @brief APR general purpose library routines
- */
-
-#include "apr.h"
-#include "apr_errno.h"
-
-#if APR_HAVE_CTYPE_H
-#include <ctype.h>
-#endif
-#if APR_HAVE_STDARG_H
-#include <stdarg.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup apr_lib General Purpose Library Routines
- * @ingroup APR 
- * This is collection of oddballs that didn't fit anywhere else,
- * and might move to more appropriate headers with the release
- * of APR 1.0.
- * @{
- */
-
-/** A constant representing a 'large' string. */
-#define HUGE_STRING_LEN 8192
-
-/*
- * Define the structures used by the APR general-purpose library.
- */
-
-/** @see apr_vformatter_buff_t */
-typedef struct apr_vformatter_buff_t apr_vformatter_buff_t;
-
-/**
- * Structure used by the variable-formatter routines.
- */
-struct apr_vformatter_buff_t {
-    /** The current position */
-    char *curpos;
-    /** The end position of the format string */
-    char *endpos;
-};
-
-/**
- * return the final element of the pathname
- * @param pathname The path to get the final element of
- * @return the final element of the path
- * @remark
- * <PRE>
- * For example:
- *                 "/foo/bar/gum"    -> "gum"
- *                 "/foo/bar/gum/"   -> ""
- *                 "gum"             -> "gum"
- *                 "bs\\path\\stuff" -> "stuff"
- * </PRE>
- */
-APR_DECLARE(const char *) apr_filepath_name_get(const char *pathname);
-
-/** @deprecated @see apr_filepath_name_get */
-APR_DECLARE(const char *) apr_filename_of_pathname(const char *pathname);
-
-/**
- * apr_killpg
- * Small utility macros to make things easier to read.  Not usually a
- * goal, to be sure..
- */
-
-#ifdef WIN32
-#define apr_killpg(x, y)
-#else /* WIN32 */
-#ifdef NO_KILLPG
-#define apr_killpg(x, y)        (kill (-(x), (y)))
-#else /* NO_KILLPG */
-#define apr_killpg(x, y)        (killpg ((x), (y)))
-#endif /* NO_KILLPG */
-#endif /* WIN32 */
-
-/**
- * apr_vformatter() is a generic printf-style formatting routine
- * with some extensions.
- * @param flush_func The function to call when the buffer is full
- * @param c The buffer to write to
- * @param fmt The format string
- * @param ap The arguments to use to fill out the format string.
- *
- * @remark
- * <PRE>
- * The extensions are:
- *
- * %%pA	takes a struct in_addr *, and prints it as a.b.c.d
- * %%pI	takes an apr_sockaddr_t * and prints it as a.b.c.d:port or
- *      [ipv6-address]:port
- * %%pT takes an apr_os_thread_t * and prints it in decimal
- *      ('0' is printed if !APR_HAS_THREADS)
- * %%pp takes a void * and outputs it in hex
- *
- * The %%p hacks are to force gcc's printf warning code to skip
- * over a pointer argument without complaining.  This does
- * mean that the ANSI-style %%p (output a void * in hex format) won't
- * work as expected at all, but that seems to be a fair trade-off
- * for the increased robustness of having printf-warnings work.
- *
- * Additionally, apr_vformatter allows for arbitrary output methods
- * using the apr_vformatter_buff and flush_func.
- *
- * The apr_vformatter_buff has two elements curpos and endpos.
- * curpos is where apr_vformatter will write the next byte of output.
- * It proceeds writing output to curpos, and updating curpos, until
- * either the end of output is reached, or curpos == endpos (i.e. the
- * buffer is full).
- *
- * If the end of output is reached, apr_vformatter returns the
- * number of bytes written.
- *
- * When the buffer is full, the flush_func is called.  The flush_func
- * can return -1 to indicate that no further output should be attempted,
- * and apr_vformatter will return immediately with -1.  Otherwise
- * the flush_func should flush the buffer in whatever manner is
- * appropriate, re apr_pool_t nitialize curpos and endpos, and return 0.
- *
- * Note that flush_func is only invoked as a result of attempting to
- * write another byte at curpos when curpos >= endpos.  So for
- * example, it's possible when the output exactly matches the buffer
- * space available that curpos == endpos will be true when
- * apr_vformatter returns.
- *
- * apr_vformatter does not call out to any other code, it is entirely
- * self-contained.  This allows the callers to do things which are
- * otherwise "unsafe".  For example, apr_psprintf uses the "scratch"
- * space at the unallocated end of a block, and doesn't actually
- * complete the allocation until apr_vformatter returns.  apr_psprintf
- * would be completely broken if apr_vformatter were to call anything
- * that used this same pool.  Similarly http_bprintf() uses the "scratch"
- * space at the end of its output buffer, and doesn't actually note
- * that the space is in use until it either has to flush the buffer
- * or until apr_vformatter returns.
- * </PRE>
- */
-APR_DECLARE(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *b),
-			        apr_vformatter_buff_t *c, const char *fmt,
-			        va_list ap);
-
-/**
- * Display a prompt and read in the password from stdin.
- * @param prompt The prompt to display
- * @param pwbuf Buffer to store the password
- * @param bufsize The length of the password buffer.
- */
-APR_DECLARE(apr_status_t) apr_password_get(const char *prompt, char *pwbuf, 
-                                           apr_size_t *bufsize);
-
-/** @} */
-
-/**
- * @defgroup apr_ctype ctype functions
- * These macros allow correct support of 8-bit characters on systems which
- * support 8-bit characters.  Pretty dumb how the cast is required, but
- * that's legacy libc for ya.  These new macros do not support EOF like
- * the standard macros do.  Tough.
- * @{
- */
-/** @see isalnum */
-#define apr_isalnum(c) (isalnum(((unsigned char)(c))))
-/** @see isalpha */
-#define apr_isalpha(c) (isalpha(((unsigned char)(c))))
-/** @see iscntrl */
-#define apr_iscntrl(c) (iscntrl(((unsigned char)(c))))
-/** @see isdigit */
-#define apr_isdigit(c) (isdigit(((unsigned char)(c))))
-/** @see isgraph */
-#define apr_isgraph(c) (isgraph(((unsigned char)(c))))
-/** @see islower*/
-#define apr_islower(c) (islower(((unsigned char)(c))))
-/** @see isascii */
-#ifdef isascii
-#define apr_isascii(c) (isascii(((unsigned char)(c))))
-#else
-#define apr_isascii(c) (((c) & ~0x7f)==0)
-#endif
-/** @see isprint */
-#define apr_isprint(c) (isprint(((unsigned char)(c))))
-/** @see ispunct */
-#define apr_ispunct(c) (ispunct(((unsigned char)(c))))
-/** @see isspace */
-#define apr_isspace(c) (isspace(((unsigned char)(c))))
-/** @see isupper */
-#define apr_isupper(c) (isupper(((unsigned char)(c))))
-/** @see isxdigit */
-#define apr_isxdigit(c) (isxdigit(((unsigned char)(c))))
-/** @see tolower */
-#define apr_tolower(c) (tolower(((unsigned char)(c))))
-/** @see toupper */
-#define apr_toupper(c) (toupper(((unsigned char)(c))))
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* ! APR_LIB_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_mmap.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_mmap.h
deleted file mode 100644
index 3070acca..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_mmap.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_MMAP_H
-#define APR_MMAP_H
-
-/**
- * @file apr_mmap.h
- * @brief APR MMAP routines
- */
-
-#include "apr.h"
-#include "apr_pools.h"
-#include "apr_errno.h"
-#include "apr_ring.h"
-#include "apr_file_io.h"        /* for apr_file_t */
-
-#ifdef BEOS
-#include <kernel/OS.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup apr_mmap MMAP (Memory Map) Routines
- * @ingroup APR 
- * @{
- */
-
-/** MMap opened for reading */
-#define APR_MMAP_READ    1
-/** MMap opened for writing */
-#define APR_MMAP_WRITE   2
-
-/** @see apr_mmap_t */
-typedef struct apr_mmap_t            apr_mmap_t;
-
-/**
- * @remark
- * As far as I can tell the only really sane way to store an MMAP is as a
- * void * and a length.  BeOS requires this area_id, but that's just a little
- * something extra.  I am exposing this type, because it doesn't make much
- * sense to keep it private, and opening it up makes some stuff easier in
- * Apache.
- */
-/** The MMAP structure */
-struct apr_mmap_t {
-    /** The pool the mmap structure was allocated out of. */
-    apr_pool_t *cntxt;
-#ifdef BEOS
-    /** An area ID.  Only valid on BeOS */
-    area_id area;
-#endif
-#ifdef WIN32
-    /** The handle of the file mapping */
-    HANDLE mhandle;
-    /** The start of the real memory page area (mapped view) */
-    void *mv;
-    /** The physical start, size and offset */
-    apr_off_t  pstart;
-    apr_size_t psize;
-    apr_off_t  poffset;
-#endif
-    /** The start of the memory mapped area */
-    void *mm;
-    /** The amount of data in the mmap */
-    apr_size_t size;
-    /** @deprecated this field is no longer used and will be removed
-     * in APR 1.0 */
-    int unused;
-    /** ring of apr_mmap_t's that reference the same
-     * mmap'ed region; acts in place of a reference count */
-    APR_RING_ENTRY(apr_mmap_t) link;
-};
-
-#if APR_HAS_MMAP || defined(DOXYGEN)
-
-/** @def APR_MMAP_THRESHOLD 
- * Files have to be at least this big before they're mmap()d.  This is to deal
- * with systems where the expense of doing an mmap() and an munmap() outweighs
- * the benefit for small files.  It shouldn't be set lower than 1.
- */
-#ifdef MMAP_THRESHOLD
-#  define APR_MMAP_THRESHOLD              MMAP_THRESHOLD
-#else
-#  ifdef SUNOS4
-#    define APR_MMAP_THRESHOLD            (8*1024)
-#  else
-#    define APR_MMAP_THRESHOLD            1
-#  endif /* SUNOS4 */
-#endif /* MMAP_THRESHOLD */
-
-/** @def APR_MMAP_LIMIT
- * Maximum size of MMap region
- */
-#ifdef MMAP_LIMIT
-#  define APR_MMAP_LIMIT                  MMAP_LIMIT
-#else
-#  define APR_MMAP_LIMIT                  (4*1024*1024)
-#endif /* MMAP_LIMIT */
-
-/** Can this file be MMaped */
-#define APR_MMAP_CANDIDATE(filelength) \
-    ((filelength >= APR_MMAP_THRESHOLD) && (filelength < APR_MMAP_LIMIT))
-
-/*   Function definitions */
-
-/** 
- * Create a new mmap'ed file out of an existing APR file.
- * @param newmmap The newly created mmap'ed file.
- * @param file The file turn into an mmap.
- * @param offset The offset into the file to start the data pointer at.
- * @param size The size of the file
- * @param flag bit-wise or of:
- * <PRE>
- *          APR_MMAP_READ       MMap opened for reading
- *          APR_MMAP_WRITE      MMap opened for writing
- * </PRE>
- * @param cntxt The pool to use when creating the mmap.
- */
-APR_DECLARE(apr_status_t) apr_mmap_create(apr_mmap_t **newmmap, 
-                                          apr_file_t *file, apr_off_t offset,
-                                          apr_size_t size, apr_int32_t flag,
-                                          apr_pool_t *cntxt);
-
-/**
- * Duplicate the specified MMAP.
- * @param new_mmap The structure to duplicate into. 
- * @param old_mmap The mmap to duplicate.
- * @param p The pool to use for new_mmap.
- * @param transfer_ownership DEPRECATED: this param is now ignored
- *  and should be removed prior to APR 1.0
- */         
-APR_DECLARE(apr_status_t) apr_mmap_dup(apr_mmap_t **new_mmap,
-                                       apr_mmap_t *old_mmap,
-                                       apr_pool_t *p,
-                                       int transfer_ownership);
-
-#if defined(DOXYGEN)
-/**
- * Transfer the specified MMAP to a different pool
- * @param new_mmap The structure to duplicate into.
- * @param old_mmap The file to transfer.
- * @param p The pool to use for new_mmap.
- * @deprecated Just use apr_mmap_dup().  The transfer_ownership flag will
- *  go away soon anyway.
- */
-APR_DECLARE(apr_status_t) apr_mmap_setaside(apr_mmap_t **new_mmap,
-                                            apr_mmap_t *old_mmap,
-                                            apr_pool_t *p);
-#else
-#define apr_mmap_setaside(new_mmap, old_mmap, p) apr_mmap_dup(new_mmap, old_mmap, p, 1)
-#endif /* DOXYGEN */
-
-/**
- * Remove a mmap'ed.
- * @param mm The mmap'ed file.
- */
-APR_DECLARE(apr_status_t) apr_mmap_delete(apr_mmap_t *mm);
-
-/** 
- * Move the pointer into the mmap'ed file to the specified offset.
- * @param addr The pointer to the offset specified.
- * @param mm The mmap'ed file.
- * @param offset The offset to move to.
- */
-APR_DECLARE(apr_status_t) apr_mmap_offset(void **addr, apr_mmap_t *mm, 
-                                          apr_off_t offset);
-
-#endif /* APR_HAS_MMAP */
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ! APR_MMAP_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_network_io.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_network_io.h
deleted file mode 100644
index 2bc6ef1e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_network_io.h
+++ /dev/null
@@ -1,845 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_NETWORK_IO_H
-#define APR_NETWORK_IO_H
-/**
- * @file apr_network_io.h
- * @brief APR Network library
- */
-
-#include "apr.h"
-#include "apr_pools.h"
-#include "apr_file_io.h"
-#include "apr_errno.h"
-#include "apr_inherit.h" 
-
-#if APR_HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup apr_network_io Network Routines
- * @ingroup APR 
- * @{
- */
-
-#ifndef APR_MAX_SECS_TO_LINGER
-/** Maximum seconds to linger */
-#define APR_MAX_SECS_TO_LINGER 30
-#endif
-
-#ifndef MAX_SECS_TO_LINGER
-/** @deprecated @see APR_MAX_SECS_TO_LINGER */
-#define MAX_SECS_TO_LINGER APR_MAX_SECS_TO_LINGER
-#endif
-
-#ifndef APRMAXHOSTLEN
-/** Maximum hostname length */
-#define APRMAXHOSTLEN 256
-#endif
-
-#ifndef APR_ANYADDR
-/** Default 'any' address */
-#define APR_ANYADDR "0.0.0.0"
-#endif
-
-/**
- * @defgroup apr_sockopt Socket option definitions
- * @{
- */
-#define APR_SO_LINGER        1    /**< Linger */
-#define APR_SO_KEEPALIVE     2    /**< Keepalive */
-#define APR_SO_DEBUG         4    /**< Debug */
-#define APR_SO_NONBLOCK      8    /**< Non-blocking IO */
-#define APR_SO_REUSEADDR     16   /**< Reuse addresses */
-#define APR_SO_TIMEOUT       32   /**< Timeout */
-#define APR_SO_SNDBUF        64   /**< Send buffer */
-#define APR_SO_RCVBUF        128  /**< Receive buffer */
-#define APR_SO_DISCONNECTED  256  /**< Disconnected */
-#define APR_TCP_NODELAY      512  /**< For SCTP sockets, this is mapped
-                                   * to STCP_NODELAY internally.
-                                   */
-#define APR_TCP_NOPUSH       1024 /**< No push */
-#define APR_RESET_NODELAY    2048 /**< This flag is ONLY set internally
-                                   * when we set APR_TCP_NOPUSH with
-                                   * APR_TCP_NODELAY set to tell us that
-                                   * APR_TCP_NODELAY should be turned on
-                                   * again when NOPUSH is turned off
-                                   */
-#define APR_INCOMPLETE_READ 4096  /**< Set on non-blocking sockets
-				   * (timeout != 0) on which the
-				   * previous read() did not fill a buffer
-				   * completely.  the next apr_socket_recv() 
-                                   * will first call select()/poll() rather than
-				   * going straight into read().  (Can also
-				   * be set by an application to force a
-				   * select()/poll() call before the next
-				   * read, in cases where the app expects
-				   * that an immediate read would fail.)
-				   */
-#define APR_INCOMPLETE_WRITE 8192 /**< like APR_INCOMPLETE_READ, but for write
-                                   * @see APR_INCOMPLETE_READ
-                                   */
-#define APR_IPV6_V6ONLY     16384 /**< Don't accept IPv4 connections on an
-                                   * IPv6 listening socket.
-                                   */
-
-/** @} */
-
-/** Define what type of socket shutdown should occur. */
-typedef enum {
-    APR_SHUTDOWN_READ,          /**< no longer allow read request */
-    APR_SHUTDOWN_WRITE,         /**< no longer allow write requests */
-    APR_SHUTDOWN_READWRITE      /**< no longer allow read or write requests */
-} apr_shutdown_how_e;
-
-#define APR_IPV4_ADDR_OK  0x01  /**< @see apr_sockaddr_info_get() */
-#define APR_IPV6_ADDR_OK  0x02  /**< @see apr_sockaddr_info_get() */
-
-#if (!APR_HAVE_IN_ADDR)
-/**
- * We need to make sure we always have an in_addr type, so APR will just
- * define it ourselves, if the platform doesn't provide it.
- */
-struct in_addr {
-    apr_uint32_t  s_addr; /**< storage to hold the IP# */
-};
-#endif
-
-/**
- * @def APR_INET
- * Not all platforms have these defined, so we'll define them here
- * The default values come from FreeBSD 4.1.1
- */
-#define APR_INET     AF_INET
-/** @def APR_UNSPEC
- * Let the system decide which address family to use
- */
-#ifdef AF_UNSPEC
-#define APR_UNSPEC   AF_UNSPEC
-#else
-#define APR_UNSPEC   0
-#endif
-#if APR_HAVE_IPV6
-#define APR_INET6    AF_INET6
-#endif
-
-/**
- * @defgroup IP_Proto IP Protocol Definitions for use when creating sockets
- * @{
- */
-#define APR_PROTO_TCP       6   /**< TCP  */
-#define APR_PROTO_UDP      17   /**< UDP  */
-#define APR_PROTO_SCTP    132   /**< SCTP */
-/** @} */
-
-/**
- * Enum to tell us if we're interested in remote or local socket
- */
-typedef enum {
-    APR_LOCAL,
-    APR_REMOTE
-} apr_interface_e;
-
-/**
- * The specific declaration of inet_addr's ... some platforms fall back
- * inet_network (this is not good, but necessary)
- */
-
-#if APR_HAVE_INET_ADDR
-#define apr_inet_addr    inet_addr
-#elif APR_HAVE_INET_NETWORK        /* only DGUX, as far as I know */
-/**
- * @warning
- * not generally safe... inet_network() and inet_addr() perform
- * different functions */
-#define apr_inet_addr    inet_network
-#endif
-
-/** A structure to represent sockets */
-typedef struct apr_socket_t     apr_socket_t;
-/**
- * A structure to encapsulate headers and trailers for apr_socket_sendfile
- */
-typedef struct apr_hdtr_t       apr_hdtr_t;
-/** A structure to represent in_addr */
-typedef struct in_addr          apr_in_addr_t;
-/** A structure to represent an IP subnet */
-typedef struct apr_ipsubnet_t apr_ipsubnet_t;
-
-/** @remark use apr_uint16_t just in case some system has a short that isn't 16 bits... */
-typedef apr_uint16_t            apr_port_t;
-
-/** @remark It's defined here as I think it should all be platform safe...
- * @see apr_sockaddr_t
- */
-typedef struct apr_sockaddr_t apr_sockaddr_t;
-/**
- * APRs socket address type, used to ensure protocol independence
- */
-struct apr_sockaddr_t {
-    /** The pool to use... */
-    apr_pool_t *pool;
-    /** The hostname */
-    char *hostname;
-    /** Either a string of the port number or the service name for the port */
-    char *servname;
-    /** The numeric port */
-    apr_port_t port;
-    /** The family */
-    apr_int32_t family;
-    /** Union of either IPv4 or IPv6 sockaddr. */
-    union {
-        /** IPv4 sockaddr structure */
-        struct sockaddr_in sin;
-#if APR_HAVE_IPV6
-        /** IPv6 sockaddr structure */
-        struct sockaddr_in6 sin6;
-#endif
-    } sa;
-    /** How big is the sockaddr we're using? */
-    apr_socklen_t salen;
-    /** How big is the ip address structure we're using? */
-    int ipaddr_len;
-    /** How big should the address buffer be?  16 for v4 or 46 for v6
-     *  used in inet_ntop... */
-    int addr_str_len;
-    /** This points to the IP address structure within the appropriate
-     *  sockaddr structure.  */
-    void *ipaddr_ptr;
-    /** If multiple addresses were found by apr_sockaddr_info_get(), this 
-     *  points to a representation of the next address. */
-    apr_sockaddr_t *next;
-};
-
-#if APR_HAS_SENDFILE
-/** 
- * Support reusing the socket on platforms which support it (from disconnect,
- * specifically Win32.
- * @remark Optional flag passed into apr_socket_sendfile() 
- */
-#define APR_SENDFILE_DISCONNECT_SOCKET      1
-#endif
-
-/** A structure to encapsulate headers and trailers for apr_socket_sendfile */
-struct apr_hdtr_t {
-    /** An iovec to store the headers sent before the file. */
-    struct iovec* headers;
-    /** number of headers in the iovec */
-    int numheaders;
-    /** An iovec to store the trailers sent after the file. */
-    struct iovec* trailers;
-    /** number of trailers in the iovec */
-    int numtrailers;
-};
-
-/* function definitions */
-
-/**
- * Create a socket.
- * @remark With APR 1.0, this function follows the prototype 
- * of apr_socket_create_ex.
- * @param new_sock The new socket that has been set up.
- * @param family The address family of the socket (e.g., APR_INET).
- * @param type The type of the socket (e.g., SOCK_STREAM).
- * @param cont The pool to use
- */
-APR_DECLARE(apr_status_t) apr_socket_create(apr_socket_t **new_sock, 
-                                            int family, int type,
-                                            apr_pool_t *cont);
-
-/**
- * Create a socket.
- * @remark With APR 1.0, this function is deprecated and apr_socket_create 
- * follows this prototype.
- * @param new_sock The new socket that has been set up.
- * @param family The address family of the socket (e.g., APR_INET).
- * @param type The type of the socket (e.g., SOCK_STREAM).
- * @param protocol The protocol of the socket (e.g., APR_PROTO_TCP).
- * @param cont The pool to use
- */
-APR_DECLARE(apr_status_t) apr_socket_create_ex(apr_socket_t **new_sock, 
-                                               int family, int type,
-                                               int protocol,
-                                               apr_pool_t *cont);
-
-/**
- * Shutdown either reading, writing, or both sides of a socket.
- * @param thesocket The socket to close 
- * @param how How to shutdown the socket.  One of:
- * <PRE>
- *            APR_SHUTDOWN_READ         no longer allow read requests
- *            APR_SHUTDOWN_WRITE        no longer allow write requests
- *            APR_SHUTDOWN_READWRITE    no longer allow read or write requests 
- * </PRE>
- * @see apr_shutdown_how_e
- * @remark This does not actually close the socket descriptor, it just
- *      controls which calls are still valid on the socket.
- */
-APR_DECLARE(apr_status_t) apr_socket_shutdown(apr_socket_t *thesocket,
-                                              apr_shutdown_how_e how);
-
-/** @deprecated @see apr_socket_shutdown */
-APR_DECLARE(apr_status_t) apr_shutdown(apr_socket_t *thesocket,
-                                       apr_shutdown_how_e how);
-
-/**
- * Close a socket.
- * @param thesocket The socket to close 
- */
-APR_DECLARE(apr_status_t) apr_socket_close(apr_socket_t *thesocket);
-
-/**
- * Bind the socket to its associated port
- * @param sock The socket to bind 
- * @param sa The socket address to bind to
- * @remark This may be where we will find out if there is any other process
- *      using the selected port.
- */
-APR_DECLARE(apr_status_t) apr_socket_bind(apr_socket_t *sock, 
-                                          apr_sockaddr_t *sa);
-
-/** @deprecated @see apr_socket_bind */
-APR_DECLARE(apr_status_t) apr_bind(apr_socket_t *sock, apr_sockaddr_t *sa);
-
-/**
- * Listen to a bound socket for connections.
- * @param sock The socket to listen on 
- * @param backlog The number of outstanding connections allowed in the sockets
- *                listen queue.  If this value is less than zero, the listen
- *                queue size is set to zero.  
- */
-APR_DECLARE(apr_status_t) apr_socket_listen(apr_socket_t *sock, 
-                                            apr_int32_t backlog);
-
-/** @deprecated @see apr_socket_listen */
-APR_DECLARE(apr_status_t) apr_listen(apr_socket_t *sock, apr_int32_t backlog);
-
-/**
- * Accept a new connection request
- * @param new_sock A copy of the socket that is connected to the socket that
- *                 made the connection request.  This is the socket which should
- *                 be used for all future communication.
- * @param sock The socket we are listening on.
- * @param connection_pool The pool for the new socket.
- */
-APR_DECLARE(apr_status_t) apr_socket_accept(apr_socket_t **new_sock, 
-                                            apr_socket_t *sock,
-                                            apr_pool_t *connection_pool);
-
-/** @deprecated @see apr_socket_accept */
-APR_DECLARE(apr_status_t) apr_accept(apr_socket_t **new_sock, 
-                                     apr_socket_t *sock,
-                                     apr_pool_t *connection_pool);
-
-/**
- * Issue a connection request to a socket either on the same machine 
- * or a different one.
- * @param sock The socket we wish to use for our side of the connection 
- * @param sa The address of the machine we wish to connect to.  If NULL,
- *           APR assumes that the sockaddr_in in the apr_socket is 
- *           completely filled out.
- */
-APR_DECLARE(apr_status_t) apr_socket_connect(apr_socket_t *sock,
-                                             apr_sockaddr_t *sa);
-
-/** @deprecated @see apr_socket_connect */
-APR_DECLARE(apr_status_t) apr_connect(apr_socket_t *sock, apr_sockaddr_t *sa);
-
-/**
- * Create apr_sockaddr_t from hostname, address family, and port.
- * @param sa The new apr_sockaddr_t.
- * @param hostname The hostname or numeric address string to resolve/parse, or
- *               NULL to build an address that corresponds to 0.0.0.0 or ::
- * @param family The address family to use, or APR_UNSPEC if the system should 
- *               decide.
- * @param port The port number.
- * @param flags Special processing flags:
- * <PRE>
- *       APR_IPV4_ADDR_OK          first query for IPv4 addresses; only look
- *                                 for IPv6 addresses if the first query failed;
- *                                 only valid if family is APR_UNSPEC and hostname
- *                                 isn't NULL; mutually exclusive with
- *                                 APR_IPV6_ADDR_OK
- *       APR_IPV6_ADDR_OK          first query for IPv6 addresses; only look
- *                                 for IPv4 addresses if the first query failed;
- *                                 only valid if family is APR_UNSPEC and hostname
- *                                 isn't NULL and APR_HAVE_IPV6; mutually exclusive
- *                                 with APR_IPV4_ADDR_OK
- * </PRE>
- * @param p The pool for the apr_sockaddr_t and associated storage.
- */
-APR_DECLARE(apr_status_t) apr_sockaddr_info_get(apr_sockaddr_t **sa,
-                                          const char *hostname,
-                                          apr_int32_t family,
-                                          apr_port_t port,
-                                          apr_int32_t flags,
-                                          apr_pool_t *p);
-
-/**
- * Look up the host name from an apr_sockaddr_t.
- * @param hostname The hostname.
- * @param sa The apr_sockaddr_t.
- * @param flags Special processing flags.
- */
-APR_DECLARE(apr_status_t) apr_getnameinfo(char **hostname,
-                                          apr_sockaddr_t *sa,
-                                          apr_int32_t flags);
-
-/**
- * Parse hostname/IP address with scope id and port.
- *
- * Any of the following strings are accepted:
- *   8080                  (just the port number)
- *   www.apache.org        (just the hostname)
- *   www.apache.org:8080   (hostname and port number)
- *   [fe80::1]:80          (IPv6 numeric address string only)
- *   [fe80::1%eth0]        (IPv6 numeric address string and scope id)
- *
- * Invalid strings:
- *                         (empty string)
- *   [abc]                 (not valid IPv6 numeric address string)
- *   abc:65536             (invalid port number)
- *
- * @param addr The new buffer containing just the hostname.  On output, *addr 
- *             will be NULL if no hostname/IP address was specfied.
- * @param scope_id The new buffer containing just the scope id.  On output, 
- *                 *scope_id will be NULL if no scope id was specified.
- * @param port The port number.  On output, *port will be 0 if no port was 
- *             specified.
- *             ### FIXME: 0 is a legal port (per RFC 1700). this should
- *             ### return something besides zero if the port is missing.
- * @param str The input string to be parsed.
- * @param p The pool from which *addr and *scope_id are allocated.
- * @remark If scope id shouldn't be allowed, check for scope_id != NULL in 
- *         addition to checking the return code.  If addr/hostname should be 
- *         required, check for addr == NULL in addition to checking the 
- *         return code.
- */
-APR_DECLARE(apr_status_t) apr_parse_addr_port(char **addr,
-                                              char **scope_id,
-                                              apr_port_t *port,
-                                              const char *str,
-                                              apr_pool_t *p);
-
-/**
- * Get name of the current machine
- * @param buf A buffer to store the hostname in.
- * @param len The maximum length of the hostname that can be stored in the
- *            buffer provided.  The suggested length is APRMAXHOSTLEN + 1.
- * @param cont The pool to use.
- * @remark If the buffer was not large enough, an error will be returned.
- */
-APR_DECLARE(apr_status_t) apr_gethostname(char *buf, int len, apr_pool_t *cont);
-
-/**
- * Return the data associated with the current socket
- * @param data The user data associated with the socket.
- * @param key The key to associate with the user data.
- * @param sock The currently open socket.
- */
-APR_DECLARE(apr_status_t) apr_socket_data_get(void **data, const char *key,
-                                              apr_socket_t *sock);
-
-/**
- * Set the data associated with the current socket.
- * @param sock The currently open socket.
- * @param data The user data to associate with the socket.
- * @param key The key to associate with the data.
- * @param cleanup The cleanup to call when the socket is destroyed.
- */
-APR_DECLARE(apr_status_t) apr_socket_data_set(apr_socket_t *sock, void *data,
-                                              const char *key,
-                                              apr_status_t (*cleanup)(void*));
-
-/**
- * Send data over a network.
- * @param sock The socket to send the data over.
- * @param buf The buffer which contains the data to be sent. 
- * @param len On entry, the number of bytes to send; on exit, the number
- *            of bytes sent.
- * @remark
- * <PRE>
- * This functions acts like a blocking write by default.  To change 
- * this behavior, use apr_socket_timeout_set().
- *
- * It is possible for both bytes to be sent and an error to be returned.
- *
- * APR_EINTR is never returned.
- * </PRE>
- */
-APR_DECLARE(apr_status_t) apr_socket_send(apr_socket_t *sock, const char *buf, 
-                                          apr_size_t *len);
-
-/** @deprecated @see apr_socket_send */
-APR_DECLARE(apr_status_t) apr_send(apr_socket_t *sock, const char *buf, 
-                                   apr_size_t *len);
-
-/**
- * Send multiple packets of data over a network.
- * @param sock The socket to send the data over.
- * @param vec The array of iovec structs containing the data to send 
- * @param nvec The number of iovec structs in the array
- * @param len Receives the number of bytes actually written
- * @remark
- * <PRE>
- * This functions acts like a blocking write by default.  To change 
- * this behavior, use apr_socket_timeout_set().
- * The number of bytes actually sent is stored in argument 3.
- *
- * It is possible for both bytes to be sent and an error to be returned.
- *
- * APR_EINTR is never returned.
- * </PRE>
- */
-APR_DECLARE(apr_status_t) apr_socket_sendv(apr_socket_t *sock, 
-                                           const struct iovec *vec,
-                                           apr_int32_t nvec, apr_size_t *len);
-
-/** @deprecated @see apr_socket_sendv */
-APR_DECLARE(apr_status_t) apr_sendv(apr_socket_t *sock, 
-                                    const struct iovec *vec,
-                                    apr_int32_t nvec, apr_size_t *len);
-
-/**
- * @param sock The socket to send from
- * @param where The apr_sockaddr_t describing where to send the data
- * @param flags The flags to use
- * @param buf  The data to send
- * @param len  The length of the data to send
- */
-APR_DECLARE(apr_status_t) apr_socket_sendto(apr_socket_t *sock, 
-                                            apr_sockaddr_t *where,
-                                            apr_int32_t flags, const char *buf, 
-                                            apr_size_t *len);
-
-/** @deprecated @see apr_socket_sendto */
-APR_DECLARE(apr_status_t) apr_sendto(apr_socket_t *sock, apr_sockaddr_t *where,
-                                     apr_int32_t flags, const char *buf, 
-                                     apr_size_t *len);
-
-/**
- * @param from The apr_sockaddr_t to fill in the recipient info
- * @param sock The socket to use
- * @param flags The flags to use
- * @param buf  The buffer to use
- * @param len  The length of the available buffer
- */
-
-APR_DECLARE(apr_status_t) apr_socket_recvfrom(apr_sockaddr_t *from, 
-                                              apr_socket_t *sock,
-                                              apr_int32_t flags, char *buf, 
-                                              apr_size_t *len);
- 
-/** @deprecated @see apr_socket_recvfrom */
-APR_DECLARE(apr_status_t) apr_recvfrom(apr_sockaddr_t *from, apr_socket_t *sock,
-                                       apr_int32_t flags, char *buf, 
-                                       apr_size_t *len);
-
-#if APR_HAS_SENDFILE || defined(DOXYGEN)
-
-/**
- * Send a file from an open file descriptor to a socket, along with 
- * optional headers and trailers
- * @param sock The socket to which we're writing
- * @param file The open file from which to read
- * @param hdtr A structure containing the headers and trailers to send
- * @param offset Offset into the file where we should begin writing
- * @param len (input)  - Number of bytes to send from the file 
- *            (output) - Number of bytes actually sent, 
- *                       including headers, file, and trailers
- * @param flags APR flags that are mapped to OS specific flags
- * @remark This functions acts like a blocking write by default.  To change 
- *         this behavior, use apr_socket_timeout_set().
- *         The number of bytes actually sent is stored in argument 5.
- */
-APR_DECLARE(apr_status_t) apr_socket_sendfile(apr_socket_t *sock, 
-                                              apr_file_t *file,
-                                              apr_hdtr_t *hdtr,
-                                              apr_off_t *offset,
-                                              apr_size_t *len,
-                                              apr_int32_t flags);
-
-/** @deprecated @see apr_socket_sendfile */
-APR_DECLARE(apr_status_t) apr_sendfile(apr_socket_t *sock, apr_file_t *file,
-                                       apr_hdtr_t *hdtr, apr_off_t *offset,
-                                       apr_size_t *len, apr_int32_t flags);
-
-#endif /* APR_HAS_SENDFILE */
-
-/**
- * Read data from a network.
- * @param sock The socket to read the data from.
- * @param buf The buffer to store the data in. 
- * @param len On entry, the number of bytes to receive; on exit, the number
- *            of bytes received.
- * @remark
- * <PRE>
- * This functions acts like a blocking read by default.  To change 
- * this behavior, use apr_socket_timeout_set().
- * The number of bytes actually sent is stored in argument 3.
- *
- * It is possible for both bytes to be received and an APR_EOF or
- * other error to be returned.
- *
- * APR_EINTR is never returned.
- * </PRE>
- */
-APR_DECLARE(apr_status_t) apr_socket_recv(apr_socket_t *sock, 
-                                   char *buf, apr_size_t *len);
-
-/** @deprecated @see apr_socket_recv */
-APR_DECLARE(apr_status_t) apr_recv(apr_socket_t *sock, 
-                                   char *buf, apr_size_t *len);
-
-/**
- * Setup socket options for the specified socket
- * @param sock The socket to set up.
- * @param opt The option we would like to configure.  One of:
- * <PRE>
- *            APR_SO_DEBUG      --  turn on debugging information 
- *            APR_SO_KEEPALIVE  --  keep connections active
- *            APR_SO_LINGER     --  lingers on close if data is present
- *            APR_SO_NONBLOCK   --  Turns blocking on/off for socket
- *            APR_SO_REUSEADDR  --  The rules used in validating addresses
- *                                  supplied to bind should allow reuse
- *                                  of local addresses.
- *            APR_SO_SNDBUF     --  Set the SendBufferSize
- *            APR_SO_RCVBUF     --  Set the ReceiveBufferSize
- * </PRE>
- * @param on Value for the option.
- */
-APR_DECLARE(apr_status_t) apr_socket_opt_set(apr_socket_t *sock,
-                                             apr_int32_t opt, apr_int32_t on);
-
-/** @deprecated @see apr_socket_opt_set */
-APR_DECLARE(apr_status_t) apr_setsocketopt(apr_socket_t *sock,
-                                           apr_int32_t opt, apr_int32_t on);
-
-/**
- * Setup socket timeout for the specified socket
- * @param sock The socket to set up.
- * @param t Value for the timeout.
- * <PRE>
- *   t > 0  -- read and write calls return APR_TIMEUP if specified time
- *             elapsess with no data read or written
- *   t == 0 -- read and write calls never block
- *   t < 0  -- read and write calls block
- * </PRE>
- */
-APR_DECLARE(apr_status_t) apr_socket_timeout_set(apr_socket_t *sock,
-                                                 apr_interval_time_t t);
-
-/**
- * Query socket options for the specified socket
- * @param sock The socket to query
- * @param opt The option we would like to query.  One of:
- * <PRE>
- *            APR_SO_DEBUG      --  turn on debugging information 
- *            APR_SO_KEEPALIVE  --  keep connections active
- *            APR_SO_LINGER     --  lingers on close if data is present
- *            APR_SO_NONBLOCK   --  Turns blocking on/off for socket
- *            APR_SO_REUSEADDR  --  The rules used in validating addresses
- *                                  supplied to bind should allow reuse
- *                                  of local addresses.
- *            APR_SO_SNDBUF     --  Set the SendBufferSize
- *            APR_SO_RCVBUF     --  Set the ReceiveBufferSize
- *            APR_SO_DISCONNECTED -- Query the disconnected state of the socket.
- *                                  (Currently only used on Windows)
- * </PRE>
- * @param on Socket option returned on the call.
- */
-APR_DECLARE(apr_status_t) apr_socket_opt_get(apr_socket_t *sock, 
-                                             apr_int32_t opt, apr_int32_t *on);
-
-/** @deprecated @see apr_socket_opt_set */
-APR_DECLARE(apr_status_t) apr_getsocketopt(apr_socket_t *sock, 
-                                           apr_int32_t opt, apr_int32_t *on);
-
-/**
- * Query socket timeout for the specified socket
- * @param sock The socket to query
- * @param t Socket timeout returned from the query.
- */
-APR_DECLARE(apr_status_t) apr_socket_timeout_get(apr_socket_t *sock, 
-                                                 apr_interval_time_t *t);
-
-/**
- * Query the specified socket if at the OOB/Urgent data mark
- * @param sock The socket to query
- * @param atmark Is set to true if socket is at the OOB/urgent mark,
- *               otherwise is set to false.
- */
-APR_DECLARE(apr_status_t) apr_socket_atmark(apr_socket_t *sock, 
-                                            int *atmark);
-
-/**
- * Return an apr_sockaddr_t from an apr_socket_t
- * @param sa The returned apr_sockaddr_t.
- * @param which Which interface do we want the apr_sockaddr_t for?
- * @param sock The socket to use
- */
-APR_DECLARE(apr_status_t) apr_socket_addr_get(apr_sockaddr_t **sa,
-                                              apr_interface_e which,
-                                              apr_socket_t *sock);
- 
-/**
- * Set the port in an APR socket address.
- * @param sockaddr The socket address to set.
- * @param port The port to be stored in the socket address.
- * @deprecated @see apr_sockaddr_info_get
- */
-APR_DECLARE(apr_status_t) apr_sockaddr_port_set(apr_sockaddr_t *sockaddr,
-                                                apr_port_t port);
-
-/**
- * Return the port in an APR socket address.
- * @param port The port from the socket address.
- * @param sockaddr The socket address to reference.
- * @deprecated Access port field directly.
- */
-APR_DECLARE(apr_status_t) apr_sockaddr_port_get(apr_port_t *port,
-                                                apr_sockaddr_t *sockaddr);
-
-/**
- * Set the IP address in an APR socket address.
- * @param sockaddr The socket address to use 
- * @param addr The IP address to attach to the socket.
- *             Use APR_ANYADDR to use any IP addr on the machine.
- * @deprecated @see apr_sockaddr_info_get
- */
-APR_DECLARE(apr_status_t) apr_sockaddr_ip_set(apr_sockaddr_t *sockaddr,
-                                              const char *addr);
-
-/**
- * Return the IP address (in numeric address string format) in
- * an APR socket address.  APR will allocate storage for the IP address 
- * string from the pool of the apr_sockaddr_t.
- * @param addr The IP address.
- * @param sockaddr The socket address to reference.
- */
-APR_DECLARE(apr_status_t) apr_sockaddr_ip_get(char **addr, 
-                                              apr_sockaddr_t *sockaddr);
-
-/**
- * See if the IP addresses in two APR socket addresses are
- * equivalent.  Appropriate logic is present for comparing
- * IPv4-mapped IPv6 addresses with IPv4 addresses.
- *
- * @param addr1 One of the APR socket addresses.
- * @param addr2 The other APR socket address.
- * @remark The return value will be non-zero if the addresses
- * are equivalent.
- */
-APR_DECLARE(int) apr_sockaddr_equal(const apr_sockaddr_t *addr1,
-                                    const apr_sockaddr_t *addr2);
-
-
-#if APR_FILES_AS_SOCKETS || defined(DOXYGEN)
-
-/**
- * Convert a File type to a socket so that it can be used in a poll operation.
- * @param newsock the newly created socket which represents a file.
- * @param file the file to mask as a socket.
- * @warning This is not available on all platforms.  Platforms that have the
- *      ability to poll files for data to be read/written/exceptions will
- *      have the APR_FILES_AS_SOCKETS macro defined as true.
- * @deprecated This function has been deprecated, because of the new poll
- *             implementation.
- */
-APR_DECLARE(apr_status_t) apr_socket_from_file(apr_socket_t **newsock,
-                                               apr_file_t *file);
-
-#endif /* APR_FILES_AS_SOCKETS */
-
-/**
- * Given an apr_sockaddr_t and a service name, set the port for the service
- * @param sockaddr The apr_sockaddr_t that will have its port set
- * @param servname The name of the service you wish to use
- */
-APR_DECLARE(apr_status_t) apr_getservbyname(apr_sockaddr_t *sockaddr, 
-                                            const char *servname);
-/**
- * Build an ip-subnet representation from an IP address and optional netmask or
- * number-of-bits.
- * @param ipsub The new ip-subnet representation
- * @param ipstr The input IP address string
- * @param mask_or_numbits The input netmask or number-of-bits string, or NULL
- * @param p The pool to allocate from
- */
-APR_DECLARE(apr_status_t) apr_ipsubnet_create(apr_ipsubnet_t **ipsub, 
-                                              const char *ipstr, 
-                                              const char *mask_or_numbits, 
-                                              apr_pool_t *p);
-
-/**
- * Test the IP address in an apr_sockaddr_t against a pre-built ip-subnet
- * representation.
- * @param ipsub The ip-subnet representation
- * @param sa The socket address to test
- * @return non-zero if the socket address is within the subnet, 0 otherwise
- */
-APR_DECLARE(int) apr_ipsubnet_test(apr_ipsubnet_t *ipsub, apr_sockaddr_t *sa);
-
-#if APR_HAS_SO_ACCEPTFILTER || defined(DOXYGEN)
-/**
- * Set an OS level accept filter.
- * @param sock The socket to put the accept filter on.
- * @param name The accept filter
- * @param args Any extra args to the accept filter.  Passing NULL here removes
- *             the accept filter. 
- */
-apr_status_t apr_socket_accept_filter(apr_socket_t *sock, char *name,
-                                      char *args);
-#endif
-
-/**
- * Return the protocol of the socket.
- * @param sock The socket to query.
- * @param protocol The returned protocol (e.g., APR_PROTO_TCP).
- */
-APR_DECLARE(apr_status_t) apr_socket_protocol_get(apr_socket_t *sock,
-                                                  int *protocol);
-
-/**
- * Set a socket to be inherited by child processes.
- */
-APR_DECLARE_INHERIT_SET(socket);
-
-/** @deprecated @see apr_socket_inherit_set */
-APR_DECLARE(void) apr_socket_set_inherit(apr_socket_t *skt);
-
-/**
- * Unset a socket from being inherited by child processes.
- */
-APR_DECLARE_INHERIT_UNSET(socket);
-
-/** @deprecated @see apr_socket_inherit_unset */
-APR_DECLARE(void) apr_socket_unset_inherit(apr_socket_t *skt);
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ! APR_NETWORK_IO_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_poll.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_poll.h
deleted file mode 100644
index d71cc3a1..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_poll.h
+++ /dev/null
@@ -1,253 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_POLL_H
-#define APR_POLL_H
-/**
- * @file apr_poll.h
- * @brief APR Poll interface
- */
-#include "apr.h"
-#include "apr_pools.h"
-#include "apr_errno.h"
-#include "apr_inherit.h" 
-#include "apr_file_io.h" 
-#include "apr_network_io.h" 
-
-#if APR_HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup apr_poll Poll Routines
- * @ingroup APR 
- * @{
- */
-
-/**
- * @defgroup apr_poll_opt Poll options
- * @{
- */
-#define APR_POLLIN    0x001     /**< Can read without blocking */
-#define APR_POLLPRI   0x002     /**< Priority data available */
-#define APR_POLLOUT   0x004     /**< Can write without blocking */
-#define APR_POLLERR   0x010     /**< Pending error */
-#define APR_POLLHUP   0x020     /**< Hangup occurred */
-#define APR_POLLNVAL  0x040     /**< Descriptior invalid */
-/** @} */
-
-/** Used in apr_pollfd_t to determine what the apr_descriptor is */
-typedef enum { 
-    APR_NO_DESC,                /**< nothing here */
-    APR_POLL_SOCKET,            /**< descriptor refers to a socket */
-    APR_POLL_FILE,              /**< descriptor refers to a file */
-    APR_POLL_LASTDESC           /**< descriptor is the last one in the list */
-} apr_datatype_e ;
-
-/** Union of either an APR file or socket. */
-typedef union {
-    apr_file_t *f;              /**< file */
-    apr_socket_t *s;            /**< socket */
-} apr_descriptor;
-
-/** @see apr_pollfd_t */
-typedef struct apr_pollfd_t apr_pollfd_t;
-
-/** Poll descriptor set. */
-struct apr_pollfd_t {
-    apr_pool_t *p;              /**< associated pool */
-    apr_datatype_e desc_type;   /**< descriptor type */
-    apr_int16_t reqevents;      /**< requested events */
-    apr_int16_t rtnevents;      /**< returned events */
-    apr_descriptor desc;        /**< @see apr_descriptor */
-    void *client_data;          /**< allows app to associate context */
-};
-
-/**
- * Setup the memory required for poll to operate properly
- * @param new_poll The poll structure to be used. 
- * @param num The number of socket descriptors to be polled.
- * @param cont The pool to operate on.
- * @deprecated This function is deprecated, APR applications should control the pollset memory themselves.
- */
-APR_DECLARE(apr_status_t) apr_poll_setup(apr_pollfd_t **new_poll, 
-                                         apr_int32_t num,
-                                         apr_pool_t *cont);
-
-/**
- * Poll the sockets in the poll structure
- * @param aprset The poll structure we will be using. 
- * @param numsock The number of sockets we are polling
- * @param nsds The number of sockets signalled.
- * @param timeout The amount of time in microseconds to wait.  This is 
- *                a maximum, not a minimum.  If a socket is signalled, we 
- *                will wake up before this time.  A negative number means 
- *                wait until a socket is signalled.
- * @remark
- * <PRE>
- * The number of sockets signalled is returned in the second argument. 
- *
- *        This is a blocking call, and it will not return until either a 
- *        socket has been signalled, or the timeout has expired. 
- * </PRE>
- */
-APR_DECLARE(apr_status_t) apr_poll(apr_pollfd_t *aprset, apr_int32_t numsock,
-                                   apr_int32_t *nsds, 
-                                   apr_interval_time_t timeout);
-
-/**
- * Add a socket to the poll structure.
- * @param aprset The poll structure we will be using. 
- * @param sock The socket to add to the current poll structure. 
- * @param event The events to look for when we do the poll.  One of:
- * <PRE>
- *            APR_POLLIN       signal if read will not block
- *            APR_POLLPRI      signal if prioirty data is availble to be read
- *            APR_POLLOUT      signal if write will not block
- * </PRE>
- * @deprecated This function is deprecated, APR applications should control the pollset memory themselves.
- */
-APR_DECLARE(apr_status_t) apr_poll_socket_add(apr_pollfd_t *aprset, 
-                                              apr_socket_t *sock,
-                                              apr_int16_t event);
-
-/**
- * Modify a socket in the poll structure with mask.
- * @param aprset The poll structure we will be using. 
- * @param sock The socket to modify in poll structure. 
- * @param events The events to stop looking for during the poll.  One of:
- * <PRE>
- *            APR_POLLIN       signal if read will not block
- *            APR_POLLPRI      signal if priority data is available to be read
- *            APR_POLLOUT      signal if write will not block
- * </PRE>
- * @deprecated This function is deprecated, APR applications should control the pollset memory themselves.
- */
-APR_DECLARE(apr_status_t) apr_poll_socket_mask(apr_pollfd_t *aprset,
-                                               apr_socket_t *sock,
-                                               apr_int16_t events);
-/**
- * Remove a socket from the poll structure.
- * @param aprset The poll structure we will be using. 
- * @param sock The socket to remove from the current poll structure. 
- * @deprecated This function is deprecated, APR applications should control the pollset memory themselves.
- */
-APR_DECLARE(apr_status_t) apr_poll_socket_remove(apr_pollfd_t *aprset, 
-                                                 apr_socket_t *sock);
-
-/**
- * Clear all events in the poll structure.
- * @param aprset The poll structure we will be using. 
- * @param events The events to clear from all sockets.  One of:
- * <PRE>
- *            APR_POLLIN       signal if read will not block
- *            APR_POLLPRI      signal if priority data is available to be read
- *            APR_POLLOUT      signal if write will not block
- * </PRE>
- * @deprecated This function is deprecated, APR applications should control the pollset memory themselves.
- */
-APR_DECLARE(apr_status_t) apr_poll_socket_clear(apr_pollfd_t *aprset, 
-                                                 apr_int16_t events);
-
-/**
- * Get the return events for the specified socket.
- * @param event The returned events for the socket.  One of:
- * <PRE>
- *            APR_POLLIN       Data is available to be read 
- *            APR_POLLPRI      Priority data is availble to be read
- *            APR_POLLOUT      Write will succeed
- *            APR_POLLERR      An error occurred on the socket
- *            APR_POLLHUP      The connection has been terminated
- *            APR_POLLNVAL     This is an invalid socket to poll on.
- *                             Socket not open.
- * </PRE>
- * @param sock The socket we wish to get information about. 
- * @param aprset The poll structure we will be using. 
- * @deprecated This function is deprecated, APR applications should control the pollset memory themselves.
- */
-APR_DECLARE(apr_status_t) apr_poll_revents_get(apr_int16_t *event, 
-                                          apr_socket_t *sock,
-                                          apr_pollfd_t *aprset);
-
-/* General-purpose poll API for arbitrarily large numbers of
- * file descriptors
- */
-
-/** Opaque structure used for pollset API */
-typedef struct apr_pollset_t apr_pollset_t;
-
-/**
- * Setup a pollset object
- * @param pollset  The pointer in which to return the newly created object 
- * @param size The maximum number of descriptors that this pollset can hold
- * @param p The pool from which to allocate the pollset
- * @param flags Optional flags to modify the operation of the pollset
- *              (reserved for future expansion)
- */
-APR_DECLARE(apr_status_t) apr_pollset_create(apr_pollset_t **pollset,
-                                             apr_uint32_t size,
-                                             apr_pool_t *p,
-                                             apr_uint32_t flags);
-
-/**
- * Destroy a pollset object
- * @param pollset The pollset to destroy
- */
-APR_DECLARE(apr_status_t) apr_pollset_destroy(apr_pollset_t *pollset);
-
-/**
- * Add a socket or file descriptor to a pollset
- * @param pollset The pollset to which to add the descriptor
- * @param descriptor The descriptor to add
- * @remark If you set client_data in the descriptor, that value
- *         will be returned in the client_data field whenever this
- *         descriptor is signalled in apr_pollset_poll().
- */
-APR_DECLARE(apr_status_t) apr_pollset_add(apr_pollset_t *pollset,
-                                          const apr_pollfd_t *descriptor);
-
-/**
- * Remove a descriptor from a pollset
- * @param pollset The pollset from which to remove the descriptor
- * @param descriptor The descriptor to remove
- */
-APR_DECLARE(apr_status_t) apr_pollset_remove(apr_pollset_t *pollset,
-                                             const apr_pollfd_t *descriptor);
-
-/**
- * Block for activity on the descriptor(s) in a pollset
- * @param pollset The pollset to use
- * @param timeout Timeout in microseconds
- * @param num Number of signalled descriptors (output parameter)
- * @param descriptors Array of signalled descriptors (output parameter)
- */
-APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset,
-                                           apr_interval_time_t timeout,
-                                           apr_int32_t *num,
-                                           const apr_pollfd_t **descriptors);
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ! APR_POLL_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_pools.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_pools.h
deleted file mode 100644
index 2f4353f0..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_pools.h
+++ /dev/null
@@ -1,664 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_POOLS_H
-#define APR_POOLS_H
-
-/**
- * @file apr_pools.h
- * @brief APR memory allocation
- *
- * Resource allocation routines...
- *
- * designed so that we don't have to keep track of EVERYTHING so that
- * it can be explicitly freed later (a fundamentally unsound strategy ---
- * particularly in the presence of die()).
- *
- * Instead, we maintain pools, and allocate items (both memory and I/O
- * handlers) from the pools --- currently there are two, one for per
- * transaction info, and one for config info.  When a transaction is over,
- * we can delete everything in the per-transaction apr_pool_t without fear,
- * and without thinking too hard about it either.
- */
-
-#include "apr.h"
-#include "apr_errno.h"
-#include "apr_general.h" /* for APR_STRINGIFY */
-#define APR_WANT_MEMFUNC /**< for no good reason? */
-#include "apr_want.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @defgroup apr_pools Memory Pool Functions
- * @ingroup APR 
- * @{
- */
-
-/** The fundamental pool type */
-typedef struct apr_pool_t apr_pool_t;
-
-
-/**
- * Declaration helper macro to construct apr_foo_pool_get()s.
- *
- * This standardized macro is used by opaque (APR) data types to return
- * the apr_pool_t that is associated with the data type.
- *
- * APR_POOL_DECLARE_ACCESSOR() is used in a header file to declare the
- * accessor function. A typical usage and result would be:
- * <pre>
- *    APR_POOL_DECLARE_ACCESSOR(file);
- * becomes:
- *    APR_DECLARE(apr_pool_t *) apr_file_pool_get(apr_file_t *ob);
- * </pre>
- * @remark Doxygen unwraps this macro (via doxygen.conf) to provide 
- * actual help for each specific occurance of apr_foo_pool_get.
- * @remark the linkage is specified for APR. It would be possible to expand
- *       the macros to support other linkages.
- */
-#define APR_POOL_DECLARE_ACCESSOR(type) \
-    APR_DECLARE(apr_pool_t *) apr_##type##_pool_get \
-        (const apr_##type##_t *the##type)
-
-/** 
- * Implementation helper macro to provide apr_foo_pool_get()s.
- *
- * In the implementation, the APR_POOL_IMPLEMENT_ACCESSOR() is used to
- * actually define the function. It assumes the field is named "pool".
- */
-#define APR_POOL_IMPLEMENT_ACCESSOR(type) \
-    APR_DECLARE(apr_pool_t *) apr_##type##_pool_get \
-            (const apr_##type##_t *the##type) \
-        { return the##type->pool; }
-
-
-/**
- * Pool debug levels
- *
- * <pre>
- * | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 |
- * ---------------------------------
- * |   |   |   |   |   |   |   | x |  General debug code enabled (usefull in
- *                                    combination with --with-efence).
- *
- * |   |   |   |   |   |   | x |   |  Verbose output on stderr (report
- *                                    CREATE, CLEAR, DESTROY).
- *
- * |   |   |   | x |   |   |   |   |  Verbose output on stderr (report
- *                                    PALLOC, PCALLOC).
- *
- * |   |   |   |   |   | x |   |   |  Lifetime checking. On each use of a
- *                                    pool, check its lifetime.  If the pool
- *                                    is out of scope, abort().
- *                                    In combination with the verbose flag
- *                                    above, it will output LIFE in such an
- *                                    event prior to aborting.
- *
- * |   |   |   |   | x |   |   |   |  Pool owner checking.  On each use of a
- *                                    pool, check if the current thread is the
- *                                    pools owner.  If not, abort().  In
- *                                    combination with the verbose flag above,
- *                                    it will output OWNER in such an event
- *                                    prior to aborting.  Use the debug
- *                                    function apr_pool_owner_set() to switch
- *                                    a pools ownership.
- *
- * When no debug level was specified, assume general debug mode.
- * If level 0 was specified, debugging is switched off
- * </pre>
- */
-#if defined(APR_POOL_DEBUG)
-#if (APR_POOL_DEBUG != 0) && (APR_POOL_DEBUG - 0 == 0)
-#undef APR_POOL_DEBUG
-#define APR_POOL_DEBUG 1
-#endif
-#else
-#define APR_POOL_DEBUG 0
-#endif
-
-/** the place in the code where the particular function was called */
-#define APR_POOL__FILE_LINE__ __FILE__ ":" APR_STRINGIFY(__LINE__)
-
-
-
-/** A function that is called when allocation fails. */
-typedef int (*apr_abortfunc_t)(int retcode);
-
-/*
- * APR memory structure manipulators (pools, tables, and arrays).
- */
-
-/*
- * Initialization
- */
-
-/**
- * Setup all of the internal structures required to use pools
- * @remark Programs do NOT need to call this directly.  APR will call this
- *      automatically from apr_initialize.
- * @internal
- */
-APR_DECLARE(apr_status_t) apr_pool_initialize(void);
-
-/**
- * Tear down all of the internal structures required to use pools
- * @remark Programs do NOT need to call this directly.  APR will call this
- *      automatically from apr_terminate.
- * @internal
- */
-APR_DECLARE(void) apr_pool_terminate(void);
-
-
-/*
- * Pool creation/destruction
- */
-
-#include "apr_allocator.h"
-
-/**
- * Create a new pool.
- * @param newpool The pool we have just created.
- * @param parent The parent pool.  If this is NULL, the new pool is a root
- *        pool.  If it is non-NULL, the new pool will inherit all
- *        of its parent pool's attributes, except the apr_pool_t will
- *        be a sub-pool.
- * @param abort_fn A function to use if the pool cannot allocate more memory.
- * @param allocator The allocator to use with the new pool.  If NULL the
- *        allocator of the parent pool will be used.
- */
-APR_DECLARE(apr_status_t) apr_pool_create_ex(apr_pool_t **newpool,
-                                             apr_pool_t *parent,
-                                             apr_abortfunc_t abort_fn,
-                                             apr_allocator_t *allocator);
-
-/**
- * Debug version of apr_pool_create_ex.
- * @param newpool @see apr_pool_create.
- * @param parent @see apr_pool_create.
- * @param abort_fn @see apr_pool_create.
- * @param allocator @see apr_pool_create.
- * @param file_line Where the function is called from.
- *        This is usually APR_POOL__FILE_LINE__.
- * @remark Only available when APR_POOL_DEBUG is defined.
- *         Call this directly if you have you apr_pool_create_ex
- *         calls in a wrapper function and wish to override
- *         the file_line argument to reflect the caller of
- *         your wrapper function.  If you do not have
- *         apr_pool_create_ex in a wrapper, trust the macro
- *         and don't call apr_pool_create_ex_debug directly.
- */
-APR_DECLARE(apr_status_t) apr_pool_create_ex_debug(apr_pool_t **newpool,
-                                                   apr_pool_t *parent,
-                                                   apr_abortfunc_t abort_fn,
-                                                   apr_allocator_t *allocator,
-                                                   const char *file_line);
-
-#if APR_POOL_DEBUG
-#define apr_pool_create_ex(newpool, parent, abort_fn, allocator)  \
-    apr_pool_create_ex_debug(newpool, parent, abort_fn, allocator, \
-                             APR_POOL__FILE_LINE__)
-#endif
-
-/**
- * Create a new pool.
- * @param newpool The pool we have just created.
- * @param parent The parent pool.  If this is NULL, the new pool is a root
- *        pool.  If it is non-NULL, the new pool will inherit all
- *        of its parent pool's attributes, except the apr_pool_t will
- *        be a sub-pool.
- */
-#if defined(DOXYGEN)
-APR_DECLARE(apr_status_t) apr_pool_create(apr_pool_t **newpool,
-                                          apr_pool_t *parent);
-#else
-#if APR_POOL_DEBUG
-#define apr_pool_create(newpool, parent) \
-    apr_pool_create_ex_debug(newpool, parent, NULL, NULL, \
-                             APR_POOL__FILE_LINE__)
-#else
-#define apr_pool_create(newpool, parent) \
-    apr_pool_create_ex(newpool, parent, NULL, NULL)
-#endif
-#endif
-
-/** @deprecated @see apr_pool_create_ex */
-#if APR_POOL_DEBUG
-#define apr_pool_sub_make(newpool, parent, abort_fn) \
-    (void)apr_pool_create_ex_debug(newpool, parent, abort_fn, \
-                                   NULL, \
-                                   APR_POOL__FILE_LINE__)
-#else
-#define apr_pool_sub_make(newpool, parent, abort_fn) \
-    (void)apr_pool_create_ex(newpool, parent, abort_fn, NULL)
-#endif
-
-/**
- * Find the pools allocator
- * @param pool The pool to get the allocator from.
- */
-APR_DECLARE(apr_allocator_t *) apr_pool_allocator_get(apr_pool_t *pool);
-
-/**
- * Clear all memory in the pool and run all the cleanups. This also destroys all
- * subpools.
- * @param p The pool to clear
- * @remark This does not actually free the memory, it just allows the pool
- *         to re-use this memory for the next allocation.
- * @see apr_pool_destroy()
- */
-APR_DECLARE(void) apr_pool_clear(apr_pool_t *p);
-
-/**
- * Debug version of apr_pool_clear.
- * @param p See: apr_pool_clear.
- * @param file_line Where the function is called from.
- *        This is usually APR_POOL__FILE_LINE__.
- * @remark Only available when APR_POOL_DEBUG is defined.
- *         Call this directly if you have you apr_pool_clear
- *         calls in a wrapper function and wish to override
- *         the file_line argument to reflect the caller of
- *         your wrapper function.  If you do not have
- *         apr_pool_clear in a wrapper, trust the macro
- *         and don't call apr_pool_destroy_clear directly.
- */
-APR_DECLARE(void) apr_pool_clear_debug(apr_pool_t *p,
-                                       const char *file_line);
-
-#if APR_POOL_DEBUG
-#define apr_pool_clear(p) \
-    apr_pool_clear_debug(p, APR_POOL__FILE_LINE__)
-#endif
-
-/**
- * Destroy the pool. This takes similar action as apr_pool_clear() and then
- * frees all the memory.
- * @param p The pool to destroy
- * @remark This will actually free the memory
- */
-APR_DECLARE(void) apr_pool_destroy(apr_pool_t *p);
-
-/**
- * Debug version of apr_pool_destroy.
- * @param p See: apr_pool_destroy.
- * @param file_line Where the function is called from.
- *        This is usually APR_POOL__FILE_LINE__.
- * @remark Only available when APR_POOL_DEBUG is defined.
- *         Call this directly if you have you apr_pool_destroy
- *         calls in a wrapper function and wish to override
- *         the file_line argument to reflect the caller of
- *         your wrapper function.  If you do not have
- *         apr_pool_destroy in a wrapper, trust the macro
- *         and don't call apr_pool_destroy_debug directly.
- */
-APR_DECLARE(void) apr_pool_destroy_debug(apr_pool_t *p,
-                                         const char *file_line);
-
-#if APR_POOL_DEBUG
-#define apr_pool_destroy(p) \
-    apr_pool_destroy_debug(p, APR_POOL__FILE_LINE__)
-#endif
-
-
-/*
- * Memory allocation
- */
-
-/**
- * Allocate a block of memory from a pool
- * @param p The pool to allocate from
- * @param size The amount of memory to allocate
- * @return The allocated memory
- */
-APR_DECLARE(void *) apr_palloc(apr_pool_t *p, apr_size_t size);
-
-/**
- * Debug version of apr_palloc
- * @param p See: apr_palloc
- * @param size See: apr_palloc
- * @param file_line Where the function is called from.
- *        This is usually APR_POOL__FILE_LINE__.
- * @return See: apr_palloc
- */
-APR_DECLARE(void *) apr_palloc_debug(apr_pool_t *p, apr_size_t size,
-                                     const char *file_line);
-
-#if APR_POOL_DEBUG
-#define apr_palloc(p, size) \
-    apr_palloc_debug(p, size, APR_POOL__FILE_LINE__)
-#endif
-
-/**
- * Allocate a block of memory from a pool and set all of the memory to 0
- * @param p The pool to allocate from
- * @param size The amount of memory to allocate
- * @return The allocated memory
- */
-#if defined(DOXYGEN)
-APR_DECLARE(void *) apr_pcalloc(apr_pool_t *p, apr_size_t size);
-#elif !APR_POOL_DEBUG
-#define apr_pcalloc(p, size) memset(apr_palloc(p, size), 0, size)
-#endif
-
-/**
- * Debug version of apr_pcalloc
- * @param p See: apr_pcalloc
- * @param size See: apr_pcalloc
- * @param file_line Where the function is called from.
- *        This is usually APR_POOL__FILE_LINE__.
- * @return See: apr_pcalloc
- */
-APR_DECLARE(void *) apr_pcalloc_debug(apr_pool_t *p, apr_size_t size,
-                                      const char *file_line);
-
-#if APR_POOL_DEBUG
-#define apr_pcalloc(p, size) \
-    apr_pcalloc_debug(p, size, APR_POOL__FILE_LINE__)
-#endif
-
-
-/*
- * Pool Properties
- */
-
-/**
- * Set the function to be called when an allocation failure occurs.
- * @remark If the program wants APR to exit on a memory allocation error,
- *      then this function can be called to set the callback to use (for
- *      performing cleanup and then exiting). If this function is not called,
- *      then APR will return an error and expect the calling program to
- *      deal with the error accordingly.
- */
-APR_DECLARE(void) apr_pool_abort_set(apr_abortfunc_t abortfunc,
-                                     apr_pool_t *pool);
-
-/** @deprecated @see apr_pool_abort_set */
-APR_DECLARE(void) apr_pool_set_abort(apr_abortfunc_t abortfunc,
-                                     apr_pool_t *pool);
-
-/**
- * Get the abort function associated with the specified pool.
- * @param pool The pool for retrieving the abort function.
- * @return The abort function for the given pool.
- */
-APR_DECLARE(apr_abortfunc_t) apr_pool_abort_get(apr_pool_t *pool);
-
-/** @deprecated @see apr_pool_abort_get */
-APR_DECLARE(apr_abortfunc_t) apr_pool_get_abort(apr_pool_t *pool);
-
-/**
- * Get the parent pool of the specified pool.
- * @param pool The pool for retrieving the parent pool.
- * @return The parent of the given pool.
- */
-APR_DECLARE(apr_pool_t *) apr_pool_parent_get(apr_pool_t *pool);
-
-/** @deprecated @see apr_pool_parent_get */
-APR_DECLARE(apr_pool_t *) apr_pool_get_parent(apr_pool_t *pool);
-
-/**
- * Determine if pool a is an ancestor of pool b
- * @param a The pool to search
- * @param b The pool to search for
- * @return True if a is an ancestor of b, NULL is considered an ancestor
- *         of all pools.
- */
-APR_DECLARE(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b);
-
-/**
- * Tag a pool (give it a name)
- * @param pool The pool to tag
- * @param tag  The tag
- */
-APR_DECLARE(void) apr_pool_tag(apr_pool_t *pool, const char *tag);
-
-
-/*
- * User data management
- */
-
-/**
- * Set the data associated with the current pool
- * @param data The user data associated with the pool.
- * @param key The key to use for association
- * @param cleanup The cleanup program to use to cleanup the data (NULL if none)
- * @param pool The current pool
- * @warning The data to be attached to the pool should have a life span
- *          at least as long as the pool it is being attached to.
- *
- *      Users of APR must take EXTREME care when choosing a key to
- *      use for their data.  It is possible to accidentally overwrite
- *      data by choosing a key that another part of the program is using.
- *      Therefore it is advised that steps are taken to ensure that unique
- *      keys are used for all of the userdata objects in a particular pool
- *      (the same key in two different pools or a pool and one of its
- *      subpools is okay) at all times.  Careful namespace prefixing of
- *      key names is a typical way to help ensure this uniqueness.
- */
-APR_DECLARE(apr_status_t) apr_pool_userdata_set(
-    const void *data,
-    const char *key,
-    apr_status_t (*cleanup)(void *),
-    apr_pool_t *pool);
-
-/**
- * Set the data associated with the current pool
- * @param data The user data associated with the pool.
- * @param key The key to use for association
- * @param cleanup The cleanup program to use to cleanup the data (NULL if none)
- * @param pool The current pool
- * @note same as apr_pool_userdata_set(), except that this version doesn't
- *       make a copy of the key (this function is useful, for example, when
- *       the key is a string literal)
- * @warning This should NOT be used if the key could change addresses by
- *       any means between the apr_pool_userdata_setn() call and a
- *       subsequent apr_pool_userdata_get() on that key, such as if a
- *       static string is used as a userdata key in a DSO and the DSO could
- *       be unloaded and reloaded between the _setn() and the _get().  You
- *       MUST use apr_pool_userdata_set() in such cases.
- * @warning More generally, the key and the data to be attached to the
- *       pool should have a life span at least as long as the pool itself.
- *
- */
-APR_DECLARE(apr_status_t) apr_pool_userdata_setn(
-    const void *data,
-    const char *key,
-    apr_status_t (*cleanup)(void *),
-    apr_pool_t *pool);
-
-/**
- * Return the data associated with the current pool.
- * @param data The user data associated with the pool.
- * @param key The key for the data to retrieve
- * @param pool The current pool.
- */
-APR_DECLARE(apr_status_t) apr_pool_userdata_get(void **data, const char *key,
-                                                apr_pool_t *pool);
-
-
-/*
- * Cleanup
- *
- * Cleanups are performed in the reverse order they were registered.  That is:
- * Last In, First Out.
- */
-
-/**
- * Register a function to be called when a pool is cleared or destroyed
- * @param p The pool register the cleanup with
- * @param data The data to pass to the cleanup function.
- * @param plain_cleanup The function to call when the pool is cleared
- *                      or destroyed
- * @param child_cleanup The function to call when a child process is being
- *                      shutdown - this function is called in the child, obviously!
- */
-APR_DECLARE(void) apr_pool_cleanup_register(
-    apr_pool_t *p,
-    const void *data,
-    apr_status_t (*plain_cleanup)(void *),
-    apr_status_t (*child_cleanup)(void *));
-
-/**
- * Remove a previously registered cleanup function
- * @param p The pool remove the cleanup from
- * @param data The data to remove from cleanup
- * @param cleanup The function to remove from cleanup
- * @remarks For some strange reason only the plain_cleanup is handled by this
- *          function
- */
-APR_DECLARE(void) apr_pool_cleanup_kill(apr_pool_t *p, const void *data,
-                                        apr_status_t (*cleanup)(void *));
-
-/**
- * Replace the child cleanup of a previously registered cleanup
- * @param p The pool of the registered cleanup
- * @param data The data of the registered cleanup
- * @param plain_cleanup The plain cleanup function of the registered cleanup
- * @param child_cleanup The function to register as the child cleanup
- */
-APR_DECLARE(void) apr_pool_child_cleanup_set(
-    apr_pool_t *p,
-    const void *data,
-    apr_status_t (*plain_cleanup)(void *),
-    apr_status_t (*child_cleanup)(void *));
-
-/**
- * Run the specified cleanup function immediately and unregister it. Use
- * @a data instead of the data that was registered with the cleanup.
- * @param p The pool remove the cleanup from
- * @param data The data to remove from cleanup
- * @param cleanup The function to remove from cleanup
- */
-APR_DECLARE(apr_status_t) apr_pool_cleanup_run(
-    apr_pool_t *p,
-    void *data,
-    apr_status_t (*cleanup)(void *));
-
-/**
- * An empty cleanup function
- * @param data The data to cleanup
- */
-APR_DECLARE_NONSTD(apr_status_t) apr_pool_cleanup_null(void *data);
-
-/* Preparing for exec() --- close files, etc., but *don't* flush I/O
- * buffers, *don't* wait for subprocesses, and *don't* free any memory.
- */
-/**
- * Run all of the child_cleanups, so that any unnecessary files are
- * closed because we are about to exec a new program
- */
-APR_DECLARE(void) apr_pool_cleanup_for_exec(void);
-
-
-/**
- * @defgroup PoolDebug Pool Debugging functions.
- *
- * pools have nested lifetimes -- sub_pools are destroyed when the
- * parent pool is cleared.  We allow certain liberties with operations
- * on things such as tables (and on other structures in a more general
- * sense) where we allow the caller to insert values into a table which
- * were not allocated from the table's pool.  The table's data will
- * remain valid as long as all the pools from which its values are
- * allocated remain valid.
- *
- * For example, if B is a sub pool of A, and you build a table T in
- * pool B, then it's safe to insert data allocated in A or B into T
- * (because B lives at most as long as A does, and T is destroyed when
- * B is cleared/destroyed).  On the other hand, if S is a table in
- * pool A, it is safe to insert data allocated in A into S, but it
- * is *not safe* to insert data allocated from B into S... because
- * B can be cleared/destroyed before A is (which would leave dangling
- * pointers in T's data structures).
- *
- * In general we say that it is safe to insert data into a table T
- * if the data is allocated in any ancestor of T's pool.  This is the
- * basis on which the APR_POOL_DEBUG code works -- it tests these ancestor
- * relationships for all data inserted into tables.  APR_POOL_DEBUG also
- * provides tools (apr_pool_find, and apr_pool_is_ancestor) for other
- * folks to implement similar restrictions for their own data
- * structures.
- *
- * However, sometimes this ancestor requirement is inconvenient --
- * sometimes we're forced to create a sub pool (such as through
- * apr_sub_req_lookup_uri), and the sub pool is guaranteed to have
- * the same lifetime as the parent pool.  This is a guarantee implemented
- * by the *caller*, not by the pool code.  That is, the caller guarantees
- * they won't destroy the sub pool individually prior to destroying the
- * parent pool.
- *
- * In this case the caller must call apr_pool_join() to indicate this
- * guarantee to the APR_POOL_DEBUG code.  There are a few examples spread
- * through the standard modules.
- *
- * These functions are only implemented when #APR_POOL_DEBUG is set.
- *
- * @{
- */
-#if APR_POOL_DEBUG || defined(DOXYGEN)
-/**
- * Guarantee that a subpool has the same lifetime as the parent.
- * @param p The parent pool
- * @param sub The subpool
- */
-APR_DECLARE(void) apr_pool_join(apr_pool_t *p, apr_pool_t *sub);
-
-/**
- * Find a pool from something allocated in it.
- * @param mem The thing allocated in the pool
- * @return The pool it is allocated in
- */
-APR_DECLARE(apr_pool_t *) apr_pool_find(const void *mem);
-
-/**
- * Report the number of bytes currently in the pool
- * @param p The pool to inspect
- * @param recurse Recurse/include the subpools' sizes
- * @return The number of bytes
- */
-APR_DECLARE(apr_size_t) apr_pool_num_bytes(apr_pool_t *p, int recurse);
-
-/**
- * Lock a pool
- * @param pool The pool to lock
- * @param flag  The flag
- */
-APR_DECLARE(void) apr_pool_lock(apr_pool_t *pool, int flag);
-
-/* @} */
-
-#else /* APR_POOL_DEBUG or DOXYGEN */
-
-#ifdef apr_pool_join
-#undef apr_pool_join
-#endif
-#define apr_pool_join(a,b)
-
-#ifdef apr_pool_lock
-#undef apr_pool_lock
-#endif
-#define apr_pool_lock(pool, lock)
-
-#endif /* APR_POOL_DEBUG or DOXYGEN */
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !APR_POOLS_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_portable.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_portable.h
deleted file mode 100644
index ffeff9b0..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_portable.h
+++ /dev/null
@@ -1,505 +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.
- */
-
-/* This header file is where you should put ANY platform specific information.
- * This should be the only header file that programs need to include that 
- * actually has platform dependant code which refers to the .
- */
-#ifndef APR_PORTABLE_H
-#define APR_PORTABLE_H
-/**
- * @file apr_portable.h
- * @brief APR Portability Routines
- */
-
-#include "apr.h"
-#include "apr_pools.h"
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-#include "apr_network_io.h"
-#include "apr_errno.h"
-#include "apr_global_mutex.h"
-#include "apr_proc_mutex.h"
-#include "apr_time.h"
-#include "apr_dso.h"
-#include "apr_shm.h"
-
-#if APR_HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-#if APR_HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#if APR_HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup apr_portabile Portability Routines
- * @ingroup APR 
- * @{
- */
-
-#ifdef WIN32
-/* The primitives for Windows types */
-typedef HANDLE                apr_os_file_t;
-typedef HANDLE                apr_os_dir_t;
-typedef SOCKET                apr_os_sock_t;
-typedef HANDLE                apr_os_proc_mutex_t;
-typedef HANDLE                apr_os_thread_t;
-typedef HANDLE                apr_os_proc_t;
-typedef DWORD                 apr_os_threadkey_t; 
-typedef FILETIME              apr_os_imp_time_t;
-typedef SYSTEMTIME            apr_os_exp_time_t;
-typedef HANDLE                apr_os_dso_handle_t;
-typedef HANDLE                apr_os_shm_t;
-
-#elif defined(OS2)
-typedef HFILE                 apr_os_file_t;
-typedef HDIR                  apr_os_dir_t;
-typedef int                   apr_os_sock_t;
-typedef HMTX                  apr_os_proc_mutex_t;
-typedef TID                   apr_os_thread_t;
-typedef PID                   apr_os_proc_t;
-typedef PULONG                apr_os_threadkey_t; 
-typedef struct timeval        apr_os_imp_time_t;
-typedef struct tm             apr_os_exp_time_t;
-typedef HMODULE               apr_os_dso_handle_t;
-typedef void*                 apr_os_shm_t;
-
-#elif defined(__BEOS__)
-#include <kernel/OS.h>
-#include <kernel/image.h>
-
-struct apr_os_proc_mutex_t {
-	sem_id sem;
-	int32  ben;
-};
-
-typedef int                   apr_os_file_t;
-typedef DIR                   apr_os_dir_t;
-typedef int                   apr_os_sock_t;
-typedef struct apr_os_proc_mutex_t  apr_os_proc_mutex_t;
-typedef thread_id             apr_os_thread_t;
-typedef thread_id             apr_os_proc_t;
-typedef int                   apr_os_threadkey_t;
-typedef struct timeval        apr_os_imp_time_t;
-typedef struct tm             apr_os_exp_time_t;
-typedef image_id              apr_os_dso_handle_t;
-typedef void*                 apr_os_shm_t;
-
-#elif defined(NETWARE)
-typedef int                   apr_os_file_t;
-typedef DIR                   apr_os_dir_t;
-typedef int                   apr_os_sock_t;
-typedef NXMutex_t             apr_os_proc_mutex_t;
-typedef NXThreadId_t          apr_os_thread_t;
-typedef long                  apr_os_proc_t;
-typedef NXKey_t               apr_os_threadkey_t; 
-typedef struct timeval        apr_os_imp_time_t;
-typedef struct tm             apr_os_exp_time_t;
-typedef void *                apr_os_dso_handle_t;
-typedef void*                 apr_os_shm_t;
-
-#else
-/* Any other OS should go above this one.  This is the lowest common
- * denominator typedefs for  all UNIX-like systems.  :)
- */
-
-/** Basic OS process mutex structure. */
-struct apr_os_proc_mutex_t {
-#if APR_HAS_SYSVSEM_SERIALIZE || APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE
-    int crossproc;
-#endif
-#if APR_HAS_PROC_PTHREAD_SERIALIZE
-    pthread_mutex_t *pthread_interproc;
-#endif
-#if APR_HAS_THREADS
-    /* If no threads, no need for thread locks */
-#if APR_USE_PTHREAD_SERIALIZE
-    pthread_mutex_t *intraproc;
-#endif
-#endif
-};
-
-typedef int                   apr_os_file_t;        /**< native file */
-typedef DIR                   apr_os_dir_t;         /**< native dir */
-typedef int                   apr_os_sock_t;        /**< native dir */
-typedef struct apr_os_proc_mutex_t  apr_os_proc_mutex_t; /**< native proces
-                                                          *   mutex
-                                                          */
-#if APR_HAS_THREADS && APR_HAVE_PTHREAD_H 
-typedef pthread_t             apr_os_thread_t;      /**< native thread */
-typedef pthread_key_t         apr_os_threadkey_t;   /**< native thread address
-                                                     *   space */
-#endif
-typedef pid_t                 apr_os_proc_t;        /**< native pid */
-typedef struct timeval        apr_os_imp_time_t;    /**< native timeval */
-typedef struct tm             apr_os_exp_time_t;    /**< native tm */
-/** @var apr_os_dso_handle_t
- * native dso types
- */
-#if defined(HPUX) || defined(HPUX10) || defined(HPUX11)
-#include <dl.h>
-typedef shl_t                 apr_os_dso_handle_t;
-#elif defined(DARWIN)
-#include <mach-o/dyld.h>
-typedef NSModule              apr_os_dso_handle_t;
-#else
-typedef void *                apr_os_dso_handle_t;
-#endif
-typedef void*                 apr_os_shm_t;         /**< native SHM */
-
-#endif
-
-/**
- * @typedef apr_os_sock_info_t
- * @brief alias for local OS socket
- */
-/**
- * everything APR needs to know about an active socket to construct
- * an APR socket from it; currently, this is platform-independent
- */
-struct apr_os_sock_info_t {
-    apr_os_sock_t *os_sock; /**< always required */
-    struct sockaddr *local; /**< NULL if not yet bound */
-    struct sockaddr *remote; /**< NULL if not connected */
-    int family;             /**< always required (APR_INET, APR_INET6, etc.) */
-    int type;               /**< always required (SOCK_STREAM, SOCK_DGRAM, etc.) */
-#ifdef APR_ENABLE_FOR_1_0   /**< enable with APR 1.0 */
-    int protocol;           /**< 0 or actual protocol (APR_PROTO_SCTP, APR_PROTO_TCP, etc.) */
-#endif
-};
-
-typedef struct apr_os_sock_info_t apr_os_sock_info_t;
-
-#if APR_PROC_MUTEX_IS_GLOBAL || defined(DOXYGEN)
-/** Opaque global mutex type */
-#define apr_os_global_mutex_t apr_os_proc_mutex_t
-/** @return apr_os_global_mutex */
-#define apr_os_global_mutex_get apr_os_proc_mutex_get
-#else
-    /** Thread and process mutex for those platforms where process mutexes
-     *  are not held in threads.
-     */
-    struct apr_os_global_mutex_t {
-        apr_pool_t *pool;
-        apr_proc_mutex_t *proc_mutex;
-#if APR_HAS_THREADS
-        apr_thread_mutex_t *thread_mutex;
-#endif /* APR_HAS_THREADS */
-    };
-    typedef struct apr_os_global_mutex_t apr_os_global_mutex_t;
-
-APR_DECLARE(apr_status_t) apr_os_global_mutex_get(apr_os_global_mutex_t *ospmutex, 
-                                                apr_global_mutex_t *pmutex);
-#endif
-
-
-/**
- * convert the file from apr type to os specific type.
- * @param thefile The os specific file we are converting to
- * @param file The apr file to convert.
- * @remark On Unix, it is only possible to get a file descriptor from 
- *         an apr file type.
- */
-APR_DECLARE(apr_status_t) apr_os_file_get(apr_os_file_t *thefile,
-                                          apr_file_t *file);
-
-/**
- * convert the dir from apr type to os specific type.
- * @param thedir The os specific dir we are converting to
- * @param dir The apr dir to convert.
- */   
-APR_DECLARE(apr_status_t) apr_os_dir_get(apr_os_dir_t **thedir, 
-                                         apr_dir_t *dir);
-
-/**
- * Convert the socket from an apr type to an OS specific socket
- * @param thesock The socket to convert.
- * @param sock The os specifc equivelant of the apr socket..
- */
-APR_DECLARE(apr_status_t) apr_os_sock_get(apr_os_sock_t *thesock,
-                                          apr_socket_t *sock);
-
-/**
- * Convert the proc mutex from os specific type to apr type
- * @param ospmutex The os specific proc mutex we are converting to.
- * @param pmutex The apr proc mutex to convert.
- */
-APR_DECLARE(apr_status_t) apr_os_proc_mutex_get(apr_os_proc_mutex_t *ospmutex, 
-                                                apr_proc_mutex_t *pmutex);
-
-/**
- * Get the exploded time in the platforms native format.
- * @param ostime the native time format
- * @param aprtime the time to convert
- */
-APR_DECLARE(apr_status_t) apr_os_exp_time_get(apr_os_exp_time_t **ostime,
-                                 apr_time_exp_t *aprtime);
-
-/**
- * Get the imploded time in the platforms native format.
- * @param ostime  the native time format
- * @param aprtime the time to convert
- */
-APR_DECLARE(apr_status_t) apr_os_imp_time_get(apr_os_imp_time_t **ostime, 
-                                              apr_time_t *aprtime);
-
-/**
- * convert the shm from apr type to os specific type.
- * @param osshm The os specific shm representation
- * @param shm The apr shm to convert.
- */   
-APR_DECLARE(apr_status_t) apr_os_shm_get(apr_os_shm_t *osshm,
-                                         apr_shm_t *shm);
-
-#if APR_HAS_THREADS || defined(DOXYGEN)
-/** 
- * @defgroup apr_os_thread Thread portability Routines
- * @{ 
- */
-/**
- * convert the thread to os specific type from apr type.
- * @param thethd The apr thread to convert
- * @param thd The os specific thread we are converting to
- */
-APR_DECLARE(apr_status_t) apr_os_thread_get(apr_os_thread_t **thethd, 
-                                            apr_thread_t *thd);
-
-/**
- * convert the thread private memory key to os specific type from an apr type.
- * @param thekey The apr handle we are converting from.
- * @param key The os specific handle we are converting to.
- */
-APR_DECLARE(apr_status_t) apr_os_threadkey_get(apr_os_threadkey_t *thekey,
-                                               apr_threadkey_t *key);
-
-/**
- * convert the thread from os specific type to apr type.
- * @param thd The apr thread we are converting to.
- * @param thethd The os specific thread to convert
- * @param cont The pool to use if it is needed.
- */
-APR_DECLARE(apr_status_t) apr_os_thread_put(apr_thread_t **thd,
-                                            apr_os_thread_t *thethd,
-                                            apr_pool_t *cont);
-
-/**
- * convert the thread private memory key from os specific type to apr type.
- * @param key The apr handle we are converting to.
- * @param thekey The os specific handle to convert
- * @param cont The pool to use if it is needed.
- */
-APR_DECLARE(apr_status_t) apr_os_threadkey_put(apr_threadkey_t **key,
-                                               apr_os_threadkey_t *thekey,
-                                               apr_pool_t *cont);
-/**
- * Get the thread ID
- */
-APR_DECLARE(apr_os_thread_t) apr_os_thread_current(void);
-
-/**
- * Compare two thread id's
- * @param tid1 1st Thread ID to compare
- * @param tid2 2nd Thread ID to compare
- */ 
-APR_DECLARE(int) apr_os_thread_equal(apr_os_thread_t tid1, 
-                                     apr_os_thread_t tid2);
-
-/** @} */
-#endif /* APR_HAS_THREADS */
-
-/**
- * convert the file from os specific type to apr type.
- * @param file The apr file we are converting to.
- * @param thefile The os specific file to convert
- * @param flags The flags that were used to open this file.
- * @param cont The pool to use if it is needed.
- * @remark On Unix, it is only possible to put a file descriptor into
- *         an apr file type.
- */
-APR_DECLARE(apr_status_t) apr_os_file_put(apr_file_t **file,
-                                          apr_os_file_t *thefile,
-                                          apr_int32_t flags, apr_pool_t *cont); 
-
-/**
- * convert the file from os specific type to apr type.
- * @param file The apr file we are converting to.
- * @param thefile The os specific pipe to convert
- * @param cont The pool to use if it is needed.
- * @remark On Unix, it is only possible to put a file descriptor into
- *         an apr file type.
- */
-APR_DECLARE(apr_status_t) apr_os_pipe_put(apr_file_t **file,
-                                          apr_os_file_t *thefile,
-                                          apr_pool_t *cont);
-
-/**
- * convert the file from os specific type to apr type.
- * @param file The apr file we are converting to.
- * @param thefile The os specific pipe to convert
- * @param register_cleanup A cleanup will be registered on the apr_file_t
- *   to issue apr_file_close().
- * @param cont The pool to use if it is needed.
- * @remark On Unix, it is only possible to put a file descriptor into
- *         an apr file type.
- */
-APR_DECLARE(apr_status_t) apr_os_pipe_put_ex(apr_file_t **file,
-                                             apr_os_file_t *thefile,
-                                             int register_cleanup,
-                                             apr_pool_t *cont);
-
-/**
- * convert the dir from os specific type to apr type.
- * @param dir The apr dir we are converting to.
- * @param thedir The os specific dir to convert
- * @param cont The pool to use when creating to apr directory.
- */
-APR_DECLARE(apr_status_t) apr_os_dir_put(apr_dir_t **dir,
-                                         apr_os_dir_t *thedir,
-                                         apr_pool_t *cont); 
-
-/**
- * Convert a socket from the os specific type to the apr type
- * @param sock The pool to use.
- * @param thesock The socket to convert to.
- * @param cont The socket we are converting to an apr type.
- * @remark If it is a true socket, it is best to call apr_os_sock_make()
- *         and provide APR with more information about the socket.
- */
-APR_DECLARE(apr_status_t) apr_os_sock_put(apr_socket_t **sock, 
-                                          apr_os_sock_t *thesock, 
-                                          apr_pool_t *cont);
-
-/**
- * Create a socket from an existing descriptor and local and remote
- * socket addresses.
- * @param apr_sock The new socket that has been set up
- * @param os_sock_info The os representation of the socket handle and
- *        other characteristics of the socket
- * @param cont The pool to use
- * @remark If you only know the descriptor/handle or if it isn't really
- *         a true socket, use apr_os_sock_put() instead.
- */
-APR_DECLARE(apr_status_t) apr_os_sock_make(apr_socket_t **apr_sock,
-                                           apr_os_sock_info_t *os_sock_info,
-                                           apr_pool_t *cont);
-
-/**
- * Convert the proc mutex from os specific type to apr type
- * @param pmutex The apr proc mutex we are converting to.
- * @param ospmutex The os specific proc mutex to convert.
- * @param cont The pool to use if it is needed.
- */
-APR_DECLARE(apr_status_t) apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex,
-                                                apr_os_proc_mutex_t *ospmutex,
-                                                apr_pool_t *cont); 
-
-/**
- * Put the imploded time in the APR format.
- * @param aprtime the APR time format
- * @param ostime the time to convert
- * @param cont the pool to use if necessary
- */
-APR_DECLARE(apr_status_t) apr_os_imp_time_put(apr_time_t *aprtime,
-                                              apr_os_imp_time_t **ostime,
-                                              apr_pool_t *cont); 
-
-/**
- * Put the exploded time in the APR format.
- * @param aprtime the APR time format
- * @param ostime the time to convert
- * @param cont the pool to use if necessary
- */
-APR_DECLARE(apr_status_t) apr_os_exp_time_put(apr_time_exp_t *aprtime,
-                                              apr_os_exp_time_t **ostime,
-                                              apr_pool_t *cont); 
-
-/**
- * convert the shared memory from os specific type to apr type.
- * @param shm The apr shm representation of osshm
- * @param osshm The os specific shm identity
- * @param cont The pool to use if it is needed.
- * @remark On fork()ed architectures, this is typically nothing more than
- * the memory block mapped.  On non-fork architectures, this is typically
- * some internal handle to pass the mapping from process to process.
- */
-APR_DECLARE(apr_status_t) apr_os_shm_put(apr_shm_t **shm,
-                                         apr_os_shm_t *osshm,
-                                         apr_pool_t *cont); 
-
-
-#if APR_HAS_DSO || defined(DOXYGEN)
-/** 
- * @defgroup apr_os_dso DSO (Dynamic Loading) Portabiliity Routines
- * @{
- */
-/**
- * convert the dso handle from os specific to apr
- * @param dso The apr handle we are converting to
- * @param thedso the os specific handle to convert
- * @param pool the pool to use if it is needed
- */
-APR_DECLARE(apr_status_t) apr_os_dso_handle_put(apr_dso_handle_t **dso,
-                                                apr_os_dso_handle_t thedso,
-                                                apr_pool_t *pool);
-
-/**
- * convert the apr dso handle into an os specific one
- * @param aprdso The apr dso handle to convert
- * @param dso The os specific dso to return
- */
-APR_DECLARE(apr_status_t) apr_os_dso_handle_get(apr_os_dso_handle_t *dso,
-                                                apr_dso_handle_t *aprdso);
-
-#if APR_HAS_OS_UUID
-/**
- * Private: apr-util's apr_uuid module when supported by the platform
- */
-APR_DECLARE(apr_status_t) apr_os_uuid_get(unsigned char *uuid_data);
-#endif
-
-/** @} */
-#endif /* APR_HAS_DSO */
-
-
-/**
- * Get the name of the system default characer set.
- * @param pool the pool to allocate the name from, if needed
- */
-APR_DECLARE(const char*) apr_os_default_encoding(apr_pool_t *pool);
-
-
-/**
- * Get the name of the current locale character set.
- * @param pool the pool to allocate the name from, if needed
- * @remark Defers to apr_os_default_encoding if the current locale's
- * data can't be retreved on this system.
- */
-APR_DECLARE(const char*) apr_os_locale_encoding(apr_pool_t *pool);
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ! APR_PORTABLE_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_proc_mutex.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_proc_mutex.h
deleted file mode 100644
index ceb9c82a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_proc_mutex.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_PROC_MUTEX_H
-#define APR_PROC_MUTEX_H
-
-/**
- * @file apr_proc_mutex.h
- * @brief APR Process Locking Routines
- */
-
-#include "apr.h"
-#include "apr_pools.h"
-#include "apr_errno.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup apr_proc_mutex Process Locking Routines
- * @ingroup APR 
- * @{
- */
-
-/** 
- * Enumerated potential types for APR process locking methods
- * @warning Check APR_HAS_foo_SERIALIZE defines to see if the platform supports
- *          APR_LOCK_foo.  Only APR_LOCK_DEFAULT is portable.
- */
-typedef enum {
-    APR_LOCK_FCNTL,         /**< fcntl() */
-    APR_LOCK_FLOCK,         /**< flock() */
-    APR_LOCK_SYSVSEM,       /**< System V Semaphores */
-    APR_LOCK_PROC_PTHREAD,  /**< POSIX pthread process-based locking */
-    APR_LOCK_POSIXSEM,      /**< POSIX semaphore process-based locking */
-    APR_LOCK_DEFAULT        /**< Use the default process lock */
-} apr_lockmech_e;
-
-/** Opaque structure representing a process mutex. */
-typedef struct apr_proc_mutex_t apr_proc_mutex_t;
-
-/*   Function definitions */
-
-/**
- * Create and initialize a mutex that can be used to synchronize processes.
- * @param mutex the memory address where the newly created mutex will be
- *        stored.
- * @param fname A file name to use if the lock mechanism requires one.  This
- *        argument should always be provided.  The lock code itself will
- *        determine if it should be used.
- * @param mech The mechanism to use for the interprocess lock, if any; one of
- * <PRE>
- *            APR_LOCK_FCNTL
- *            APR_LOCK_FLOCK
- *            APR_LOCK_SYSVSEM
- *            APR_LOCK_POSIXSEM
- *            APR_LOCK_PROC_PTHREAD
- *            APR_LOCK_DEFAULT     pick the default mechanism for the platform
- * </PRE>
- * @param pool the pool from which to allocate the mutex.
- * @see apr_lockmech_e
- * @warning Check APR_HAS_foo_SERIALIZE defines to see if the platform supports
- *          APR_LOCK_foo.  Only APR_LOCK_DEFAULT is portable.
- */
-APR_DECLARE(apr_status_t) apr_proc_mutex_create(apr_proc_mutex_t **mutex,
-                                                const char *fname,
-                                                apr_lockmech_e mech,
-                                                apr_pool_t *pool);
-
-/**
- * Re-open a mutex in a child process.
- * @param mutex The newly re-opened mutex structure.
- * @param fname A file name to use if the mutex mechanism requires one.  This
- *              argument should always be provided.  The mutex code itself will
- *              determine if it should be used.  This filename should be the 
- *              same one that was passed to apr_proc_mutex_create().
- * @param pool The pool to operate on.
- * @remark This function must be called to maintain portability, even
- *         if the underlying lock mechanism does not require it.
- */
-APR_DECLARE(apr_status_t) apr_proc_mutex_child_init(apr_proc_mutex_t **mutex,
-                                                    const char *fname,
-                                                    apr_pool_t *pool);
-
-/**
- * Acquire the lock for the given mutex. If the mutex is already locked,
- * the current thread will be put to sleep until the lock becomes available.
- * @param mutex the mutex on which to acquire the lock.
- */
-APR_DECLARE(apr_status_t) apr_proc_mutex_lock(apr_proc_mutex_t *mutex);
-
-/**
- * Attempt to acquire the lock for the given mutex. If the mutex has already
- * been acquired, the call returns immediately with APR_EBUSY. Note: it
- * is important that the APR_STATUS_IS_EBUSY(s) macro be used to determine
- * if the return value was APR_EBUSY, for portability reasons.
- * @param mutex the mutex on which to attempt the lock acquiring.
- */
-APR_DECLARE(apr_status_t) apr_proc_mutex_trylock(apr_proc_mutex_t *mutex);
-
-/**
- * Release the lock for the given mutex.
- * @param mutex the mutex from which to release the lock.
- */
-APR_DECLARE(apr_status_t) apr_proc_mutex_unlock(apr_proc_mutex_t *mutex);
-
-/**
- * Destroy the mutex and free the memory associated with the lock.
- * @param mutex the mutex to destroy.
- */
-APR_DECLARE(apr_status_t) apr_proc_mutex_destroy(apr_proc_mutex_t *mutex);
-
-/**
- * Destroy the mutex and free the memory associated with the lock.
- * @param mutex the mutex to destroy.
- * @note This function is generally used to kill a cleanup on an already
- *       created mutex
- */
-APR_DECLARE(apr_status_t) apr_proc_mutex_cleanup(void *mutex);
-
-/**
- * Return the name of the lockfile for the mutex, or NULL
- * if the mutex doesn't use a lock file
- */
-
-APR_DECLARE(const char *) apr_proc_mutex_lockfile(apr_proc_mutex_t *mutex);
-
-/**
- * Display the name of the mutex, as it relates to the actual method used.
- * This matches the valid options for Apache's AcceptMutex directive
- * @param mutex the name of the mutex
- */
-APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex);
-
-/**
- * Display the name of the default mutex: APR_LOCK_DEFAULT
- */
-APR_DECLARE(const char *) apr_proc_mutex_defname(void);
-
-/**
- * Get the pool used by this proc_mutex.
- * @return apr_pool_t the pool
- */
-APR_POOL_DECLARE_ACCESSOR(proc_mutex);
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ! APR_PROC_MUTEX_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_ring.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_ring.h
deleted file mode 100644
index 79efb436..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_ring.h
+++ /dev/null
@@ -1,551 +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.
- */
-
-/*
- * This code draws heavily from the 4.4BSD <sys/queue.h> macros
- * and Dean Gaudet's "splim/ring.h".
- * <http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/sys/queue.h>
- * <http://www.arctic.org/~dean/splim/>
- *
- * We'd use Dean's code directly if we could guarantee the
- * availability of inline functions.
- */
-
-#ifndef APR_RING_H
-#define APR_RING_H
-
-/**
- * @file apr_ring.h
- * @brief APR Rings
- */
-
-/*
- * for offsetof()
- */
-#include "apr_general.h"
-
-/**
- * @defgroup apr_ring Ring Macro Implementations
- * @ingroup APR 
- * A ring is a kind of doubly-linked list that can be manipulated
- * without knowing where its head is.
- * @{
- */
-
-/**
- * The Ring Element
- *
- * A ring element struct is linked to the other elements in the ring
- * through its ring entry field, e.g.
- * <pre>
- *      struct my_element_t {
- *          APR_RING_ENTRY(my_element_t) link;
- *          int foo;
- *          char *bar;
- *      };
- * </pre>
- *
- * An element struct may be put on more than one ring if it has more
- * than one APR_RING_ENTRY field. Each APR_RING_ENTRY has a corresponding
- * APR_RING_HEAD declaration.
- *
- * @warning For strict C standards compliance you should put the APR_RING_ENTRY
- * first in the element struct unless the head is always part of a larger
- * object with enough earlier fields to accommodate the offsetof() used
- * to compute the ring sentinel below. You can usually ignore this caveat.
- */
-#define APR_RING_ENTRY(elem)						\
-    struct {								\
-	struct elem *next;						\
-	struct elem *prev;						\
-    }
-
-/**
- * The Ring Head
- *
- * Each ring is managed via its head, which is a struct declared like this:
- * <pre>
- *      APR_RING_HEAD(my_ring_t, my_element_t);
- *      struct my_ring_t ring, *ringp;
- * </pre>
- *
- * This struct looks just like the element link struct so that we can
- * be sure that the typecasting games will work as expected.
- *
- * The first element in the ring is next after the head, and the last
- * element is just before the head.
- */
-#define APR_RING_HEAD(head, elem)					\
-    struct head {							\
-	struct elem * volatile next;					\
-	struct elem * volatile prev;					\
-    }
-
-/**
- * The Ring Sentinel
- *
- * This is the magic pointer value that occurs before the first and
- * after the last elements in the ring, computed from the address of
- * the ring's head.  The head itself isn't an element, but in order to
- * get rid of all the special cases when dealing with the ends of the
- * ring, we play typecasting games to make it look like one.
- *
- * Here is a diagram to illustrate the arrangements of the next and
- * prev pointers of each element in a single ring. Note that they point
- * to the start of each element, not to the APR_RING_ENTRY structure.
- *
- * <pre>
- *     +->+------+<-+  +->+------+<-+  +->+------+<-+
- *     |  |struct|  |  |  |struct|  |  |  |struct|  |
- *    /   | elem |   \/   | elem |   \/   | elem |  \
- * ...    |      |   /\   |      |   /\   |      |   ...
- *        +------+  |  |  +------+  |  |  +------+
- *   ...--|prev  |  |  +--|ring  |  |  +--|prev  |
- *        |  next|--+     | entry|--+     |  next|--...
- *        +------+        +------+        +------+
- *        | etc. |        | etc. |        | etc. |
- *        :      :        :      :        :      :
- * </pre>
- *
- * The APR_RING_HEAD is nothing but a bare APR_RING_ENTRY. The prev
- * and next pointers in the first and last elements don't actually
- * point to the head, they point to a phantom place called the
- * sentinel. Its value is such that last->next->next == first because
- * the offset from the sentinel to the head's next pointer is the same
- * as the offset from the start of an element to its next pointer.
- * This also works in the opposite direction.
- *
- * <pre>
- *        last                            first
- *     +->+------+<-+  +->sentinel<-+  +->+------+<-+
- *     |  |struct|  |  |            |  |  |struct|  |
- *    /   | elem |   \/              \/   | elem |  \
- * ...    |      |   /\              /\   |      |   ...
- *        +------+  |  |  +------+  |  |  +------+
- *   ...--|prev  |  |  +--|ring  |  |  +--|prev  |
- *        |  next|--+     |  head|--+     |  next|--...
- *        +------+        +------+        +------+
- *        | etc. |                        | etc. |
- *        :      :                        :      :
- * </pre>
- *
- * Note that the offset mentioned above is different for each kind of
- * ring that the element may be on, and each kind of ring has a unique
- * name for its APR_RING_ENTRY in each element, and has its own type
- * for its APR_RING_HEAD.
- *
- * Note also that if the offset is non-zero (which is required if an
- * element has more than one APR_RING_ENTRY), the unreality of the
- * sentinel may have bad implications on very perverse implementations
- * of C -- see the warning in APR_RING_ENTRY.
- *
- * @param hp   The head of the ring
- * @param elem The name of the element struct
- * @param link The name of the APR_RING_ENTRY in the element struct
- */
-#define APR_RING_SENTINEL(hp, elem, link)				\
-    (struct elem *)((char *)(hp) - APR_OFFSETOF(struct elem, link))
-
-/**
- * The first element of the ring
- * @param hp   The head of the ring
- */
-#define APR_RING_FIRST(hp)	(hp)->next
-/**
- * The last element of the ring
- * @param hp   The head of the ring
- */
-#define APR_RING_LAST(hp)	(hp)->prev
-/**
- * The next element in the ring
- * @param ep   The current element
- * @param link The name of the APR_RING_ENTRY in the element struct
- */
-#define APR_RING_NEXT(ep, link)	(ep)->link.next
-/**
- * The previous element in the ring
- * @param ep   The current element
- * @param link The name of the APR_RING_ENTRY in the element struct
- */
-#define APR_RING_PREV(ep, link)	(ep)->link.prev
-
-
-/**
- * Initialize a ring
- * @param hp   The head of the ring
- * @param elem The name of the element struct
- * @param link The name of the APR_RING_ENTRY in the element struct
- */
-#define APR_RING_INIT(hp, elem, link) do {				\
-	APR_RING_FIRST((hp)) = APR_RING_SENTINEL((hp), elem, link);	\
-	APR_RING_LAST((hp))  = APR_RING_SENTINEL((hp), elem, link);	\
-    } while (0)
-
-/**
- * Determine if a ring is empty
- * @param hp   The head of the ring
- * @param elem The name of the element struct
- * @param link The name of the APR_RING_ENTRY in the element struct
- * @return true or false
- */
-#define APR_RING_EMPTY(hp, elem, link)					\
-    (APR_RING_FIRST((hp)) == APR_RING_SENTINEL((hp), elem, link))
-
-/**
- * Initialize a singleton element
- * @param ep   The element
- * @param link The name of the APR_RING_ENTRY in the element struct
- */
-#define APR_RING_ELEM_INIT(ep, link) do {				\
-	APR_RING_NEXT((ep), link) = (ep);				\
-	APR_RING_PREV((ep), link) = (ep);				\
-    } while (0)
-
-
-/**
- * Splice the sequence ep1..epN into the ring before element lep
- *   (..lep.. becomes ..ep1..epN..lep..)
- * @warning This doesn't work for splicing before the first element or on
- *   empty rings... see APR_RING_SPLICE_HEAD for one that does
- * @param lep  Element in the ring to splice before
- * @param ep1  First element in the sequence to splice in
- * @param epN  Last element in the sequence to splice in
- * @param link The name of the APR_RING_ENTRY in the element struct
- */
-#define APR_RING_SPLICE_BEFORE(lep, ep1, epN, link) do {		\
-	APR_RING_NEXT((epN), link) = (lep);				\
-	APR_RING_PREV((ep1), link) = APR_RING_PREV((lep), link);	\
-	APR_RING_NEXT(APR_RING_PREV((lep), link), link) = (ep1);	\
-	APR_RING_PREV((lep), link) = (epN);				\
-    } while (0)
-
-/**
- * Splice the sequence ep1..epN into the ring after element lep
- *   (..lep.. becomes ..lep..ep1..epN..)
- * @warning This doesn't work for splicing after the last element or on
- *   empty rings... see APR_RING_SPLICE_TAIL for one that does
- * @param lep  Element in the ring to splice after
- * @param ep1  First element in the sequence to splice in
- * @param epN  Last element in the sequence to splice in
- * @param link The name of the APR_RING_ENTRY in the element struct
- */
-#define APR_RING_SPLICE_AFTER(lep, ep1, epN, link) do {			\
-	APR_RING_PREV((ep1), link) = (lep);				\
-	APR_RING_NEXT((epN), link) = APR_RING_NEXT((lep), link);	\
-	APR_RING_PREV(APR_RING_NEXT((lep), link), link) = (epN);	\
-	APR_RING_NEXT((lep), link) = (ep1);				\
-    } while (0)
-
-/**
- * Insert the element nep into the ring before element lep
- *   (..lep.. becomes ..nep..lep..)
- * @warning This doesn't work for inserting before the first element or on
- *   empty rings... see APR_RING_INSERT_HEAD for one that does
- * @param lep  Element in the ring to insert before
- * @param nep  Element to insert
- * @param link The name of the APR_RING_ENTRY in the element struct
- */
-#define APR_RING_INSERT_BEFORE(lep, nep, link)				\
-	APR_RING_SPLICE_BEFORE((lep), (nep), (nep), link)
-
-/**
- * Insert the element nep into the ring after element lep
- *   (..lep.. becomes ..lep..nep..)
- * @warning This doesn't work for inserting after the last element or on
- *   empty rings... see APR_RING_INSERT_TAIL for one that does
- * @param lep  Element in the ring to insert after
- * @param nep  Element to insert
- * @param link The name of the APR_RING_ENTRY in the element struct
- */
-#define APR_RING_INSERT_AFTER(lep, nep, link)				\
-	APR_RING_SPLICE_AFTER((lep), (nep), (nep), link)
-
-
-/**
- * Splice the sequence ep1..epN into the ring before the first element
- *   (..hp.. becomes ..hp..ep1..epN..)
- * @param hp   Head of the ring
- * @param ep1  First element in the sequence to splice in
- * @param epN  Last element in the sequence to splice in
- * @param elem The name of the element struct
- * @param link The name of the APR_RING_ENTRY in the element struct
- */
-#define APR_RING_SPLICE_HEAD(hp, ep1, epN, elem, link)			\
-	APR_RING_SPLICE_AFTER(APR_RING_SENTINEL((hp), elem, link),	\
-			     (ep1), (epN), link)
-
-/**
- * Splice the sequence ep1..epN into the ring after the last element
- *   (..hp.. becomes ..ep1..epN..hp..)
- * @param hp   Head of the ring
- * @param ep1  First element in the sequence to splice in
- * @param epN  Last element in the sequence to splice in
- * @param elem The name of the element struct
- * @param link The name of the APR_RING_ENTRY in the element struct
- */
-#define APR_RING_SPLICE_TAIL(hp, ep1, epN, elem, link)			\
-	APR_RING_SPLICE_BEFORE(APR_RING_SENTINEL((hp), elem, link),	\
-			     (ep1), (epN), link)
-
-/**
- * Insert the element nep into the ring before the first element
- *   (..hp.. becomes ..hp..nep..)
- * @param hp   Head of the ring
- * @param nep  Element to insert
- * @param elem The name of the element struct
- * @param link The name of the APR_RING_ENTRY in the element struct
- */
-#define APR_RING_INSERT_HEAD(hp, nep, elem, link)			\
-	APR_RING_SPLICE_HEAD((hp), (nep), (nep), elem, link)
-
-/**
- * Insert the element nep into the ring after the last element
- *   (..hp.. becomes ..nep..hp..)
- * @param hp   Head of the ring
- * @param nep  Element to insert
- * @param elem The name of the element struct
- * @param link The name of the APR_RING_ENTRY in the element struct
- */
-#define APR_RING_INSERT_TAIL(hp, nep, elem, link)			\
-	APR_RING_SPLICE_TAIL((hp), (nep), (nep), elem, link)
-
-/**
- * Concatenate ring h2 onto the end of ring h1, leaving h2 empty.
- * @param h1   Head of the ring to concatenate onto
- * @param h2   Head of the ring to concatenate
- * @param elem The name of the element struct
- * @param link The name of the APR_RING_ENTRY in the element struct
- */
-#define APR_RING_CONCAT(h1, h2, elem, link) do {			\
-	if (!APR_RING_EMPTY((h2), elem, link)) {			\
-	    APR_RING_SPLICE_BEFORE(APR_RING_SENTINEL((h1), elem, link),	\
-				  APR_RING_FIRST((h2)),			\
-				  APR_RING_LAST((h2)), link);		\
-	    APR_RING_INIT((h2), elem, link);				\
-	}								\
-    } while (0)
-
-/**
- * Prepend ring h2 onto the beginning of ring h1, leaving h2 empty.
- * @param h1   Head of the ring to prepend onto
- * @param h2   Head of the ring to prepend
- * @param elem The name of the element struct
- * @param link The name of the APR_RING_ENTRY in the element struct
- */
-#define APR_RING_PREPEND(h1, h2, elem, link) do {			\
-	if (!APR_RING_EMPTY((h2), elem, link)) {			\
-	    APR_RING_SPLICE_AFTER(APR_RING_SENTINEL((h1), elem, link),	\
-				  APR_RING_FIRST((h2)),			\
-				  APR_RING_LAST((h2)), link);		\
-	    APR_RING_INIT((h2), elem, link);				\
-	}								\
-    } while (0)
-
-/**
- * Unsplice a sequence of elements from a ring
- * @warning The unspliced sequence is left with dangling pointers at either end
- * @param ep1  First element in the sequence to unsplice
- * @param epN  Last element in the sequence to unsplice
- * @param link The name of the APR_RING_ENTRY in the element struct
- */
-#define APR_RING_UNSPLICE(ep1, epN, link) do {				\
-	APR_RING_NEXT(APR_RING_PREV((ep1), link), link) =		\
-		     APR_RING_NEXT((epN), link);			\
-	APR_RING_PREV(APR_RING_NEXT((epN), link), link) =		\
-		     APR_RING_PREV((ep1), link);			\
-    } while (0)
-
-/**
- * Remove a single element from a ring
- * @warning The unspliced element is left with dangling pointers at either end
- * @param ep   Element to remove
- * @param link The name of the APR_RING_ENTRY in the element struct
- */
-#define APR_RING_REMOVE(ep, link)					\
-    APR_RING_UNSPLICE((ep), (ep), link)
-
-
-/**
- * Iterate through a ring
- * @param ep The current element
- * @param hp The ring to iterate over
- * @param elem The name of the element struct
- * @param link The name of the APR_RING_ENTRY in the element struct
- * @remark This is the same as either:
- * <pre>
- *	ep = APR_RING_FIRST(hp);
- * 	while (ep != APR_RING_SENTINEL(hp, elem, link)) {
- *	    ...
- * 	    ep = APR_RING_NEXT(ep, link);
- * 	}
- *   OR
- * 	for (ep = APR_RING_FIRST(hp);
- *           ep != APR_RING_SENTINEL(hp, elem, link);
- *           ep = APR_RING_NEXT(ep, link)) {
- *	    ...
- * 	}
- * </pre>
- * @warning Be aware that you cannot change the value of ep within
- * the foreach loop, nor can you destroy the ring element it points to.
- * Modifying the prev and next pointers of the element is dangerous
- * but can be done if you're careful.  If you change ep's value or
- * destroy the element it points to, then APR_RING_FOREACH
- * will have no way to find out what element to use for its next
- * iteration.  The reason for this can be seen by looking closely
- * at the equivalent loops given in the tip above.  So, for example,
- * if you are writing a loop that empties out a ring one element
- * at a time, APR_RING_FOREACH just won't work for you.  Do it
- * by hand, like so:
- * <pre>
- *      while (!APR_RING_EMPTY(hp, elem, link)) {
- *          ep = APR_RING_FIRST(hp);
- *          ...
- *          APR_RING_REMOVE(ep, link);
- *      }
- * </pre>
- * @deprecated This macro causes more headaches than it's worth.  Use
- * one of the alternatives documented here instead; the clarity gained
- * in what's really going on is well worth the extra line or two of code.
- * This macro will be removed at some point in the future.
- */
-#define APR_RING_FOREACH(ep, hp, elem, link)				\
-    for ((ep)  = APR_RING_FIRST((hp));					\
-	 (ep) != APR_RING_SENTINEL((hp), elem, link);			\
-	 (ep)  = APR_RING_NEXT((ep), link))
-
-/**
- * Iterate through a ring backwards
- * @param ep The current element
- * @param hp The ring to iterate over
- * @param elem The name of the element struct
- * @param link The name of the APR_RING_ENTRY in the element struct
- * @see APR_RING_FOREACH
- */
-#define APR_RING_FOREACH_REVERSE(ep, hp, elem, link)			\
-    for ((ep)  = APR_RING_LAST((hp));					\
-	 (ep) != APR_RING_SENTINEL((hp), elem, link);			\
-	 (ep)  = APR_RING_PREV((ep), link))
-
-
-/* Debugging tools: */
-
-#ifdef APR_RING_DEBUG
-#include <stdio.h>
-#include <assert.h>
-
-#define APR_RING_CHECK_ONE(msg, ptr)					\
-	fprintf(stderr, "*** %s %p\n", msg, ptr)
-
-#define APR_RING_CHECK(hp, elem, link, msg)				\
-	APR_RING_CHECK_ELEM(APR_RING_SENTINEL(hp, elem, link), elem, link, msg)
-
-#define APR_RING_CHECK_ELEM(ep, elem, link, msg) do {			\
-	struct elem *start = (ep);					\
-	struct elem *here = start;					\
-	fprintf(stderr, "*** ring check start -- %s\n", msg);		\
-	do {								\
-	    fprintf(stderr, "\telem %p\n", here);			\
-	    fprintf(stderr, "\telem->next %p\n",			\
-		    APR_RING_NEXT(here, link));				\
-	    fprintf(stderr, "\telem->prev %p\n",			\
-		    APR_RING_PREV(here, link));				\
-	    fprintf(stderr, "\telem->next->prev %p\n",			\
-		    APR_RING_PREV(APR_RING_NEXT(here, link), link));	\
-	    fprintf(stderr, "\telem->prev->next %p\n",			\
-		    APR_RING_NEXT(APR_RING_PREV(here, link), link));	\
-	    if (APR_RING_PREV(APR_RING_NEXT(here, link), link) != here) { \
-		fprintf(stderr, "\t*** elem->next->prev != elem\n");	\
-		break;							\
-	    }								\
-	    if (APR_RING_NEXT(APR_RING_PREV(here, link), link) != here) { \
-		fprintf(stderr, "\t*** elem->prev->next != elem\n");	\
-		break;							\
-	    }								\
-	    here = APR_RING_NEXT(here, link);				\
-	} while (here != start);					\
-	fprintf(stderr, "*** ring check end\n");			\
-    } while (0)
-
-#define APR_RING_CHECK_CONSISTENCY(hp, elem, link)			\
-	APR_RING_CHECK_ELEM_CONSISTENCY(APR_RING_SENTINEL(hp, elem, link),\
-					elem, link)
-
-#define APR_RING_CHECK_ELEM_CONSISTENCY(ep, elem, link) do {		\
-	struct elem *start = (ep);					\
-	struct elem *here = start;					\
-	do {								\
-	    assert(APR_RING_PREV(APR_RING_NEXT(here, link), link) == here); \
-	    assert(APR_RING_NEXT(APR_RING_PREV(here, link), link) == here); \
-	    here = APR_RING_NEXT(here, link);				\
-	} while (here != start);					\
-    } while (0)
-
-#else
-/**
- * Print a single pointer value to STDERR
- *   (This is a no-op unless APR_RING_DEBUG is defined.)
- * @param msg Descriptive message
- * @param ptr Pointer value to print
- */
-#define APR_RING_CHECK_ONE(msg, ptr)
-/**
- * Dump all ring pointers to STDERR, starting with the head and looping all
- * the way around the ring back to the head.  Aborts if an inconsistency
- * is found.
- *   (This is a no-op unless APR_RING_DEBUG is defined.)
- * @param hp   Head of the ring
- * @param elem The name of the element struct
- * @param link The name of the APR_RING_ENTRY in the element struct
- * @param msg  Descriptive message
- */
-#define APR_RING_CHECK(hp, elem, link, msg)
-/**
- * Loops around a ring and checks all the pointers for consistency.  Pops
- * an assertion if any inconsistency is found.  Same idea as APR_RING_CHECK()
- * except that it's silent if all is well.
- *   (This is a no-op unless APR_RING_DEBUG is defined.)
- * @param hp   Head of the ring
- * @param elem The name of the element struct
- * @param link The name of the APR_RING_ENTRY in the element struct
- */
-#define APR_RING_CHECK_CONSISTENCY(hp, elem, link)
-/**
- * Dump all ring pointers to STDERR, starting with the given element and
- * looping all the way around the ring back to that element.  Aborts if
- * an inconsistency is found.
- *   (This is a no-op unless APR_RING_DEBUG is defined.)
- * @param ep   The element
- * @param elem The name of the element struct
- * @param link The name of the APR_RING_ENTRY in the element struct
- * @param msg  Descriptive message
- */
-#define APR_RING_CHECK_ELEM(ep, elem, link, msg)
-/**
- * Loops around a ring, starting with the given element, and checks all
- * the pointers for consistency.  Pops an assertion if any inconsistency
- * is found.  Same idea as APR_RING_CHECK_ELEM() except that it's silent
- * if all is well.
- *   (This is a no-op unless APR_RING_DEBUG is defined.)
- * @param ep   The element
- * @param elem The name of the element struct
- * @param link The name of the APR_RING_ENTRY in the element struct
- */
-#define APR_RING_CHECK_ELEM_CONSISTENCY(ep, elem, link)
-#endif
-
-/** @} */ 
-
-#endif /* !APR_RING_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_shm.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_shm.h
deleted file mode 100644
index 5373f6a7..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_shm.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_SHM_H
-#define APR_SHM_H
-
-/**
- * @file apr_shm.h
- * @brief APR Shared Memory Routines
- */
-
-#include "apr.h"
-#include "apr_pools.h"
-#include "apr_errno.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup apr_shm Shared Memory Routines
- * @ingroup APR 
- * @{
- */
-
-/**
- * Private, platform-specific data struture representing a shared memory
- * segment.
- */
-typedef struct apr_shm_t apr_shm_t;
-
-/**
- * Create and make accessable a shared memory segment.
- * @param m The shared memory structure to create.
- * @param reqsize The desired size of the segment.
- * @param filename The file to use for shared memory on platforms that
- *        require it.
- * @param pool the pool from which to allocate the shared memory
- *        structure.
- * @remark A note about Anonymous vs. Named shared memory segments:
- *         Not all plaforms support anonymous shared memory segments, but in
- *         some cases it is prefered over other types of shared memory
- *         implementations. Passing a NULL 'file' parameter to this function
- *         will cause the subsystem to use anonymous shared memory segments.
- *         If such a system is not available, APR_ENOTIMPL is returned.
- * @remark A note about allocation sizes:
- *         On some platforms it is necessary to store some metainformation
- *         about the segment within the actual segment. In order to supply
- *         the caller with the requested size it may be necessary for the
- *         implementation to request a slightly greater segment length
- *         from the subsystem. In all cases, the apr_shm_baseaddr_get()
- *         function will return the first usable byte of memory.
- * 
- */
-APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
-                                         apr_size_t reqsize,
-                                         const char *filename,
-                                         apr_pool_t *pool);
-
-/**
- * Destroy a shared memory segment and associated memory.
- * @param m The shared memory segment structure to destroy.
- */
-APR_DECLARE(apr_status_t) apr_shm_destroy(apr_shm_t *m);
-
-/**
- * Attach to a shared memory segment that was created
- * by another process.
- * @param m The shared memory structure to create.
- * @param filename The file used to create the original segment.
- *        (This MUST match the original filename.)
- * @param pool the pool from which to allocate the shared memory
- *        structure for this process.
- */
-APR_DECLARE(apr_status_t) apr_shm_attach(apr_shm_t **m,
-                                         const char *filename,
-                                         apr_pool_t *pool);
-
-/**
- * Detach from a shared memory segment without destroying it.
- * @param m The shared memory structure representing the segment
- *        to detach from.
- */
-APR_DECLARE(apr_status_t) apr_shm_detach(apr_shm_t *m);
-
-/**
- * Retrieve the base address of the shared memory segment.
- * NOTE: This address is only usable within the callers address
- * space, since this API does not guarantee that other attaching
- * processes will maintain the same address mapping.
- * @param m The shared memory segment from which to retrieve
- *        the base address.
- */
-APR_DECLARE(void *) apr_shm_baseaddr_get(const apr_shm_t *m);
-
-/**
- * Retrieve the length of a shared memory segment in bytes.
- * @param m The shared memory segment from which to retrieve
- *        the segment length.
- */
-APR_DECLARE(apr_size_t) apr_shm_size_get(const apr_shm_t *m);
-
-/**
- * Get the pool used by this shared memory segment.
- */
-APR_POOL_DECLARE_ACCESSOR(shm);
-
-/** @} */ 
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* APR_SHM_T */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_signal.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_signal.h
deleted file mode 100644
index 7f4940a0..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_signal.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_SIGNAL_H
-#define APR_SIGNAL_H
-
-/**
- * @file apr_signal.h 
- * @brief APR Signal Handling
- */
-
-#include "apr.h"
-#include "apr_pools.h"
-
-#if APR_HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup apr_signal Handling
- * @ingroup APR 
- * @{
- */
-
-#if APR_HAVE_SIGACTION || defined(DOXYGEN)
-
-#if defined(DARWIN) && !defined(__cplusplus) && !defined(_ANSI_SOURCE)
-/* work around Darwin header file bugs
- *   http://www.opensource.apple.com/bugs/X/BSD%20Kernel/2657228.html
- */
-#undef SIG_DFL
-#undef SIG_IGN
-#undef SIG_ERR
-#define SIG_DFL (void (*)(int))0
-#define SIG_IGN (void (*)(int))1
-#define SIG_ERR (void (*)(int))-1
-#endif
-
-/** Function prototype for signal handlers */
-typedef void apr_sigfunc_t(int);
-
-/**
- * Set the signal handler function for a given signal
- * @param signo The signal (eg... SIGWINCH)
- * @param func the function to get called
- */
-APR_DECLARE(apr_sigfunc_t *) apr_signal(int signo, apr_sigfunc_t * func);
-
-#if defined(SIG_IGN) && !defined(SIG_ERR)
-#define SIG_ERR ((apr_sigfunc_t *) -1)
-#endif
-
-#else /* !APR_HAVE_SIGACTION */
-#define apr_signal(a, b) signal(a, b)
-#endif
-
-
-/**
- * Get the description for a specific signal number
- * @param signum The signal number
- * @return The description of the signal
- */
-APR_DECLARE(const char *) apr_signal_description_get(int signum);
-
-/** @deprecated @see apr_signal_description_get */
-APR_DECLARE(const char *) apr_signal_get_description(int signum);
-
-/**
- * APR-private function for initializing the signal package
- * @internal
- * @param pglobal The internal, global pool
- */
-void apr_signal_init(apr_pool_t *pglobal);
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* APR_SIGNAL_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_strings.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_strings.h
deleted file mode 100644
index 24cfbdf8..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_strings.h
+++ /dev/null
@@ -1,337 +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.
- */
-
-/* Portions of this file are covered by */
-/* -*- mode: c; c-file-style: "k&r" -*-
-
-  strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
-  Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef APR_STRINGS_H
-#define APR_STRINGS_H
-
-/**
- * @file apr_strings.h
- * @brief APR Strings library
- */
-
-#include "apr.h"
-#include "apr_errno.h"
-#include "apr_pools.h"
-#define APR_WANT_IOVEC
-#include "apr_want.h"
-
-#if APR_HAVE_STDARG_H
-#include <stdarg.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup apr_strings String routines
- * @ingroup APR 
- * @{
- */
-
-/**
- * Do a natural order comparison of two strings.
- * @param a The first string to compare
- * @param b The second string to compare
- * @return Either <0, 0, or >0.  If the first string is less than the second
- *          this returns <0, if they are equivalent it returns 0, and if the
- *          first string is greater than second string it retuns >0.
- */
-APR_DECLARE(int) apr_strnatcmp(char const *a, char const *b);
-
-/**
- * Do a natural order comparison of two strings ignoring the case of the 
- * strings.
- * @param a The first string to compare
- * @param b The second string to compare
- * @return Either <0, 0, or >0.  If the first string is less than the second
- *         this returns <0, if they are equivalent it returns 0, and if the
- *         first string is greater than second string it retuns >0.
- */
-APR_DECLARE(int) apr_strnatcasecmp(char const *a, char const *b);
-
-/**
- * duplicate a string into memory allocated out of a pool
- * @param p The pool to allocate out of
- * @param s The string to duplicate
- * @return The new string
- */
-APR_DECLARE(char *) apr_pstrdup(apr_pool_t *p, const char *s);
-
-/**
- * Create a null-terminated string by making a copy of a sequence
- * of characters and appending a null byte
- * @param p The pool to allocate out of
- * @param s The block of characters to duplicate
- * @param n The number of characters to duplicate
- * @return The new string
- * @remark This is a faster alternative to apr_pstrndup, for use
- *         when you know that the string being duplicated really
- *         has 'n' or more characters.  If the string might contain
- *         fewer characters, use apr_pstrndup.
- */
-APR_DECLARE(char *) apr_pstrmemdup(apr_pool_t *p, const char *s, apr_size_t n);
-
-/**
- * Duplicate at most n characters of a string into memory allocated 
- * out of a pool; the new string will be NUL-terminated
- * @param p The pool to allocate out of
- * @param s The string to duplicate
- * @param n The maximum number of characters to duplicate
- * @return The new string
- * @remark The amount of memory allocated from the pool is the length
- *         of the returned string including the NUL terminator
- */
-APR_DECLARE(char *) apr_pstrndup(apr_pool_t *p, const char *s, apr_size_t n);
-
-/**
- * Duplicate a block of memory.
- *
- * @param p The pool to allocate from
- * @param m The memory to duplicate
- * @param n The number of bytes to duplicate
- * @return The new block of memory
- */
-APR_DECLARE(void *) apr_pmemdup(apr_pool_t *p, const void *m, apr_size_t n);
-
-/**
- * Concatenate multiple strings, allocating memory out a pool
- * @param p The pool to allocate out of
- * @param ... The strings to concatenate.  The final string must be NULL
- * @return The new string
- */
-APR_DECLARE_NONSTD(char *) apr_pstrcat(apr_pool_t *p, ...);
-
-/**
- * Concatenate multiple strings specified in a writev-style vector
- * @param p The pool from which to allocate
- * @param vec The strings to concatenate
- * @param nvec The number of strings to concatenate
- * @param nbytes (output) strlen of new string (pass in NULL to omit)
- * @return The new string
- */
-APR_DECLARE(char *) apr_pstrcatv(apr_pool_t *p, const struct iovec *vec,
-                                 apr_size_t nvec, apr_size_t *nbytes);
-
-/**
- * printf-style style printing routine.  The data is output to a string 
- * allocated from a pool
- * @param p The pool to allocate out of
- * @param fmt The format of the string
- * @param ap The arguments to use while printing the data
- * @return The new string
- */
-APR_DECLARE(char *) apr_pvsprintf(apr_pool_t *p, const char *fmt, va_list ap);
-
-/**
- * printf-style style printing routine.  The data is output to a string 
- * allocated from a pool
- * @param p The pool to allocate out of
- * @param fmt The format of the string
- * @param ... The arguments to use while printing the data
- * @return The new string
- */
-APR_DECLARE_NONSTD(char *) apr_psprintf(apr_pool_t *p, const char *fmt, ...)
-        __attribute__((format(printf,2,3)));
-
-/**
- * copy n characters from src to dst
- * @param dst The destination string
- * @param src The source string
- * @param dst_size The space available in dst; dst always receives
- *                 null-termination, so if src is longer than
- *                 dst_size, the actual number of characters copied is
- *                 dst_size - 1.
- * @remark
- * <PRE>
- * We re-implement this function to implement these specific changes:
- *       1) strncpy() doesn't always null terminate and we want it to.
- *       2) strncpy() null fills, which is bogus, esp. when copy 8byte strings
- *          into 8k blocks.
- *       3) Instead of returning the pointer to the beginning of the
- *          destination string, we return a pointer to the terminating null
- *          to allow us to check for truncation.
- * </PRE>
- */
-APR_DECLARE(char *) apr_cpystrn(char *dst, const char *src,
-                                apr_size_t dst_size);
-
-/**
- * Strip spaces from a string
- * @param dest The destination string.  It is okay to modify the string
- *             in place.  Namely dest == src
- * @param src The string to rid the spaces from.
- */
-APR_DECLARE(char *) apr_collapse_spaces(char *dest, const char *src);
-
-/**
- * Convert the arguments to a program from one string to an array of 
- * strings terminated by a NULL pointer
- * @param arg_str The arguments to convert
- * @param argv_out Output location.  This is a pointer to an array of strings.
- * @param token_context Pool to use.
- */
-APR_DECLARE(apr_status_t) apr_tokenize_to_argv(const char *arg_str,
-                                               char ***argv_out,
-                                               apr_pool_t *token_context);
-
-/**
- * Split a string into separate null-terminated tokens.  The tokens are 
- * delimited in the string by one or more characters from the sep
- * argument.
- * @param str The string to separate; this should be specified on the
- *            first call to apr_strtok() for a given string, and NULL
- *            on subsequent calls.
- * @param sep The set of delimiters
- * @param last Internal state saved by apr_strtok() between calls.
- * @return The next token from the string
- */
-APR_DECLARE(char *) apr_strtok(char *str, const char *sep, char **last);
-
-/**
- * @defgroup APR_Strings_Snprintf snprintf implementations
- * @warning
- * These are snprintf implementations based on apr_vformatter().
- *
- * Note that various standards and implementations disagree on the return
- * value of snprintf, and side-effects due to %n in the formatting string.
- * apr_snprintf (and apr_vsnprintf) behaves as follows:
- *
- * Process the format string until the entire string is exhausted, or
- * the buffer fills.  If the buffer fills then stop processing immediately
- * (so no further %n arguments are processed), and return the buffer
- * length.  In all cases the buffer is NUL terminated. It will return the
- * number of characters inserted into the buffer, not including the
- * terminating NUL. As a special case, if len is 0, apr_snprintf will
- * return the number of characters that would have been inserted if
- * the buffer had been infinite (in this case, *buffer can be NULL)
- *
- * In no event does apr_snprintf return a negative number.
- * @{
- */
-
-/**
- * snprintf routine based on apr_vformatter.  This means it understands the
- * same extensions.
- * @param buf The buffer to write to
- * @param len The size of the buffer
- * @param format The format string
- * @param ... The arguments to use to fill out the format string.
- */
-APR_DECLARE_NONSTD(int) apr_snprintf(char *buf, apr_size_t len,
-                                     const char *format, ...)
-        __attribute__((format(printf,3,4)));
-
-/**
- * vsnprintf routine based on apr_vformatter.  This means it understands the
- * same extensions.
- * @param buf The buffer to write to
- * @param len The size of the buffer
- * @param format The format string
- * @param ap The arguments to use to fill out the format string.
- */
-APR_DECLARE(int) apr_vsnprintf(char *buf, apr_size_t len, const char *format,
-                               va_list ap);
-/** @} */
-
-/**
- * create a string representation of an int, allocated from a pool
- * @param p The pool from which to allocate
- * @param n The number to format
- * @return The string representation of the number
- */
-APR_DECLARE(char *) apr_itoa(apr_pool_t *p, int n);
-
-/**
- * create a string representation of a long, allocated from a pool
- * @param p The pool from which to allocate
- * @param n The number to format
- * @return The string representation of the number
- */
-APR_DECLARE(char *) apr_ltoa(apr_pool_t *p, long n);
-
-/**
- * create a string representation of an apr_off_t, allocated from a pool
- * @param p The pool from which to allocate
- * @param n The number to format
- * @return The string representation of the number
- */
-APR_DECLARE(char *) apr_off_t_toa(apr_pool_t *p, apr_off_t n);
-
-/**
- * parse a numeric string into a 64-bit numeric value
- * @param buf The string to parse. It may contain optional whitespace,
- *   followed by an optional '+' (positive, default) or '-' (negative)
- *   character, followed by an optional '0x' prefix if base is 0 or 16,
- *   followed by numeric digits appropriate for base.
- * @param end A pointer to the end of the valid character in buf. If
- *   not nil, it is set to the first invalid character in buf.
- * @param base A numeric base in the range between 2 and 36 inclusive,
- *   or 0.  If base is zero, buf will be treated as base ten unless its
- *   digits are prefixed with '0x', in which case it will be treated as
- *   base 16.
- * @return The numeric value of the string.
- */
-APR_DECLARE(apr_int64_t) apr_strtoi64(const char *buf, char **end, int base);
-
-/**
- * parse a base-10 numeric string into a 64-bit numeric value.
- * Equivalent to apr_strtoi64(buf, (char**)NULL, 10).
- * @param buf The string to parse
- * @return The numeric value of the string
- */
-APR_DECLARE(apr_int64_t) apr_atoi64(const char *buf);
-
-/**
- * Format a binary size (magnitiudes are 2^10 rather than 10^3) from an apr_off_t,
- * as bytes, K, M, T, etc, to a four character compacted human readable string.
- * @param size The size to format
- * @param buf The 5 byte text buffer (counting the trailing null)
- * @return The buf passed to apr_strfsize()
- * @remark All negative sizes report '  - ', apr_strfsize only formats positive values.
- */
-APR_DECLARE(char *) apr_strfsize(apr_off_t size, char *buf);
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* !APR_STRINGS_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_support.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_support.h
deleted file mode 100644
index ee31860f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_support.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_SUPPORT_H
-#define APR_SUPPORT_H
-
-/**
- * @file apr_support.h
- * @brief APR Support functions
- */
-
-#include "apr.h"
-#include "apr_network_io.h"
-#include "apr_file_io.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup apr_support Internal APR support functions
- * @ingroup APR 
- * @{
- */
-
-/**
- * Wait for IO to occur or timeout.
- */
-apr_status_t apr_wait_for_io_or_timeout(apr_file_t *f, apr_socket_t *s,
-                                        int for_read);
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ! APR_SUPPORT_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_tables.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_tables.h
deleted file mode 100644
index f286b5c7..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_tables.h
+++ /dev/null
@@ -1,422 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_TABLES_H
-#define APR_TABLES_H
-
-/**
- * @file apr_tables.h
- * @brief APR Table library
- */
-
-#include "apr.h"
-#include "apr_pools.h"
-
-#if APR_HAVE_STDARG_H
-#include <stdarg.h>     /* for va_list */
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup apr_tables Table and Array Functions
- * @ingroup APR 
- * Tables are used to store entirely opaque structures 
- * for applications, while Arrays are usually used to
- * deal with string lists.
- * @{
- */
-
-/** the table abstract data type */
-typedef struct apr_table_t apr_table_t;
-
-/** @see apr_array_header_t */
-typedef struct apr_array_header_t apr_array_header_t;
-
-/** An opaque array type */
-struct apr_array_header_t {
-    /** The pool the array is allocated out of */
-    apr_pool_t *pool;
-    /** The amount of memory allocated for each element of the array */
-    int elt_size;
-    /** The number of active elements in the array */
-    int nelts;
-    /** The number of elements allocated in the array */
-    int nalloc;
-    /** The elements in the array */
-    char *elts;
-};
-
-/**
- * The (opaque) structure for string-content tables.
- */
-typedef struct apr_table_entry_t apr_table_entry_t;
-
-/** The type for each entry in a string-content table */
-struct apr_table_entry_t {
-    /** The key for the current table entry */
-    char *key;          /* maybe NULL in future;
-                         * check when iterating thru table_elts
-                         */
-    /** The value for the current table entry */
-    char *val;
-
-    /** A checksum for the key, for use by the apr_table internals */
-    apr_uint32_t key_checksum;
-};
-
-/**
- * Get the elements from a table
- * @param t The table
- * @return An array containing the contents of the table
- */
-APR_DECLARE(const apr_array_header_t *) apr_table_elts(const apr_table_t *t);
-
-/**
- * Determine if the table is empty
- * @param t The table to check
- * @return True if empty, False otherwise
- */
-APR_DECLARE(int) apr_is_empty_table(const apr_table_t *t);
-
-/**
- * Determine if the array is empty
- * @param a The array to check
- * @return True if empty, False otherwise
- */
-APR_DECLARE(int) apr_is_empty_array(const apr_array_header_t *a);
-
-/**
- * Create an array
- * @param p The pool to allocate the memory out of
- * @param nelts the number of elements in the initial array
- * @param elt_size The size of each element in the array.
- * @return The new array
- */
-APR_DECLARE(apr_array_header_t *) apr_array_make(apr_pool_t *p,
-                                                 int nelts, int elt_size);
-
-/**
- * Add a new element to an array
- * @param arr The array to add an element to.
- * @return Location for the new element in the array.
- * @remark If there are no free spots in the array, then this function will
- *         allocate new space for the new element.
- */
-APR_DECLARE(void *) apr_array_push(apr_array_header_t *arr);
-
-/**
- * Remove an element from an array
- * @param arr The array to remove an element from.
- * @return Location of the element in the array.
- * @remark If there are no elements in the array, NULL is returned.
- */
-APR_DECLARE(void *) apr_array_pop(apr_array_header_t *arr);
-
-/**
- * Concatenate two arrays together
- * @param dst The destination array, and the one to go first in the combined 
- *            array
- * @param src The source array to add to the destination array
- */
-APR_DECLARE(void) apr_array_cat(apr_array_header_t *dst,
-			        const apr_array_header_t *src);
-
-/**
- * Copy the entire array
- * @param p The pool to allocate the copy of the array out of
- * @param arr The array to copy
- * @return An exact copy of the array passed in
- * @remark The alternate apr_array_copy_hdr copies only the header, and arranges 
- *         for the elements to be copied if (and only if) the code subsequently
- *         does a push or arraycat.
- */
-APR_DECLARE(apr_array_header_t *) apr_array_copy(apr_pool_t *p,
-                                      const apr_array_header_t *arr);
-/**
- * Copy the headers of the array, and arrange for the elements to be copied if
- * and only if the code subsequently does a push or arraycat.
- * @param p The pool to allocate the copy of the array out of
- * @param arr The array to copy
- * @return An exact copy of the array passed in
- * @remark The alternate apr_array_copy copies the *entire* array.
- */
-APR_DECLARE(apr_array_header_t *) apr_array_copy_hdr(apr_pool_t *p,
-                                      const apr_array_header_t *arr);
-
-/**
- * Append one array to the end of another, creating a new array in the process.
- * @param p The pool to allocate the new array out of
- * @param first The array to put first in the new array.
- * @param second The array to put second in the new array.
- * @return A new array containing the data from the two arrays passed in.
-*/
-APR_DECLARE(apr_array_header_t *) apr_array_append(apr_pool_t *p,
-                                      const apr_array_header_t *first,
-                                      const apr_array_header_t *second);
-
-/**
- * Generates a new string from the apr_pool_t containing the concatenated 
- * sequence of substrings referenced as elements within the array.  The string 
- * will be empty if all substrings are empty or null, or if there are no 
- * elements in the array.  If sep is non-NUL, it will be inserted between 
- * elements as a separator.
- * @param p The pool to allocate the string out of
- * @param arr The array to generate the string from
- * @param sep The separator to use
- * @return A string containing all of the data in the array.
- */
-APR_DECLARE(char *) apr_array_pstrcat(apr_pool_t *p,
-				      const apr_array_header_t *arr,
-				      const char sep);
-
-/**
- * Make a new table
- * @param p The pool to allocate the pool out of
- * @param nelts The number of elements in the initial table.
- * @return The new table.
- * @warning This table can only store text data
- */
-APR_DECLARE(apr_table_t *) apr_table_make(apr_pool_t *p, int nelts);
-
-/**
- * Create a new table and copy another table into it
- * @param p The pool to allocate the new table out of
- * @param t The table to copy
- * @return A copy of the table passed in
- */
-APR_DECLARE(apr_table_t *) apr_table_copy(apr_pool_t *p,
-                                          const apr_table_t *t);
-
-/**
- * Delete all of the elements from a table
- * @param t The table to clear
- */
-APR_DECLARE(void) apr_table_clear(apr_table_t *t);
-
-/**
- * Get the value associated with a given key from the table.  After this call,
- * The data is still in the table
- * @param t The table to search for the key
- * @param key The key to search for
- * @return The value associated with the key
- */
-APR_DECLARE(const char *) apr_table_get(const apr_table_t *t, const char *key);
-
-/**
- * Add a key/value pair to a table, if another element already exists with the
- * same key, this will over-write the old data.
- * @param t The table to add the data to.
- * @param key The key fo use
- * @param val The value to add
- * @remark When adding data, this function makes a copy of both the key and the
- *         value.
- */
-APR_DECLARE(void) apr_table_set(apr_table_t *t, const char *key,
-                                const char *val);
-
-/**
- * Add a key/value pair to a table, if another element already exists with the
- * same key, this will over-write the old data.
- * @param t The table to add the data to.
- * @param key The key to use
- * @param val The value to add
- * @warning When adding data, this function does not make a copy of the key or 
- *          the value, so care should be taken to ensure that the values will 
- *          not change after they have been added..
- */
-APR_DECLARE(void) apr_table_setn(apr_table_t *t, const char *key,
-                                 const char *val);
-
-/**
- * Remove data from the table
- * @param t The table to remove data from
- * @param key The key of the data being removed
- */
-APR_DECLARE(void) apr_table_unset(apr_table_t *t, const char *key);
-
-/**
- * Add data to a table by merging the value with data that has already been 
- * stored
- * @param t The table to search for the data
- * @param key The key to merge data for
- * @param val The data to add
- * @remark If the key is not found, then this function acts like apr_table_add
- */
-APR_DECLARE(void) apr_table_merge(apr_table_t *t, const char *key,
-                                  const char *val);
-
-/**
- * Add data to a table by merging the value with data that has already been 
- * stored
- * @param t The table to search for the data
- * @param key The key to merge data for
- * @param val The data to add
- * @remark If the key is not found, then this function acts like apr_table_addn
- */
-APR_DECLARE(void) apr_table_mergen(apr_table_t *t, const char *key,
-                                   const char *val);
-
-/**
- * Add data to a table, regardless of whether there is another element with the
- * same key.
- * @param t The table to add to
- * @param key The key to use
- * @param val The value to add.
- * @remark When adding data, this function makes a copy of both the key and the
- *         value.
- */
-APR_DECLARE(void) apr_table_add(apr_table_t *t, const char *key,
-                                const char *val);
-
-/**
- * Add data to a table, regardless of whether there is another element with the
- * same key.
- * @param t The table to add to
- * @param key The key to use
- * @param val The value to add.
- * @remark When adding data, this function does not make a copy of the key or the
- *         value, so care should be taken to ensure that the values will not 
- *         change after they have been added..
- */
-APR_DECLARE(void) apr_table_addn(apr_table_t *t, const char *key,
-                                 const char *val);
-
-/**
- * Merge two tables into one new table
- * @param p The pool to use for the new table
- * @param overlay The first table to put in the new table
- * @param base The table to add at the end of the new table
- * @return A new table containing all of the data from the two passed in
- */
-APR_DECLARE(apr_table_t *) apr_table_overlay(apr_pool_t *p,
-                                             const apr_table_t *overlay,
-                                             const apr_table_t *base);
-
-/**
- * Declaration prototype for the iterator callback function of apr_table_do()
- * and apr_table_vdo().
- * @param rec The data passed as the first argument to apr_table_[v]do()
- * @param key The key from this iteration of the table
- * @param value The value from this iteration of the table
- * @remark Iteration continues while this callback function returns non-zero.
- * To export the callback function for apr_table_[v]do() it must be declared 
- * in the _NONSTD convention.
- */
-typedef int (apr_table_do_callback_fn_t)(void *rec, const char *key, 
-                                                    const char *value);
-
-/** 
- * Iterate over a table running the provided function once for every
- * element in the table.  If there is data passed in as a vararg, then the 
- * function is only run on those elements whose key matches something in 
- * the vararg.  If the vararg is NULL, then every element is run through the
- * function.  Iteration continues while the function returns non-zero.
- * @param comp The function to run
- * @param rec The data to pass as the first argument to the function
- * @param t The table to iterate over
- * @param ... The vararg.  If this is NULL, then all elements in the table are
- *            run through the function, otherwise only those whose key matches
- *            are run.
- * @return FALSE if one of the comp() iterations returned zero; TRUE if all
- *            iterations returned non-zero
- * @see apr_table_do_callback_fn_t
- */
-APR_DECLARE_NONSTD(int) apr_table_do(apr_table_do_callback_fn_t *comp,
-                                     void *rec, const apr_table_t *t, ...);
-
-/** 
- * Iterate over a table running the provided function once for every
- * element in the table.  If there is data passed in as a vararg, then the 
- * function is only run on those element's whose key matches something in 
- * the vararg.  If the vararg is NULL, then every element is run through the
- * function.  Iteration continues while the function returns non-zero.
- * @param comp The function to run
- * @param rec The data to pass as the first argument to the function
- * @param t The table to iterate over
- * @param vp The vararg table.  If this is NULL, then all elements in the 
- *                table are run through the function, otherwise only those 
- *                whose key matches are run.
- * @return FALSE if one of the comp() iterations returned zero; TRUE if all
- *            iterations returned non-zero
- * @see apr_table_do_callback_fn_t
- */
-APR_DECLARE(int) apr_table_vdo(apr_table_do_callback_fn_t *comp,
-                               void *rec, const apr_table_t *t, va_list vp);
-
-/** flag for overlap to use apr_table_setn */
-#define APR_OVERLAP_TABLES_SET   (0)
-/** flag for overlap to use apr_table_mergen */
-#define APR_OVERLAP_TABLES_MERGE (1)
-/**
- * For each element in table b, either use setn or mergen to add the data
- * to table a.  Which method is used is determined by the flags passed in.
- * @param a The table to add the data to.
- * @param b The table to iterate over, adding its data to table a
- * @param flags How to add the table to table a.  One of:
- *          APR_OVERLAP_TABLES_SET        Use apr_table_setn
- *          APR_OVERLAP_TABLES_MERGE      Use apr_table_mergen
- * @remark  This function is highly optimized, and uses less memory and CPU cycles
- *          than a function that just loops through table b calling other functions.
- */
-/**
- *<PRE>
- * Conceptually, apr_table_overlap does this:
- *
- *  apr_array_header_t *barr = apr_table_elts(b);
- *  apr_table_entry_t *belt = (apr_table_entry_t *)barr->elts;
- *  int i;
- *
- *  for (i = 0; i < barr->nelts; ++i) {
- *      if (flags & APR_OVERLAP_TABLES_MERGE) {
- *          apr_table_mergen(a, belt[i].key, belt[i].val);
- *      }
- *      else {
- *          apr_table_setn(a, belt[i].key, belt[i].val);
- *      }
- *  }
- *
- *  Except that it is more efficient (less space and cpu-time) especially
- *  when b has many elements.
- *
- *  Notice the assumptions on the keys and values in b -- they must be
- *  in an ancestor of a's pool.  In practice b and a are usually from
- *  the same pool.
- * </PRE>
- */
-
-APR_DECLARE(void) apr_table_overlap(apr_table_t *a, const apr_table_t *b,
-                                     unsigned flags);
-
-/**
- * Eliminate redunandant entries in a table by either overwriting
- * or merging duplicates
- *
- * @param t Table.
- * @param flags APR_OVERLAP_TABLES_MERGE to merge, or
- *              APR_OVERLAP_TABLES_SET to overwrite
- */
-APR_DECLARE(void) apr_table_compress(apr_table_t *t, unsigned flags);
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* ! APR_TABLES_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_thread_cond.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_thread_cond.h
deleted file mode 100644
index 520fb309..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_thread_cond.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_THREAD_COND_H
-#define APR_THREAD_COND_H
-
-/**
- * @file apr_thread_cond.h
- * @brief APR Condition Variable Routines
- */
-
-#include "apr.h"
-#include "apr_pools.h"
-#include "apr_errno.h"
-#include "apr_time.h"
-#include "apr_thread_mutex.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#if APR_HAS_THREADS || defined(DOXYGEN)
-
-/**
- * @defgroup apr_thread_cond Condition Variable Routines
- * @ingroup APR 
- * @{
- */
-
-/** Opaque structure for thread condition variables */
-typedef struct apr_thread_cond_t apr_thread_cond_t;
-
-/**
- * Create and initialize a condition variable that can be used to signal
- * and schedule threads in a single process.
- * @param cond the memory address where the newly created condition variable
- *        will be stored.
- * @param pool the pool from which to allocate the mutex.
- */
-APR_DECLARE(apr_status_t) apr_thread_cond_create(apr_thread_cond_t **cond,
-                                                 apr_pool_t *pool);
-
-/**
- * Put the active calling thread to sleep until signaled to wake up. Each
- * condition variable must be associated with a mutex, and that mutex must
- * be locked before  calling this function, or the behavior will be
- * undefined. As the calling thread is put to sleep, the given mutex
- * will be simultaneously released; and as this thread wakes up the lock
- * is again simultaneously acquired.
- * @param cond the condition variable on which to block.
- * @param mutex the mutex that must be locked upon entering this function,
- *        is released while the thread is asleep, and is again acquired before
- *        returning from this function.
- */
-APR_DECLARE(apr_status_t) apr_thread_cond_wait(apr_thread_cond_t *cond,
-                                               apr_thread_mutex_t *mutex);
-
-/**
- * Put the active calling thread to sleep until signaled to wake up or
- * the timeout is reached. Each condition variable must be associated
- * with a mutex, and that mutex must be locked before calling this
- * function, or the behavior will be undefined. As the calling thread
- * is put to sleep, the given mutex will be simultaneously released;
- * and as this thread wakes up the lock is again simultaneously acquired.
- * @param cond the condition variable on which to block.
- * @param mutex the mutex that must be locked upon entering this function,
- *        is released while the thread is asleep, and is again acquired before
- *        returning from this function.
- * @param timeout The amount of time in microseconds to wait. This is 
- *        a maximum, not a minimum. If the condition is signaled, we 
- *        will wake up before this time, otherwise the error APR_TIMEUP
- *        is returned.
- */
-APR_DECLARE(apr_status_t) apr_thread_cond_timedwait(apr_thread_cond_t *cond,
-                                                    apr_thread_mutex_t *mutex,
-                                                    apr_interval_time_t timeout);
-
-/**
- * Signals a singla thread, if one exists, that is blocking on the given
- * condition variable. That thread is then scheduled to wake up and acquire
- * the associated mutex. Although it is not required, if predictible schedule
- * is desired, that mutex must be locked while calling this function.
- * @param cond the condition variable on which to produce the signal.
- */
-APR_DECLARE(apr_status_t) apr_thread_cond_signal(apr_thread_cond_t *cond);
-
-/**
- * Signals all threads blocking on the given condition variable.
- * Each thread that was signaled is then schedule to wake up and acquire
- * the associated mutex. This will happen in a serialized manner.
- * @param cond the condition variable on which to produce the broadcast.
- */
-APR_DECLARE(apr_status_t) apr_thread_cond_broadcast(apr_thread_cond_t *cond);
-
-/**
- * Destroy the condition variable and free the associated memory.
- * @param cond the condition variable to destroy.
- */
-APR_DECLARE(apr_status_t) apr_thread_cond_destroy(apr_thread_cond_t *cond);
-
-/**
- * Get the pool used by this thread_cond.
- * @return apr_pool_t the pool
- */
-APR_POOL_DECLARE_ACCESSOR(thread_cond);
-
-#endif /* APR_HAS_THREADS */
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ! APR_THREAD_COND_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_thread_mutex.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_thread_mutex.h
deleted file mode 100644
index 4596dce5..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_thread_mutex.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_THREAD_MUTEX_H
-#define APR_THREAD_MUTEX_H
-
-/**
- * @file apr_thread_mutex.h
- * @brief APR Thread Mutex Routines
- */
-
-#include "apr.h"
-#include "apr_errno.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#if APR_HAS_THREADS || defined(DOXYGEN)
-
-/**
- * @defgroup apr_thread_mutex Thread Mutex Routines
- * @ingroup APR 
- * @{
- */
-
-/** Opaque thread-local mutex structure */
-typedef struct apr_thread_mutex_t apr_thread_mutex_t;
-
-#define APR_THREAD_MUTEX_DEFAULT  0x0   /**< platform-optimal lock behavior */
-#define APR_THREAD_MUTEX_NESTED   0x1   /**< enable nested (recursive) locks */
-#define APR_THREAD_MUTEX_UNNESTED 0x2   /**< disable nested locks */
-
-/* Delayed the include to avoid a circular reference */
-#include "apr_pools.h"
-
-/**
- * Create and initialize a mutex that can be used to synchronize threads.
- * @param mutex the memory address where the newly created mutex will be
- *        stored.
- * @param flags Or'ed value of:
- * <PRE>
- *           APR_THREAD_MUTEX_DEFAULT   platform-optimal lock behavior.
- *           APR_THREAD_MUTEX_NESTED    enable nested (recursive) locks.
- *           APR_THREAD_MUTEX_UNNESTED  disable nested locks (non-recursive).
- * </PRE>
- * @param pool the pool from which to allocate the mutex.
- * @warning Be cautious in using APR_THREAD_MUTEX_DEFAULT.  While this is the
- * most optimial mutex based on a given platform's performance charateristics,
- * it will behave as either a nested or an unnested lock.
- */
-APR_DECLARE(apr_status_t) apr_thread_mutex_create(apr_thread_mutex_t **mutex,
-                                                  unsigned int flags,
-                                                  apr_pool_t *pool);
-/**
- * Acquire the lock for the given mutex. If the mutex is already locked,
- * the current thread will be put to sleep until the lock becomes available.
- * @param mutex the mutex on which to acquire the lock.
- */
-APR_DECLARE(apr_status_t) apr_thread_mutex_lock(apr_thread_mutex_t *mutex);
-
-/**
- * Attempt to acquire the lock for the given mutex. If the mutex has already
- * been acquired, the call returns immediately with APR_EBUSY. Note: it
- * is important that the APR_STATUS_IS_EBUSY(s) macro be used to determine
- * if the return value was APR_EBUSY, for portability reasons.
- * @param mutex the mutex on which to attempt the lock acquiring.
- */
-APR_DECLARE(apr_status_t) apr_thread_mutex_trylock(apr_thread_mutex_t *mutex);
-
-/**
- * Release the lock for the given mutex.
- * @param mutex the mutex from which to release the lock.
- */
-APR_DECLARE(apr_status_t) apr_thread_mutex_unlock(apr_thread_mutex_t *mutex);
-
-/**
- * Destroy the mutex and free the memory associated with the lock.
- * @param mutex the mutex to destroy.
- */
-APR_DECLARE(apr_status_t) apr_thread_mutex_destroy(apr_thread_mutex_t *mutex);
-
-/**
- * Get the pool used by this thread_mutex.
- * @return apr_pool_t the pool
- */
-APR_POOL_DECLARE_ACCESSOR(thread_mutex);
-
-#endif /* APR_HAS_THREADS */
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ! APR_THREAD_MUTEX_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_thread_proc.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_thread_proc.h
deleted file mode 100644
index be586040..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_thread_proc.h
+++ /dev/null
@@ -1,772 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_THREAD_PROC_H
-#define APR_THREAD_PROC_H
-
-/**
- * @file apr_thread_proc.h
- * @brief APR Thread and Process Library
- */
-
-#include "apr.h"
-#include "apr_file_io.h"
-#include "apr_pools.h"
-#include "apr_errno.h"
-
-#if APR_HAVE_STRUCT_RLIMIT
-#include <sys/time.h>
-#include <sys/resource.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup apr_thread_proc Threads and Process Functions
- * @ingroup APR 
- * @{
- */
-
-typedef enum {
-    APR_SHELLCMD,       /**< use the shell to invoke the program */
-    APR_PROGRAM,        /**< invoke the program directly, no copied env */
-    APR_PROGRAM_ENV,    /**< invoke the program, replicating our environment */
-    APR_PROGRAM_PATH,   /**< find program on PATH, use our environment */
-    APR_SHELLCMD_ENV    /**< use the shell to invoke the program,
-                          *   replicating our environment
-                          */
-} apr_cmdtype_e;
-
-typedef enum {
-    APR_WAIT,           /**< wait for the specified process to finish */
-    APR_NOWAIT          /**< do not wait -- just see if it has finished */
-} apr_wait_how_e;
-
-/* I am specifically calling out the values so that the macros below make
- * more sense.  Yes, I know I don't need to, but I am hoping this makes what
- * I am doing more clear.  If you want to add more reasons to exit, continue
- * to use bitmasks.
- */
-typedef enum {
-    APR_PROC_EXIT = 1,          /**< process exited normally */
-    APR_PROC_SIGNAL = 2,        /**< process exited due to a signal */
-    APR_PROC_SIGNAL_CORE = 4    /**< process exited and dumped a core file */
-} apr_exit_why_e;
-
-/** did we exit the process */
-#define APR_PROC_CHECK_EXIT(x)        (x & APR_PROC_EXIT)
-/** did we get a signal */
-#define APR_PROC_CHECK_SIGNALED(x)    (x & APR_PROC_SIGNAL)
-/** did we get core */
-#define APR_PROC_CHECK_CORE_DUMP(x)   (x & APR_PROC_SIGNAL_CORE)
-
-/** @see apr_procattr_io_set */
-#define APR_NO_PIPE          0
-
-/** @see apr_procattr_io_set */
-#define APR_FULL_BLOCK       1
-/** @see apr_procattr_io_set */
-#define APR_FULL_NONBLOCK    2
-/** @see apr_procattr_io_set */
-#define APR_PARENT_BLOCK     3
-/** @see apr_procattr_io_set */
-#define APR_CHILD_BLOCK      4
-
-/** @see apr_procattr_limit_set */
-#define APR_LIMIT_CPU        0
-/** @see apr_procattr_limit_set */
-#define APR_LIMIT_MEM        1
-/** @see apr_procattr_limit_set */
-#define APR_LIMIT_NPROC      2
-/** @see apr_procattr_limit_set */
-#define APR_LIMIT_NOFILE     3
-
-/**
- * @defgroup APR_OC Other Child Flags
- * @{
- */
-#define APR_OC_REASON_DEATH         0     /**< child has died, caller must call
-                                           * unregister still */
-#define APR_OC_REASON_UNWRITABLE    1     /**< write_fd is unwritable */
-#define APR_OC_REASON_RESTART       2     /**< a restart is occuring, perform
-                                           * any necessary cleanup (including
-                                           * sending a special signal to child)
-                                           */
-#define APR_OC_REASON_UNREGISTER    3     /**< unregister has been called, do
-                                           * whatever is necessary (including
-                                           * kill the child) */
-#define APR_OC_REASON_LOST          4     /**< somehow the child exited without
-                                           * us knowing ... buggy os? */
-#define APR_OC_REASON_RUNNING       5     /**< a health check is occuring, 
-                                           * for most maintainence functions
-                                           * this is a no-op.
-                                           */
-/** @} */
-
-/** The APR process type */
-typedef struct apr_proc_t {
-    /** The process ID */
-    pid_t pid;
-    /** Parent's side of pipe to child's stdin */
-    apr_file_t *in;
-    /** Parent's side of pipe to child's stdout */
-    apr_file_t *out;
-    /** Parent's side of pipe to child's stdouterr */
-    apr_file_t *err;
-#if APR_HAS_PROC_INVOKED || defined(DOXYGEN)
-    /** Diagnositics/debugging string of the command invoked for 
-     *  this process [only present if APR_HAS_PROC_INVOKED is true]
-     * @remark Only enabled on Win32 by default.
-     * @bug This should either always or never be present in release
-     * builds - since it breaks binary compatibility.  We may enable
-     * it always in APR 1.0 yet leave it undefined in most cases.
-     */
-    char *invoked;
-#endif
-#if defined(WIN32) || defined(DOXYGEN)
-    /** (Win32 only) Creator's handle granting access to the process
-     * @remark This handle is closed and reset to NULL in every case
-     * corresponding to a waitpid() on Unix which returns the exit status.
-     * Therefore Win32 correspond's to Unix's zombie reaping characteristics
-     * and avoids potential handle leaks.
-     */
-    HANDLE hproc;
-#endif
-} apr_proc_t;
-
-/**
- * The prototype for APR child errfn functions.  (See the description
- * of apr_procattr_child_errfn_set() for more information.)
- * It is passed the following parameters:
- * @param pool Pool associated with the apr_proc_t.  If your child
- *             error function needs user data, associate it with this
- *             pool.
- * @param err APR error code describing the error
- * @param description Text description of type of processing which failed
- */
-typedef void (apr_child_errfn_t)(apr_pool_t *proc, apr_status_t err,
-                                 const char *description);
-
-/** Opaque Thread structure. */
-typedef struct apr_thread_t           apr_thread_t;
-
-/** Opaque Thread attributes structure. */
-typedef struct apr_threadattr_t       apr_threadattr_t;
-
-/** Opaque Process attributes structure. */
-typedef struct apr_procattr_t         apr_procattr_t;
-
-/** Opaque control variable for one-time atomic variables.  */
-typedef struct apr_thread_once_t      apr_thread_once_t;
-
-/** Opaque thread private address space. */
-typedef struct apr_threadkey_t        apr_threadkey_t;
-
-/** Opaque record of child process. */
-typedef struct apr_other_child_rec_t  apr_other_child_rec_t;
-
-/**
- * The prototype for any APR thread worker functions.
- */
-typedef void *(APR_THREAD_FUNC *apr_thread_start_t)(apr_thread_t*, void*);
-
-typedef enum {
-    APR_KILL_NEVER,             /**< process is never sent any signals */
-    APR_KILL_ALWAYS,            /**< process is sent SIGKILL on apr_pool_t cleanup */
-    APR_KILL_AFTER_TIMEOUT,     /**< SIGTERM, wait 3 seconds, SIGKILL */
-    APR_JUST_WAIT,              /**< wait forever for the process to complete */
-    APR_KILL_ONLY_ONCE          /**< send SIGTERM and then wait */
-} apr_kill_conditions_e;
-
-/* Thread Function definitions */
-
-#if APR_HAS_THREADS
-
-/**
- * Create and initialize a new threadattr variable
- * @param new_attr The newly created threadattr.
- * @param cont The pool to use
- */
-APR_DECLARE(apr_status_t) apr_threadattr_create(apr_threadattr_t **new_attr, 
-                                                apr_pool_t *cont);
-
-/**
- * Set if newly created threads should be created in detached state.
- * @param attr The threadattr to affect 
- * @param on Thread detach state on or off
- */
-APR_DECLARE(apr_status_t) apr_threadattr_detach_set(apr_threadattr_t *attr, 
-                                                   apr_int32_t on);
-
-/**
- * Get the detach state for this threadattr.
- * @param attr The threadattr to reference 
- */
-APR_DECLARE(apr_status_t) apr_threadattr_detach_get(apr_threadattr_t *attr);
-
-/**
- * Set the stack size of newly created threads.
- * @param attr The threadattr to affect 
- * @param stacksize The stack size in bytes
- */
-APR_DECLARE(apr_status_t) apr_threadattr_stacksize_set(apr_threadattr_t *attr,
-                                                       apr_size_t stacksize);
-
-/**
- * Create a new thread of execution
- * @param new_thread The newly created thread handle.
- * @param attr The threadattr to use to determine how to create the thread
- * @param func The function to start the new thread in
- * @param data Any data to be passed to the starting function
- * @param cont The pool to use
- */
-APR_DECLARE(apr_status_t) apr_thread_create(apr_thread_t **new_thread, 
-                                            apr_threadattr_t *attr, 
-                                            apr_thread_start_t func, 
-                                            void *data, apr_pool_t *cont);
-
-/**
- * stop the current thread
- * @param thd The thread to stop
- * @param retval The return value to pass back to any thread that cares
- */
-APR_DECLARE(apr_status_t) apr_thread_exit(apr_thread_t *thd, 
-                                          apr_status_t retval);
-
-/**
- * block until the desired thread stops executing.
- * @param retval The return value from the dead thread.
- * @param thd The thread to join
- */
-APR_DECLARE(apr_status_t) apr_thread_join(apr_status_t *retval, 
-                                          apr_thread_t *thd); 
-
-/**
- * force the current thread to yield the processor
- */
-APR_DECLARE(void) apr_thread_yield(void);
-
-/**
- * Initialize the control variable for apr_thread_once.  If this isn't
- * called, apr_initialize won't work.
- * @param control The control variable to initialize
- * @param p The pool to allocate data from.
- */
-APR_DECLARE(apr_status_t) apr_thread_once_init(apr_thread_once_t **control,
-                                               apr_pool_t *p);
-
-/**
- * Run the specified function one time, regardless of how many threads
- * call it.
- * @param control The control variable.  The same variable should
- *                be passed in each time the function is tried to be
- *                called.  This is how the underlying functions determine
- *                if the function has ever been called before.
- * @param func The function to call.
- */
-APR_DECLARE(apr_status_t) apr_thread_once(apr_thread_once_t *control,
-                                          void (*func)(void));
-
-/**
- * detach a thread
- * @param thd The thread to detach 
- */
-APR_DECLARE(apr_status_t) apr_thread_detach(apr_thread_t *thd);
-
-/**
- * Return the pool associated with the current thread.
- * @param data The user data associated with the thread.
- * @param key The key to associate with the data
- * @param thread The currently open thread.
- */
-APR_DECLARE(apr_status_t) apr_thread_data_get(void **data, const char *key,
-                                             apr_thread_t *thread);
-
-/**
- * Return the pool associated with the current thread.
- * @param data The user data to associate with the thread.
- * @param key The key to use for associating the data with the thread
- * @param cleanup The cleanup routine to use when the thread is destroyed.
- * @param thread The currently open thread.
- */
-APR_DECLARE(apr_status_t) apr_thread_data_set(void *data, const char *key,
-                                             apr_status_t (*cleanup) (void *),
-                                             apr_thread_t *thread);
-
-/**
- * Create and initialize a new thread private address space
- * @param key The thread private handle.
- * @param dest The destructor to use when freeing the private memory.
- * @param cont The pool to use
- */
-APR_DECLARE(apr_status_t) apr_threadkey_private_create(apr_threadkey_t **key, 
-                                                    void (*dest)(void *),
-                                                    apr_pool_t *cont);
-
-/**
- * Get a pointer to the thread private memory
- * @param new_mem The data stored in private memory 
- * @param key The handle for the desired thread private memory 
- */
-APR_DECLARE(apr_status_t) apr_threadkey_private_get(void **new_mem, 
-                                                 apr_threadkey_t *key);
-
-/**
- * Set the data to be stored in thread private memory
- * @param priv The data to be stored in private memory 
- * @param key The handle for the desired thread private memory 
- */
-APR_DECLARE(apr_status_t) apr_threadkey_private_set(void *priv, 
-                                                 apr_threadkey_t *key);
-
-/**
- * Free the thread private memory
- * @param key The handle for the desired thread private memory 
- */
-APR_DECLARE(apr_status_t) apr_threadkey_private_delete(apr_threadkey_t *key);
-
-/**
- * Return the pool associated with the current threadkey.
- * @param data The user data associated with the threadkey.
- * @param key The key associated with the data
- * @param threadkey The currently open threadkey.
- */
-APR_DECLARE(apr_status_t) apr_threadkey_data_get(void **data, const char *key,
-                                                apr_threadkey_t *threadkey);
-
-/**
- * Return the pool associated with the current threadkey.
- * @param data The data to set.
- * @param key The key to associate with the data.
- * @param cleanup The cleanup routine to use when the file is destroyed.
- * @param threadkey The currently open threadkey.
- */
-APR_DECLARE(apr_status_t) apr_threadkey_data_set(void *data, const char *key,
-                                                apr_status_t (*cleanup) (void *),
-                                                apr_threadkey_t *threadkey);
-
-#endif
-
-/**
- * Create and initialize a new procattr variable
- * @param new_attr The newly created procattr. 
- * @param cont The pool to use
- */
-APR_DECLARE(apr_status_t) apr_procattr_create(apr_procattr_t **new_attr,
-                                                  apr_pool_t *cont);
-
-/**
- * Determine if any of stdin, stdout, or stderr should be linked to pipes 
- * when starting a child process.
- * @param attr The procattr we care about. 
- * @param in Should stdin be a pipe back to the parent?
- * @param out Should stdout be a pipe back to the parent?
- * @param err Should stderr be a pipe back to the parent?
- */
-APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr, 
-                                             apr_int32_t in, apr_int32_t out,
-                                             apr_int32_t err);
-
-/**
- * Set the child_in and/or parent_in values to existing apr_file_t values.
- * @param attr The procattr we care about. 
- * @param child_in apr_file_t value to use as child_in. Must be a valid file.
- * @param parent_in apr_file_t value to use as parent_in. Must be a valid file.
- * @remark  This is NOT a required initializer function. This is
- *          useful if you have already opened a pipe (or multiple files)
- *          that you wish to use, perhaps persistently across multiple
- *          process invocations - such as a log file. You can save some 
- *          extra function calls by not creating your own pipe since this
- *          creates one in the process space for you.
- */
-APR_DECLARE(apr_status_t) apr_procattr_child_in_set(struct apr_procattr_t *attr,
-                                                  apr_file_t *child_in,
-                                                  apr_file_t *parent_in);
-
-/**
- * Set the child_out and parent_out values to existing apr_file_t values.
- * @param attr The procattr we care about. 
- * @param child_out apr_file_t value to use as child_out. Must be a valid file.
- * @param parent_out apr_file_t value to use as parent_out. Must be a valid file.
- * @remark This is NOT a required initializer function. This is
- *         useful if you have already opened a pipe (or multiple files)
- *         that you wish to use, perhaps persistently across multiple
- *         process invocations - such as a log file. 
- */
-APR_DECLARE(apr_status_t) apr_procattr_child_out_set(struct apr_procattr_t *attr,
-                                                   apr_file_t *child_out,
-                                                   apr_file_t *parent_out);
-
-/**
- * Set the child_err and parent_err values to existing apr_file_t values.
- * @param attr The procattr we care about. 
- * @param child_err apr_file_t value to use as child_err. Must be a valid file.
- * @param parent_err apr_file_t value to use as parent_err. Must be a valid file.
- * @remark This is NOT a required initializer function. This is
- *         useful if you have already opened a pipe (or multiple files)
- *         that you wish to use, perhaps persistently across multiple
- *         process invocations - such as a log file. 
- */
-APR_DECLARE(apr_status_t) apr_procattr_child_err_set(struct apr_procattr_t *attr,
-                                                   apr_file_t *child_err,
-                                                   apr_file_t *parent_err);
-
-/**
- * Set which directory the child process should start executing in.
- * @param attr The procattr we care about. 
- * @param dir Which dir to start in.  By default, this is the same dir as
- *            the parent currently resides in, when the createprocess call
- *            is made. 
- */
-APR_DECLARE(apr_status_t) apr_procattr_dir_set(apr_procattr_t *attr, 
-                                              const char *dir);
-
-/**
- * Set what type of command the child process will call.
- * @param attr The procattr we care about. 
- * @param cmd The type of command.  One of:
- * <PRE>
- *            APR_SHELLCMD     --  Anything that the shell can handle
- *            APR_PROGRAM      --  Executable program   (default) 
- *            APR_PROGRAM_ENV  --  Executable program, copy environment
- *            APR_PROGRAM_PATH --  Executable program on PATH, copy env
- * </PRE>
- */
-APR_DECLARE(apr_status_t) apr_procattr_cmdtype_set(apr_procattr_t *attr,
-                                                  apr_cmdtype_e cmd);
-
-/**
- * Determine if the child should start in detached state.
- * @param attr The procattr we care about. 
- * @param detach Should the child start in detached state?  Default is no. 
- */
-APR_DECLARE(apr_status_t) apr_procattr_detach_set(apr_procattr_t *attr, 
-                                                 apr_int32_t detach);
-
-#if APR_HAVE_STRUCT_RLIMIT
-/**
- * Set the Resource Utilization limits when starting a new process.
- * @param attr The procattr we care about. 
- * @param what Which limit to set, one of:
- * <PRE>
- *                 APR_LIMIT_CPU
- *                 APR_LIMIT_MEM
- *                 APR_LIMIT_NPROC
- *                 APR_LIMIT_NOFILE
- * </PRE>
- * @param limit Value to set the limit to.
- */
-APR_DECLARE(apr_status_t) apr_procattr_limit_set(apr_procattr_t *attr, 
-                                                apr_int32_t what,
-                                                struct rlimit *limit);
-#endif
-
-/**
- * Specify an error function to be called in the child process if APR
- * encounters an error in the child prior to running the specified program.
- * @param attr The procattr describing the child process to be created.
- * @param errfn The function to call in the child process.
- * @remark At the present time, it will only be called from apr_proc_create()
- *         on platforms where fork() is used.  It will never be called on other
- *         platforms, on those platforms apr_proc_create() will return the error
- *         in the parent process rather than invoke the callback in the now-forked
- *         child process.
- */
-APR_DECLARE(apr_status_t) apr_procattr_child_errfn_set(apr_procattr_t *attr,
-                                                       apr_child_errfn_t *errfn);
-
-/**
- * Specify that apr_proc_create() should do whatever it can to report
- * failures to the caller of apr_proc_create(), rather than find out in
- * the child.
- * @param attr The procattr describing the child process to be created.
- * @param chk Flag to indicate whether or not extra work should be done
- *            to try to report failures to the caller.
- * @remark This flag only affects apr_proc_create() on platforms where
- *         fork() is used.  This leads to extra overhead in the calling
- *         process, but that may help the application handle such
- *         errors more gracefully.
- */
-APR_DECLARE(apr_status_t) apr_procattr_error_check_set(apr_procattr_t *attr,
-                                                       apr_int32_t chk);
-
-/**
- * Determine if the child should start in its own address space or using the 
- * current one from its parent
- * @param attr The procattr we care about. 
- * @param addrspace Should the child start in its own address space?  Default
- *                  is no on NetWare and yes on other platforms.
- */
-APR_DECLARE(apr_status_t) apr_procattr_addrspace_set(apr_procattr_t *attr,
-                                                       apr_int32_t addrspace);
-
-#if APR_HAS_FORK
-/**
- * This is currently the only non-portable call in APR.  This executes 
- * a standard unix fork.
- * @param proc The resulting process handle. 
- * @param cont The pool to use. 
- */
-APR_DECLARE(apr_status_t) apr_proc_fork(apr_proc_t *proc, apr_pool_t *cont);
-#endif
-
-/**
- * Create a new process and execute a new program within that process.
- * @param new_proc The resulting process handle.
- * @param progname The program to run 
- * @param args the arguments to pass to the new program.  The first 
- *             one should be the program name.
- * @param env The new environment table for the new process.  This 
- *            should be a list of NULL-terminated strings. This argument
- *            is ignored for APR_PROGRAM_ENV, APR_PROGRAM_PATH, and
- *            APR_SHELLCMD_ENV types of commands.
- * @param attr the procattr we should use to determine how to create the new
- *         process
- * @param cont The pool to use. 
- */
-APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new_proc,
-                                             const char *progname,
-                                             const char * const *args,
-                                             const char * const *env, 
-                                             apr_procattr_t *attr, 
-                                             apr_pool_t *cont);
-
-/**
- * Wait for a child process to die
- * @param proc The process handle that corresponds to the desired child process 
- * @param exitcode The returned exit status of the child, if a child process 
- *                 dies, or the signal that caused the child to die.
- *                 On platforms that don't support obtaining this information, 
- *                 the status parameter will be returned as APR_ENOTIMPL.
- * @param exitwhy Why the child died, the bitwise or of:
- * <PRE>
- *            APR_PROC_EXIT         -- process terminated normally
- *            APR_PROC_SIGNAL       -- process was killed by a signal
- *            APR_PROC_SIGNAL_CORE  -- process was killed by a signal, and
- *                                     generated a core dump.
- * </PRE>
- * @param waithow How should we wait.  One of:
- * <PRE>
- *            APR_WAIT   -- block until the child process dies.
- *            APR_NOWAIT -- return immediately regardless of if the 
- *                          child is dead or not.
- * </PRE>
- * @remark The childs status is in the return code to this process.  It is one of:
- * <PRE>
- *            APR_CHILD_DONE     -- child is no longer running.
- *            APR_CHILD_NOTDONE  -- child is still running.
- * </PRE>
- */
-APR_DECLARE(apr_status_t) apr_proc_wait(apr_proc_t *proc,
-                                        int *exitcode, apr_exit_why_e *exitwhy,
-                                        apr_wait_how_e waithow);
-
-/**
- * Wait for any current child process to die and return information 
- * about that child.
- * @param proc Pointer to NULL on entry, will be filled out with child's 
- *             information 
- * @param exitcode The returned exit status of the child, if a child process 
- *                 dies, or the signal that caused the child to die.
- *                 On platforms that don't support obtaining this information, 
- *                 the status parameter will be returned as APR_ENOTIMPL.
- * @param exitwhy Why the child died, the bitwise or of:
- * <PRE>
- *            APR_PROC_EXIT         -- process terminated normally
- *            APR_PROC_SIGNAL       -- process was killed by a signal
- *            APR_PROC_SIGNAL_CORE  -- process was killed by a signal, and
- *                                     generated a core dump.
- * </PRE>
- * @param waithow How should we wait.  One of:
- * <PRE>
- *            APR_WAIT   -- block until the child process dies.
- *            APR_NOWAIT -- return immediately regardless of if the 
- *                          child is dead or not.
- * </PRE>
- * @param p Pool to allocate child information out of.
- * @bug Passing proc as a *proc rather than **proc was an odd choice
- * for some platforms... this should be revisited in 1.0
- */
-APR_DECLARE(apr_status_t) apr_proc_wait_all_procs(apr_proc_t *proc,
-                                                  int *exitcode,
-                                                  apr_exit_why_e *exitwhy,
-                                                  apr_wait_how_e waithow,
-                                                  apr_pool_t *p);
-
-#define APR_PROC_DETACH_FOREGROUND 0    /**< Do not detach */
-#define APR_PROC_DETACH_DAEMONIZE 1     /**< Detach */
-
-/**
- * Detach the process from the controlling terminal.
- * @param daemonize set to non-zero if the process should daemonize
- *                  and become a background process, else it will
- *                  stay in the foreground.
- */
-APR_DECLARE(apr_status_t) apr_proc_detach(int daemonize);
-
-/**
- * Register an other_child -- a child associated to its registered 
- * maintence callback.  This callback is invoked when the process
- * dies, is disconnected or disappears.
- * @param proc The child process to register.
- * @param maintenance maintenance is a function that is invoked with a 
- *                    reason and the data pointer passed here.
- * @param data Opaque context data passed to the maintenance function.
- * @param write_fd An fd that is probed for writing.  If it is ever unwritable
- *                 then the maintenance is invoked with reason 
- *                 OC_REASON_UNWRITABLE.
- * @param p The pool to use for allocating memory.
- * @bug write_fd duplicates the proc->out stream, it's really redundant
- * and should be replaced in the APR 1.0 API with a bitflag of which
- * proc->in/out/err handles should be health checked.
- * @bug no platform currently tests the pipes health.
- */
-APR_DECLARE(void) apr_proc_other_child_register(apr_proc_t *proc, 
-                                           void (*maintenance) (int reason, 
-                                                                void *, 
-                                                                int status),
-                                           void *data, apr_file_t *write_fd,
-                                           apr_pool_t *p);
-
-/**
- * Stop watching the specified other child.  
- * @param data The data to pass to the maintenance function.  This is
- *             used to find the process to unregister.
- * @warning Since this can be called by a maintenance function while we're
- *          scanning the other_children list, all scanners should protect 
- *          themself by loading ocr->next before calling any maintenance 
- *          function.
- */
-APR_DECLARE(void) apr_proc_other_child_unregister(void *data);
-
-/**
- * Notify the maintenance callback of a registered other child process
- * that application has detected an event, such as death.
- * @param proc The process to check
- * @param reason The reason code to pass to the maintenance function
- * @param status The status to pass to the maintenance function
- * @remark An example of code using this behavior;
- * <pre>
- * rv = apr_proc_wait_all_procs(&proc, &exitcode, &status, APR_WAIT, p);
- * if (APR_STATUS_IS_CHILD_DONE(rv)) {
- * #if APR_HAS_OTHER_CHILD
- *     if (apr_proc_other_child_alert(&proc, APR_OC_REASON_DEATH, status)
- *             == APR_SUCCESS) {
- *         ;  (already handled)
- *     }
- *     else
- * #endif
- *         [... handling non-otherchild processes death ...]
- * </pre>
- */
-APR_DECLARE(apr_status_t) apr_proc_other_child_alert(apr_proc_t *proc, 
-                                                     int reason,
-                                                     int status);
-
-/**
- * Test one specific other child processes and invoke the maintenance callback 
- * with the appropriate reason code, if still running, or the appropriate reason 
- * code if the process is no longer healthy.
- * @param ocr The registered other child
- * @param reason The reason code (e.g. APR_OC_REASON_RESTART) if still running
- */
-APR_DECLARE(void) apr_proc_other_child_refresh(apr_other_child_rec_t *ocr,
-                                               int reason);
-
-/**
- * Test all registered other child processes and invoke the maintenance callback 
- * with the appropriate reason code, if still running, or the appropriate reason 
- * code if the process is no longer healthy.
- * @param reason The reason code (e.g. APR_OC_REASON_RESTART) to running processes
- */
-APR_DECLARE(void) apr_proc_other_child_refresh_all(int reason);
-
-/** @deprecated @see apr_proc_other_child_refresh_all
- * @remark Call apr_proc_other_child_refresh_all(APR_OC_REASON_RESTART)
- * or apr_proc_other_child_refresh_all(APR_OC_REASON_RUNNING) instead.
- * @bug The differing implementations of this function on Win32 (_RUNNING checks) 
- * and Unix (used only for _RESTART) are the reason it will be dropped with APR 1.0.
- */
-APR_DECLARE(void) apr_proc_other_child_check(void);
-
-/** @deprecated @see apr_proc_other_child_alert
- * @bug This function's name had nothing to do with it's purpose
- */
-APR_DECLARE(apr_status_t) apr_proc_other_child_read(apr_proc_t *proc, int status);
-
-
-/** 
- * Terminate a process.
- * @param proc The process to terminate.
- * @param sig How to kill the process.
- */
-APR_DECLARE(apr_status_t) apr_proc_kill(apr_proc_t *proc, int sig);
-
-/**
- * Register a process to be killed when a pool dies.
- * @param a The pool to use to define the processes lifetime 
- * @param proc The process to register
- * @param how How to kill the process, one of:
- * <PRE>
- *         APR_KILL_NEVER         -- process is never sent any signals
- *         APR_KILL_ALWAYS        -- process is sent SIGKILL on apr_pool_t cleanup
- *         APR_KILL_AFTER_TIMEOUT -- SIGTERM, wait 3 seconds, SIGKILL
- *         APR_JUST_WAIT          -- wait forever for the process to complete
- *         APR_KILL_ONLY_ONCE     -- send SIGTERM and then wait
- * </PRE>
- */
-APR_DECLARE(void) apr_pool_note_subprocess(apr_pool_t *a, apr_proc_t *proc,
-                                           apr_kill_conditions_e how);
-
-#if APR_HAS_THREADS 
-
-#if (APR_HAVE_SIGWAIT || APR_HAVE_SIGSUSPEND) && !defined(OS2)
-
-/**
- * Setup the process for a single thread to be used for all signal handling.
- * @warning This must be called before any threads are created
- */
-APR_DECLARE(apr_status_t) apr_setup_signal_thread(void);
-
-/**
- * Make the current thread listen for signals.  This thread will loop
- * forever, calling a provided function whenever it receives a signal.  That
- * functions should return 1 if the signal has been handled, 0 otherwise.
- * @param signal_handler The function to call when a signal is received
- * apr_status_t apr_signal_thread((int)(*signal_handler)(int signum))
- */
-APR_DECLARE(apr_status_t) apr_signal_thread(int(*signal_handler)(int signum));
-
-#endif /* (APR_HAVE_SIGWAIT || APR_HAVE_SIGSUSPEND) && !defined(OS2) */
-
-/**
- * Get the child-pool used by the thread from the thread info.
- * @return apr_pool_t the pool
- */
-APR_POOL_DECLARE_ACCESSOR(thread);
-
-#endif /* APR_HAS_THREADS */
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ! APR_THREAD_PROC_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_thread_rwlock.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_thread_rwlock.h
deleted file mode 100644
index 0e69a2a4..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_thread_rwlock.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_THREAD_RWLOCK_H
-#define APR_THREAD_RWLOCK_H
-
-/**
- * @file apr_thread_rwlock.h
- * @brief APR Reader/Writer Lock Routines
- */
-
-#include "apr.h"
-#include "apr_pools.h"
-#include "apr_errno.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#if APR_HAS_THREADS
-
-/**
- * @defgroup apr_thread_rwlock Reader/Writer Lock Routines
- * @ingroup APR 
- * @{
- */
-
-/** Opaque read-write thread-safe lock. */
-typedef struct apr_thread_rwlock_t apr_thread_rwlock_t;
-
-/**
- * Create and initialize a read-write lock that can be used to synchronize
- * threads.
- * @param rwlock the memory address where the newly created readwrite lock
- *        will be stored.
- * @param pool the pool from which to allocate the mutex.
- */
-APR_DECLARE(apr_status_t) apr_thread_rwlock_create(apr_thread_rwlock_t **rwlock,
-                                                   apr_pool_t *pool);
-/**
- * Acquire a shared-read lock on the given read-write lock. This will allow
- * multiple threads to enter the same critical section while they have acquired
- * the read lock.
- * @param rwlock the read-write lock on which to acquire the shared read.
- */
-APR_DECLARE(apr_status_t) apr_thread_rwlock_rdlock(apr_thread_rwlock_t *rwlock);
-
-/**
- * Attempt to acquire the shread-read lock on the given read-write lock. This
- * is the same as apr_thread_rwlock_rdlock(), only that the funtion fails
- * if there is another thread holding the write lock, or if there are any
- * write threads blocking on the lock. If the function failes for this case,
- * APR_EBUSY will be returned. Note: it is important that the
- * APR_STATUS_IS_EBUSY(s) macro be used to determine if the return value was
- * APR_EBUSY, for portability reasons.
- * @param rwlock the rwlock on which to attempt the shared read.
- */
-APR_DECLARE(apr_status_t) apr_thread_rwlock_tryrdlock(apr_thread_rwlock_t *rwlock);
-
-/**
- * Acquire an exclusive-write lock on the given read-write lock. This will
- * allow only one single thread to enter the critical sections. If there
- * are any threads currently holding thee read-lock, this thread is put to
- * sleep until it can have exclusive access to the lock.
- * @param rwlock the read-write lock on which to acquire the exclusive write.
- */
-APR_DECLARE(apr_status_t) apr_thread_rwlock_wrlock(apr_thread_rwlock_t *rwlock);
-
-/**
- * Attempt to acquire the exclusive-write lock on the given read-write lock. 
- * This is the same as apr_thread_rwlock_wrlock(), only that the funtion fails
- * if there is any other thread holding the lock (for reading or writing),
- * in which case the function will return APR_EBUSY. Note: it is important
- * that the APR_STATUS_IS_EBUSY(s) macro be used to determine if the return
- * value was APR_EBUSY, for portability reasons.
- * @param rwlock the rwlock on which to attempt the exclusive write.
- */
-APR_DECLARE(apr_status_t) apr_thread_rwlock_trywrlock(apr_thread_rwlock_t *rwlock);
-
-/**
- * Release either the read or write lock currently held by the calling thread
- * associated with the given read-write lock.
- * @param rwlock the read-write lock to be released (unlocked).
- */
-APR_DECLARE(apr_status_t) apr_thread_rwlock_unlock(apr_thread_rwlock_t *rwlock);
-
-/**
- * Destroy the read-write lock and free the associated memory.
- * @param rwlock the rwlock to destroy.
- */
-APR_DECLARE(apr_status_t) apr_thread_rwlock_destroy(apr_thread_rwlock_t *rwlock);
-
-/**
- * Get the pool used by this thread_rwlock.
- * @return apr_pool_t the pool
- */
-APR_POOL_DECLARE_ACCESSOR(thread_rwlock);
-
-#endif  /* APR_HAS_THREADS */
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ! APR_THREAD_RWLOCK_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_time.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_time.h
deleted file mode 100644
index d313910b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_time.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_TIME_H
-#define APR_TIME_H
-
-/**
- * @file apr_time.h
- * @brief APR Time Library
- */
-
-#include "apr.h"
-#include "apr_pools.h"
-#include "apr_errno.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup apr_time Time Routines
- * @ingroup APR 
- * @{
- */
-
-/** month names */
-APR_DECLARE_DATA extern const char apr_month_snames[12][4];
-/** day names */
-APR_DECLARE_DATA extern const char apr_day_snames[7][4];
-
-
-/** number of microseconds since 00:00:00 january 1, 1970 UTC */
-typedef apr_int64_t apr_time_t;
-
-
-/** mechanism to properly type apr_time_t literals */
-#define APR_TIME_C(val) APR_INT64_C(val)
-
-/** mechanism to properly print apr_time_t values */
-#define APR_TIME_T_FMT APR_INT64_T_FMT
-
-/** intervals for I/O timeouts, in microseconds */
-typedef apr_int64_t apr_interval_time_t;
-/** short interval for I/O timeouts, in microseconds */
-typedef apr_int32_t apr_short_interval_time_t;
-
-/** number of microseconds per second */
-#define APR_USEC_PER_SEC APR_TIME_C(1000000)
-
-/** @return apr_time_t as a second */
-#define apr_time_sec(time) ((time) / APR_USEC_PER_SEC)
-
-/** @return apr_time_t as a usec */
-#define apr_time_usec(time) ((time) % APR_USEC_PER_SEC)
-
-/** @return apr_time_t as a msec */
-#define apr_time_msec(time) (((time) / 1000) % 1000)
-
-/** @return apr_time_t as a msec */
-#define apr_time_as_msec(time) ((time) / 1000)
-
-/** @return a second as an apr_time_t */
-#define apr_time_from_sec(sec) ((apr_time_t)(sec) * APR_USEC_PER_SEC)
-
-/** @return a second and usec combination as an apr_time_t */
-#define apr_time_make(sec, usec) ((apr_time_t)(sec) * APR_USEC_PER_SEC \
-                                + (apr_time_t)(usec))
-
-/**
- * @return the current time
- */
-APR_DECLARE(apr_time_t) apr_time_now(void);
-
-/** @see apr_time_exp_t */
-typedef struct apr_time_exp_t apr_time_exp_t;
-
-/**
- * a structure similar to ANSI struct tm with the following differences:
- *  - tm_usec isn't an ANSI field
- *  - tm_gmtoff isn't an ANSI field (it's a bsdism)
- */
-struct apr_time_exp_t {
-    /** microseconds past tm_sec */
-    apr_int32_t tm_usec;
-    /** (0-61) seconds past tm_min */
-    apr_int32_t tm_sec;
-    /** (0-59) minutes past tm_hour */
-    apr_int32_t tm_min;
-    /** (0-23) hours past midnight */
-    apr_int32_t tm_hour;
-    /** (1-31) day of the month */
-    apr_int32_t tm_mday;
-    /** (0-11) month of the year */
-    apr_int32_t tm_mon;
-    /** year since 1900 */
-    apr_int32_t tm_year;
-    /** (0-6) days since sunday */
-    apr_int32_t tm_wday;
-    /** (0-365) days since jan 1 */
-    apr_int32_t tm_yday;
-    /** daylight saving time */
-    apr_int32_t tm_isdst;
-    /** seconds east of UTC */
-    apr_int32_t tm_gmtoff;
-};
-
-/**
- * convert an ansi time_t to an apr_time_t
- * @param result the resulting apr_time_t
- * @param input the time_t to convert
- */
-APR_DECLARE(apr_status_t) apr_time_ansi_put(apr_time_t *result, 
-                                                    time_t input);
-
-/**
- * convert a time to its human readable components using an offset
- * from GMT
- * @param result the exploded time
- * @param input the time to explode
- * @param offs the number of seconds offset to apply
- */
-APR_DECLARE(apr_status_t) apr_time_exp_tz(apr_time_exp_t *result,
-                                          apr_time_t input,
-                                          apr_int32_t offs);
-
-/** @deprecated @see apr_time_exp_tz */
-APR_DECLARE(apr_status_t) apr_explode_time(apr_time_exp_t *result,
-                                           apr_time_t input,
-                                           apr_int32_t offs);
-
-/**
- * convert a time to its human readable components in GMT timezone
- * @param result the exploded time
- * @param input the time to explode
- */
-APR_DECLARE(apr_status_t) apr_time_exp_gmt(apr_time_exp_t *result, 
-                                           apr_time_t input);
-
-/**
- * convert a time to its human readable components in local timezone
- * @param result the exploded time
- * @param input the time to explode
- */
-APR_DECLARE(apr_status_t) apr_time_exp_lt(apr_time_exp_t *result, 
-                                          apr_time_t input);
-
-/** @deprecated @see apr_time_exp_lt */
-APR_DECLARE(apr_status_t) apr_explode_localtime(apr_time_exp_t *result, 
-                                                apr_time_t input);
-
-/**
- * Convert time value from human readable format to a numeric apr_time_t 
- * e.g. elapsed usec since epoch
- * @param result the resulting imploded time
- * @param input the input exploded time
- */
-APR_DECLARE(apr_status_t) apr_time_exp_get(apr_time_t *result, 
-                                           apr_time_exp_t *input);
-
-/**
- * Convert time value from human readable format to a numeric apr_time_t that
- * always represents GMT
- * @param result the resulting imploded time
- * @param input the input exploded time
- */
-APR_DECLARE(apr_status_t) apr_time_exp_gmt_get(apr_time_t *result, 
-                                               apr_time_exp_t *input);
-
-/** @deprecated @see apr_time_exp_gmt_get */
-APR_DECLARE(apr_status_t) apr_implode_gmt(apr_time_t *result, 
-                                          apr_time_exp_t *input);
-
-/**
- * Sleep for the specified number of micro-seconds.
- * @param t desired amount of time to sleep.
- * @warning May sleep for longer than the specified time. 
- */
-APR_DECLARE(void) apr_sleep(apr_interval_time_t t);
-
-/** length of a RFC822 Date */
-#define APR_RFC822_DATE_LEN (30)
-/**
- * apr_rfc822_date formats dates in the RFC822
- * format in an efficient manner.  It is a fixed length
- * format which requires the indicated amount of storage,
- * including the trailing null byte.
- * @param date_str String to write to.
- * @param t the time to convert 
- */
-APR_DECLARE(apr_status_t) apr_rfc822_date(char *date_str, apr_time_t t);
-
-/** length of a CTIME date */
-#define APR_CTIME_LEN (25)
-/**
- * apr_ctime formats dates in the ctime() format
- * in an efficient manner.  it is a fixed length format
- * and requires the indicated amount of storage including
- * the trailing null byte.
- * Unlike ANSI/ISO C ctime(), apr_ctime() does not include
- * a \n at the end of the string.
- * @param date_str String to write to.
- * @param t the time to convert 
- */
-APR_DECLARE(apr_status_t) apr_ctime(char *date_str, apr_time_t t);
-
-/**
- * formats the exploded time according to the format specified
- * @param s string to write to
- * @param retsize The length of the returned string
- * @param max The maximum length of the string
- * @param format The format for the time string
- * @param tm The time to convert
- */
-APR_DECLARE(apr_status_t) apr_strftime(char *s, apr_size_t *retsize, 
-                                       apr_size_t max, const char *format, 
-                                       apr_time_exp_t *tm);
-
-/**
- * Improve the clock resolution for the lifetime of the given pool.
- * Generally this is only desireable on benchmarking and other very
- * time-sensitive applications, and has no impact on most platforms.
- * @param p The pool to associate the finer clock resolution 
- */
-APR_DECLARE(void) apr_time_clock_hires(apr_pool_t *p);
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ! APR_TIME_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_user.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_user.h
deleted file mode 100644
index d96d5407..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_user.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_USER_H
-#define APR_USER_H
-
-/**
- * @file apr_user.h
- * @brief APR User ID Services 
- */
-
-#include "apr.h"
-#include "apr_errno.h"
-#include "apr_pools.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * @defgroup apr_user User and Group ID Services
- * @ingroup APR 
- * @{
- */
-
-/**
- * Structure for determining user ownership.
- */
-#ifdef WIN32
-typedef PSID                      apr_uid_t;
-#else
-typedef uid_t                     apr_uid_t;
-#endif
-
-/**
- * Structure for determining group ownership.
- */
-#ifdef WIN32
-typedef PSID                      apr_gid_t;
-#else
-typedef gid_t                     apr_gid_t;
-#endif
-
-#if APR_HAS_USER 
-
-/**
- * Get the userid (and groupid) of the calling process
- * @param userid   Returns the user id
- * @param groupid  Returns the user's group id
- * @param p The pool from which to allocate working space
- * @remark This function is available only if APR_HAS_USER is defined.
- */
-APR_DECLARE(apr_status_t) apr_uid_current(apr_uid_t *userid,
-                                          apr_gid_t *groupid,
-                                          apr_pool_t *p);
-
-/** @deprecated @see apr_uid_current */
-APR_DECLARE(apr_status_t) apr_current_userid(apr_uid_t *userid,
-                                             apr_gid_t *groupid,
-                                             apr_pool_t *p);
-/**
- * Get the user name for a specified userid
- * @param username Pointer to new string containing user name (on output)
- * @param userid The userid
- * @param p The pool from which to allocate the string
- * @remark This function is available only if APR_HAS_USER is defined.
- */
-APR_DECLARE(apr_status_t) apr_uid_name_get(char **username, apr_uid_t userid,
-                                           apr_pool_t *p);
-
-/** @deprecated @see apr_uid_name_get */
-APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid,
-                                           apr_pool_t *p);
-/**
- * Get the userid (and groupid) for the specified username
- * @param userid   Returns the user id
- * @param groupid  Returns the user's group id
- * @param username The username to lookup
- * @param p The pool from which to allocate working space
- * @remark This function is available only if APR_HAS_USER is defined.
- */
-APR_DECLARE(apr_status_t) apr_uid_get(apr_uid_t *userid, apr_gid_t *groupid,
-                                      const char *username, apr_pool_t *p);
-
-/** @deprecated @see apr_uid_get */
-APR_DECLARE(apr_status_t) apr_get_userid(apr_uid_t *userid, apr_gid_t *groupid,
-                                         const char *username, apr_pool_t *p);
-
-/**
- * Get the home directory for the named user
- * @param dirname Pointer to new string containing directory name (on output)
- * @param username The named user
- * @param p The pool from which to allocate the string
- * @remark This function is available only if APR_HAS_USER is defined.
- */
-APR_DECLARE(apr_status_t) apr_uid_homepath_get(char **dirname, 
-                                               const char *username, 
-                                               apr_pool_t *p);
-
-/** @deprecated @see apr_uid_homepath_get */
-APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname, 
-                                                 const char *username, 
-                                                 apr_pool_t *p);
-
-/**
- * Compare two user identifiers for equality.
- * @param left One uid to test
- * @param right Another uid to test
- * @return APR_SUCCESS if the apr_uid_t strutures identify the same user,
- * APR_EMISMATCH if not, APR_BADARG if an apr_uid_t is invalid.
- * @remark This function is available only if APR_HAS_USER is defined.
- */
-#if defined(WIN32)
-APR_DECLARE(apr_status_t) apr_uid_compare(apr_uid_t left, apr_uid_t right);
-
-/** @deprecated @see apr_uid_compare */
-APR_DECLARE(apr_status_t) apr_compare_users(apr_uid_t left, apr_uid_t right);
-#else
-#define apr_uid_compare(left,right) (((left) == (right)) ? APR_SUCCESS : APR_EMISMATCH)
-/** @deprecated @see apr_uid_compare */
-#define apr_compare_users(left,right) (((left) == (right)) ? APR_SUCCESS : APR_EMISMATCH)
-#endif
-
-/**
- * Get the group name for a specified groupid
- * @param groupname Pointer to new string containing group name (on output)
- * @param groupid The groupid
- * @param p The pool from which to allocate the string
- * @remark This function is available only if APR_HAS_USER is defined.
- */
-APR_DECLARE(apr_status_t) apr_gid_name_get(char **groupname, 
-                                             apr_gid_t groupid, apr_pool_t *p);
-
-/** @deprecated @see apr_gid_name_get */
-APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname, 
-                                             apr_gid_t groupid, apr_pool_t *p);
-
-/** @deprecated @see apr_gid_name_get */
-APR_DECLARE(apr_status_t) apr_get_groupname(char **groupname, 
-                                            apr_gid_t groupid, apr_pool_t *p);
-
-/**
- * Get the groupid for a specified group name
- * @param groupid Pointer to the group id (on output)
- * @param groupname The group name to look up
- * @param p The pool from which to allocate the string
- * @remark This function is available only if APR_HAS_USER is defined.
- */
-APR_DECLARE(apr_status_t) apr_gid_get(apr_gid_t *groupid, 
-                                      const char *groupname, apr_pool_t *p);
-
-/** @deprecated @see apr_gid_get */
-APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *groupid, 
-                                          const char *groupname, apr_pool_t *p);
-
-/**
- * Compare two group identifiers for equality.
- * @param left One gid to test
- * @param right Another gid to test
- * @return APR_SUCCESS if the apr_gid_t strutures identify the same group,
- * APR_EMISMATCH if not, APR_BADARG if an apr_gid_t is invalid.
- * @remark This function is available only if APR_HAS_USER is defined.
- */
-#if defined(WIN32)
-APR_DECLARE(apr_status_t) apr_gid_compare(apr_gid_t left, apr_gid_t right);
-/** @deprecated @see apr_gid_compare */
-APR_DECLARE(apr_status_t) apr_compare_groups(apr_gid_t left, apr_gid_t right);
-#else
-#define apr_gid_compare(left,right) (((left) == (right)) ? APR_SUCCESS : APR_EMISMATCH)
-/** @deprecated @see apr_gid_compare */
-#define apr_compare_groups(left,right) (((left) == (right)) ? APR_SUCCESS : APR_EMISMATCH)
-#endif
-
-#endif  /* ! APR_HAS_USER */
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ! APR_USER_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_version.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_version.h
deleted file mode 100644
index 08bcd288..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_version.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_VERSION_H
-#define APR_VERSION_H
-
-#include "apr.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @file apr_version.h
- * @brief APR Versioning Interface
- * 
- * APR's Version
- *
- * There are several different mechanisms for accessing the version. There
- * is a string form, and a set of numbers; in addition, there are constants
- * which can be compiled into your application, and you can query the library
- * being used for its actual version.
- *
- * Note that it is possible for an application to detect that it has been
- * compiled against a different version of APR by use of the compile-time
- * constants and the use of the run-time query function.
- *
- * APR version numbering follows the guidelines specified in:
- *
- *     http://apr.apache.org/versioning.html
- */
-
-/* The numeric compile-time version constants. These constants are the
- * authoritative version numbers for APR. 
- */
-
-/** major version 
- * Major API changes that could cause compatibility problems for older
- * programs such as structure size changes.  No binary compatibility is
- * possible across a change in the major version.
- */
-#define APR_MAJOR_VERSION       0
-
-/** 
- * Minor API changes that do not cause binary compatibility problems.
- * Should be reset to 0 when upgrading APR_MAJOR_VERSION
- */
-#define APR_MINOR_VERSION       9
-
-/** patch level */
-#define APR_PATCH_VERSION      19
-
-/** 
- *  This symbol is defined for internal, "development" copies of APR. This
- *  symbol will be #undef'd for releases. 
- */
-/* #define APR_IS_DEV_VERSION */
-
-
-/** The formatted string of APR's version */
-#define APR_VERSION_STRING \
-     APR_STRINGIFY(APR_MAJOR_VERSION) "." \
-     APR_STRINGIFY(APR_MINOR_VERSION) "." \
-     APR_STRINGIFY(APR_PATCH_VERSION) \
-     APR_IS_DEV_STRING
-
-
-/** 
- * The numeric version information is broken out into fields within this 
- * structure. 
- */
-typedef struct {
-    int major;      /**< major number */
-    int minor;      /**< minor number */
-    int patch;      /**< patch number */
-    int is_dev;     /**< is development (1 or 0) */
-} apr_version_t;
-
-/**
- * Return APR's version information information in a numeric form.
- *
- *  @param pvsn Pointer to a version structure for returning the version
- *              information.
- */
-APR_DECLARE(void) apr_version(apr_version_t *pvsn);
-
-/** Return APR's version information as a string. */
-APR_DECLARE(const char *) apr_version_string(void);
-
-
-/** Internal: string form of the "is dev" flag */
-#ifdef APR_IS_DEV_VERSION
-#define APR_IS_DEV_STRING "-dev"
-#else
-#define APR_IS_DEV_STRING ""
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* APR_VERSION_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_want.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_want.h
deleted file mode 100644
index 39cc4fcb..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/apr_want.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"        /* configuration data */
-/**
- * @file apr_want.h
- * @brief APR Standard Headers Support
- *
- * <PRE>
- * Features:
- *
- *   APR_WANT_STRFUNC:  strcmp, strcat, strcpy, etc
- *   APR_WANT_MEMFUNC:  memcmp, memcpy, etc
- *   APR_WANT_STDIO:    <stdio.h> and related bits
- *   APR_WANT_IOVEC:    struct iovec
- *   APR_WANT_BYTEFUNC: htons, htonl, ntohl, ntohs
- *
- * Typical usage:
- *
- *   #define APR_WANT_STRFUNC
- *   #define APR_WANT_MEMFUNC
- *   #include "apr_want.h"
- *
- * The appropriate headers will be included.
- *
- * Note: it is safe to use this in a header (it won't interfere with other
- *       headers' or source files' use of apr_want.h)
- * </PRE>
- */
-
-/* --------------------------------------------------------------------- */
-
-#ifdef APR_WANT_STRFUNC
-
-#if APR_HAVE_STRING_H
-#include <string.h>
-#endif
-#if APR_HAVE_STRINGS_H
-#include <strings.h>
-#endif
-
-#undef APR_WANT_STRFUNC
-#endif
-
-/* --------------------------------------------------------------------- */
-
-#ifdef APR_WANT_MEMFUNC
-
-#if APR_HAVE_STRING_H
-#include <string.h>
-#endif
-
-#undef APR_WANT_MEMFUNC
-#endif
-
-/* --------------------------------------------------------------------- */
-
-#ifdef APR_WANT_STDIO
-
-#if APR_HAVE_STDIO_H
-#include <stdio.h>
-#endif
-
-#undef APR_WANT_STDIO
-#endif
-
-/* --------------------------------------------------------------------- */
-
-#ifdef APR_WANT_IOVEC
-
-#if APR_HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif
-
-#undef APR_WANT_IOVEC
-#endif
-
-/* --------------------------------------------------------------------- */
-
-#ifdef APR_WANT_BYTEFUNC
-
-/* Single Unix says they are in arpa/inet.h.  Linux has them in
- * netinet/in.h.  FreeBSD has them in arpa/inet.h but requires that
- * netinet/in.h be included first.
- */
-#if APR_HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#if APR_HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-
-#undef APR_WANT_BYTEFUNC
-#endif
-
-/* --------------------------------------------------------------------- */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/aix/apr_arch_dso.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/aix/apr_arch_dso.h
deleted file mode 100644
index d1cac684..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/aix/apr_arch_dso.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef DSO_H
-#define DSO_H
-
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_dso.h"
-#include "apr.h"
-
-#if APR_HAS_DSO
-
-void *dlopen(const char *path, int mode);
-void *dlsym(void *handle, const char *symbol);
-const char *dlerror(void);
-int dlclose(void *handle);
-
-struct apr_dso_handle_t {
-    apr_pool_t  *pool;
-    void          *handle;
-    const char *errormsg;
-};
-
-#endif
-
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/apr_private_common.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/apr_private_common.h
deleted file mode 100644
index 3d8b7609..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/apr_private_common.h
+++ /dev/null
@@ -1,37 +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.
- */
-
-/*
- * This file contains private declarations common to all architectures.
- */
-
-#ifndef APR_PRIVATE_COMMON_H
-#define APR_PRIVATE_COMMON_H
-
-#include "apr_pools.h"
-#include "apr_tables.h"
-
-apr_status_t apr_filepath_list_split_impl(apr_array_header_t **pathelts,
-                                          const char *liststr,
-                                          char separator,
-                                          apr_pool_t *p);
-
-apr_status_t apr_filepath_list_merge_impl(char **liststr,
-                                          apr_array_header_t *pathelts,
-                                          char separator,
-                                          apr_pool_t *p);
-
-#endif  /*APR_PRIVATE_COMMON_H*/
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/beos/apr_arch_dso.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/beos/apr_arch_dso.h
deleted file mode 100644
index 0fbc9c1e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/beos/apr_arch_dso.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef DSO_H
-#define DSO_H
-
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_errno.h"
-#include "apr_dso.h"
-#include "apr.h"
-#include <kernel/image.h>
-#include <string.h>
-
-#if APR_HAS_DSO
-
-struct apr_dso_handle_t {
-    image_id      handle;    /* Handle to the DSO loaded */
-    apr_pool_t   *pool;
-};
-
-#endif
-
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/beos/apr_arch_proc_mutex.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/beos/apr_arch_proc_mutex.h
deleted file mode 100644
index c60d8c62..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/beos/apr_arch_proc_mutex.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef PROC_MUTEX_H
-#define PROC_MUTEX_H
-
-#include "apr_pools.h"
-#include "apr_proc_mutex.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_portable.h"
-
-struct apr_proc_mutex_t {
-    apr_pool_t *pool;
-    
-    /* Our lock :) */
-    sem_id Lock;
-    int32  LockCount;
-};
-
-#endif  /* PROC_MUTEX_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/beos/apr_arch_thread_cond.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/beos/apr_arch_thread_cond.h
deleted file mode 100644
index c9420b53..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/beos/apr_arch_thread_cond.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef THREAD_COND_H
-#define THREAD_COND_H
-
-#include <kernel/OS.h>
-#include "apr_pools.h"
-#include "apr_thread_cond.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_portable.h"
-#include "apr_ring.h"
-
-struct waiter_t {
-    APR_RING_ENTRY(waiter_t) link;
-    sem_id sem;
-};
-
-struct apr_thread_cond_t {
-    apr_pool_t *pool;
-    sem_id lock;
-    apr_thread_mutex_t *condlock;
-    thread_id owner;
-    /* active list */
-    APR_RING_HEAD(active_list, waiter_t) alist;
-    /* free list */
-    APR_RING_HEAD(free_list,   waiter_t) flist;
-};
-
-#endif  /* THREAD_COND_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/beos/apr_arch_thread_mutex.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/beos/apr_arch_thread_mutex.h
deleted file mode 100644
index bb7d4ae8..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/beos/apr_arch_thread_mutex.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef THREAD_MUTEX_H
-#define THREAD_MUTEX_H
-
-#include <kernel/OS.h>
-#include "apr_pools.h"
-#include "apr_thread_mutex.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_portable.h"
-
-struct apr_thread_mutex_t {
-    apr_pool_t *pool;
-    
-    /* Our lock :) */
-    sem_id Lock;
-    int32  LockCount;
-
-    /* If we nest locks we need these... */
-    int nested;  
-    apr_os_thread_t owner;
-    int owner_ref;
-};
-
-#endif  /* THREAD_MUTEX_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/beos/apr_arch_thread_rwlock.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/beos/apr_arch_thread_rwlock.h
deleted file mode 100644
index 694b0d50..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/beos/apr_arch_thread_rwlock.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef THREAD_RWLOCK_H
-#define THREAD_RWLOCK_H
-
-#include <kernel/OS.h>
-#include "apr_pools.h"
-#include "apr_thread_rwlock.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_portable.h"
-
-struct apr_thread_rwlock_t {
-    apr_pool_t *pool;
-
-    /* Our lock :) */
-    sem_id Lock;
-    int32  LockCount;
-    /* Read/Write lock stuff */
-    sem_id Read;
-    int32  ReadCount;
-    sem_id Write;
-    int32  WriteCount;
-    int32  Nested;
-
-    thread_id writer;
-};
-
-#endif  /* THREAD_RWLOCK_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/beos/apr_arch_threadproc.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/beos/apr_arch_threadproc.h
deleted file mode 100644
index 13de0536..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/beos/apr_arch_threadproc.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_thread_proc.h"
-#include "apr_arch_file_io.h"
-#include "apr_file_io.h"
-#include "apr_thread_proc.h"
-#include "apr_general.h"
-#include "apr_portable.h"
-#include <kernel/OS.h>
-#include <signal.h>
-#include <string.h>
-#include <sys/wait.h>
-#include <image.h>
-
-#ifndef THREAD_PROC_H
-#define THREAD_PROC_H
-
-#define SHELL_PATH "/bin/sh"
-
-#define PTHREAD_CANCEL_AYNCHRONOUS  CANCEL_ASYNCH; 
-#define PTHREAD_CANCEL_DEFERRED     CANCEL_DEFER; 
-                                   
-#define PTHREAD_CANCEL_ENABLE       CANCEL_ENABLE; 
-#define PTHREAD_CANCEL_DISABLE      CANCEL_DISABLE; 
-
-#define BEOS_MAX_DATAKEYS	128
-
-struct apr_thread_t {
-    apr_pool_t *pool;
-    thread_id td;
-    void *data;
-    apr_thread_start_t func;
-    apr_status_t exitval;
-};
-
-struct apr_threadattr_t {
-    apr_pool_t *pool;
-    int32 attr;
-    int detached;
-    int joinable;
-};
-
-struct apr_threadkey_t {
-    apr_pool_t *pool;
-	int32  key;
-};
-
-struct beos_private_data {
-	const void ** data;
-	int count;
-	volatile thread_id  td;
-};
-
-struct beos_key {
-	int  assigned;
-	int  count;
-	sem_id  lock;
-	int32  ben_lock;
-	void (* destructor) (void *);
-};
-
-struct apr_procattr_t {
-    apr_pool_t *pool;
-    apr_file_t *parent_in;
-    apr_file_t *child_in;
-    apr_file_t *parent_out;
-    apr_file_t *child_out;
-    apr_file_t *parent_err;
-    apr_file_t *child_err;
-    char *currdir;
-    apr_int32_t cmdtype;
-    apr_int32_t detached;
-};
-
-struct apr_thread_once_t {
-    sem_id sem;
-    int hit;
-};
-
-#endif  /* ! THREAD_PROC_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_dso.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_dso.h
deleted file mode 100644
index ea0fe8c2..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_dso.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef DSO_H
-#define DSO_H
-
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_dso.h"
-#include "apr.h"
-
-#include <dlfcn.h>
-
-typedef struct sym_list sym_list;
-
-struct sym_list {
-    sym_list *next;
-    char *symbol;
-};
-
-struct apr_dso_handle_t {
-    apr_pool_t  *pool;
-    void        *handle;
-    const char  *errormsg;
-    sym_list    *symbols;
-    char        *path;
-};
-
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_file_io.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_file_io.h
deleted file mode 100644
index 7548a237..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_file_io.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef FILE_IO_H
-#define FILE_IO_H
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_tables.h"
-#include "apr_file_io.h"
-#include "apr_file_info.h"
-#include "apr_errno.h"
-#include "apr_lib.h"
-
-/* System headers the file I/O library needs */
-#if APR_HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if APR_HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#if APR_HAVE_STRING_H
-#include <string.h>
-#endif
-#if APR_HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#if APR_HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#if APR_HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if APR_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#if APR_HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif
-#if APR_HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#include <fsio.h>
-
-/* End System headers */
-
-#define APR_FILE_BUFSIZE 4096
-
-struct apr_file_t {
-    apr_pool_t *pool;
-    int filedes;
-    char *fname;
-    apr_int32_t flags;
-    int eof_hit;
-    int is_pipe;
-    apr_interval_time_t timeout;
-    int buffered;
-    enum {BLK_UNKNOWN, BLK_OFF, BLK_ON } blocking;
-    int ungetchar;    /* Last char provided by an unget op. (-1 = no char)*/
-
-    /* Stuff for buffered mode */
-    char *buffer;
-    int bufpos;               /* Read/Write position in buffer */
-    unsigned long dataRead;   /* amount of valid data read into buffer */
-    int direction;            /* buffer being used for 0 = read, 1 = write */
-    unsigned long filePtr;    /* position in file of handle */
-#if APR_HAS_THREADS
-    struct apr_thread_mutex_t *thlock;
-#endif
-};
-
-#if APR_HAS_THREADS
-#define file_lock(f)   do { \
-                           if ((f)->thlock) \
-                               apr_thread_mutex_lock((f)->thlock); \
-                       } while (0)
-#define file_unlock(f) do { \
-                           if ((f)->thlock) \
-                               apr_thread_mutex_unlock((f)->thlock); \
-                       } while (0)
-#else
-#define file_lock(f)   do {} while (0)
-#define file_unlock(f) do {} while (0)
-#endif
-
-struct apr_dir_t {
-    apr_pool_t *pool;
-    char *dirname;
-    DIR *dirstruct;
-    struct dirent *entry;
-};
-
-typedef struct apr_stat_entry_t apr_stat_entry_t;
-
-struct apr_stat_entry_t {
-    struct stat info;
-    char *casedName;
-    apr_time_t expire;
-    NXPathCtx_t pathCtx;
-};
-
-#define MAX_SERVER_NAME     64
-#define MAX_VOLUME_NAME     64
-#define MAX_PATH_NAME       256
-#define MAX_FILE_NAME       256
-
-#define DRIVE_ONLY          1
-
-/* If the user passes d: vs. D: (or //mach/share vs. //MACH/SHARE),
- * we need to fold the case to canonical form.  This function is
- * supposed to do so.
- */
-apr_status_t filepath_root_case(char **rootpath, char *root, apr_pool_t *p);
-
-/* This function check to see of the given path includes a drive/volume
- * specifier.  If the _only_ parameter is set to DRIVE_ONLY then it 
- * check to see of the path only contains a drive/volume specifier and
- * nothing else.
- */
-apr_status_t filepath_has_drive(const char *rootpath, int only, apr_pool_t *p);
-
-/* This function compares the drive/volume specifiers for each given path.
- * It returns zero if they match or non-zero if not. 
- */
-apr_status_t filepath_compare_drive(const char *path1, const char *path2, apr_pool_t *p);
-
-apr_status_t apr_unix_file_cleanup(void *);
-apr_status_t apr_unix_child_file_cleanup(void *);
-
-apr_status_t apr_file_flush_locked(apr_file_t *thefile);
-apr_status_t apr_file_info_get_locked(apr_finfo_t *finfo, apr_int32_t wanted,
-                                      apr_file_t *thefile);
-
-#endif  /* ! FILE_IO_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_global_mutex.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_global_mutex.h
deleted file mode 100644
index 4167d378..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_global_mutex.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef GLOBAL_MUTEX_H
-#define GLOBAL_MUTEX_H
-
-#include "apr_global_mutex.h"
-#include "apr_thread_mutex.h"
-
-struct apr_global_mutex_t {
-    apr_pool_t *pool;
-    apr_thread_mutex_t *mutex;
-};
-
-#endif  /* GLOBAL_MUTEX_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_internal_time.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_internal_time.h
deleted file mode 100644
index 59f10672..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_internal_time.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef TIME_INTERNAL_H
-#define TIME_INTERNAL_H
-
-#include "apr.h"
-
-#define TZONE           (*___timezone())
-
-void apr_netware_setup_time(void);
-
-#endif  /* TIME_INTERNAL_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_networkio.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_networkio.h
deleted file mode 100644
index bcd7ec84..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_networkio.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef NETWORK_IO_H
-
-/* Making sure that we include the correct networkio.h since the
-    the project file is configured to first look for headers in
-    arch/netware and then arch/unix. But in this specific case we 
-    want arch/win32.
-*/
-#include <../win32/apr_arch_networkio.h>
-
-#endif  /* ! NETWORK_IO_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_pre_nw.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_pre_nw.h
deleted file mode 100644
index 36d9942c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_pre_nw.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef __pre_nw__
-#define __pre_nw__
-
-#include <stdint.h>
-
-#ifndef __GNUC__
-#pragma precompile_target "precomp.mch"
-#endif
-
-#define NETWARE
-
-#define N_PLAT_NLM
-
-/* 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.
- */
-#define FAR
-#define far
-
-/* no-op for Codewarrior C compiler; a functions are cdecl 
-   by default */
-#define cdecl
-
-/* if we have wchar_t enabled in C++, predefine this type to avoid
-   a conflict in Novell's header files */
-#ifndef __GNUC__
-#ifndef DOXYGEN
-#if (__option(cplusplus) && __option(wchar_type))
-#define _WCHAR_T
-#endif
-#endif
-#endif
-
-/* C9X defintion used by MSL C++ library */
-#define DECIMAL_DIG 17
-
-/* some code may want to use the MS convention for long long */
-#ifndef __int64
-#define __int64 long long
-#endif
-
-/* expat version */
-#define VERSION "expat_1.95.1"
-#define EXPAT_MAJOR_VERSION     1
-#define EXPAT_MINOR_VERSION     95
-#define EXPAT_EDIT              2
-
-#define XML_MAJOR_VERSION       EXPAT_MAJOR_VERSION
-#define XML_MINOR_VERSION       EXPAT_MINOR_VERSION
-#define XML_MICRO_VERSION       EXPAT_EDIT
-
-#endif
-
-
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_proc_mutex.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_proc_mutex.h
deleted file mode 100644
index 7a634c2e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_proc_mutex.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef PROC_MUTEX_H
-#define PROC_MUTEX_H
-
-#include "apr_proc_mutex.h"
-#include "apr_thread_mutex.h"
-
-struct apr_proc_mutex_t {
-    apr_pool_t *pool;
-    apr_thread_mutex_t *mutex;
-};
-
-#endif  /* PROC_MUTEX_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_thread_cond.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_thread_cond.h
deleted file mode 100644
index b11a5f86..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_thread_cond.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef THREAD_COND_H
-#define THREAD_COND_H
-
-#include "apr_thread_cond.h"
-#include <nks/synch.h>
-
-struct apr_thread_cond_t {
-    apr_pool_t *pool;
-    NXCond_t *cond;
-};
-
-#endif  /* THREAD_COND_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_thread_mutex.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_thread_mutex.h
deleted file mode 100644
index 0453799c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_thread_mutex.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef THREAD_MUTEX_H
-#define THREAD_MUTEX_H
-
-#include "apr_thread_mutex.h"
-#include <nks/synch.h>
-
-struct apr_thread_mutex_t {
-    apr_pool_t *pool;
-    NXMutex_t *mutex;
-};
-
-#endif  /* THREAD_MUTEX_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_thread_rwlock.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_thread_rwlock.h
deleted file mode 100644
index d2dbd42f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_thread_rwlock.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef THREAD_RWLOCK_H
-#define THREAD_RWLOCK_H
-
-#include "apr_thread_rwlock.h"
-#include <nks/synch.h>
-
-struct apr_thread_rwlock_t {
-    apr_pool_t *pool;
-    NXRwLock_t *rwlock;
-};
-
-#endif  /* THREAD_RWLOCK_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_threadproc.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_threadproc.h
deleted file mode 100644
index 713ed295..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_arch_threadproc.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-
-#include <sys/wait.h>
-
-#ifndef THREAD_PROC_H
-#define THREAD_PROC_H
-
-#define SHELL_PATH ""
-#define APR_DEFAULT_STACK_SIZE 65536
-
-struct apr_thread_t {
-    apr_pool_t *pool;
-    NXContext_t ctx;
-    NXThreadId_t td;
-    char *thread_name;
-    apr_int32_t cancel;
-    apr_int32_t cancel_how;
-    void *data;
-    apr_thread_start_t func;
-    apr_status_t exitval;
-};
-
-struct apr_threadattr_t {
-    apr_pool_t *pool;
-    apr_size_t  stack_size;
-    apr_int32_t detach;
-    char *thread_name;
-};
-
-struct apr_threadkey_t {
-    apr_pool_t *pool;
-    NXKey_t key;
-};
-
-struct apr_procattr_t {
-    apr_pool_t *pool;
-    apr_file_t *parent_in;
-    apr_file_t *child_in;
-    apr_file_t *parent_out;
-    apr_file_t *child_out;
-    apr_file_t *parent_err;
-    apr_file_t *child_err;
-    char *currdir;
-    apr_int32_t cmdtype;
-    apr_int32_t detached;
-    apr_int32_t addrspace;
-};
-
-struct apr_thread_once_t {
-    unsigned long value;
-};
-
-//struct apr_proc_t {
-//    apr_pool_t *pool;
-//    pid_t pid;
-//    apr_procattr_t *attr;
-//};
-
-#endif  /* ! THREAD_PROC_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_private.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_private.h
deleted file mode 100644
index 0282adfb..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/netware/apr_private.h
+++ /dev/null
@@ -1,175 +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.
- */
-
-/*
- * Note: 
- * This is the windows specific autoconf-like config file
- * which unix would create at build time.
- */
-
-#ifdef NETWARE
-
-#ifndef APR_PRIVATE_H
-#define APR_PRIVATE_H
-
-/* Include the public APR symbols, include our idea of the 'right'
- * subset of the Windows.h header.  This saves us repetition.
- */
-#include "apr.h"
-
-#include <sys/types.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <library.h>
-#include <netware.h>
-
-/* Use this section to define all of the HAVE_FOO_H
- * that are required to build properly.
- */
-#define HAVE_DLFCN_H    1
-#define HAVE_LIMITS_H   1
-#define HAVE_SIGNAL_H   1
-#define HAVE_STDDEF_H   1
-#define HAVE_STDLIB_H   1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_MMAN_H 1
-#define HAVE_FCNTL_H    1
-#define HAVE_ICONV_H    1
-#define HAVE_UTIME_H    1
-
-#define HAVE_STRICMP    1
-#define HAVE_STRNICMP   1
-#define HAVE_STRDUP     1
-#define HAVE_STRSTR     1
-#define HAVE_MEMCHR     1
-#define HAVE_CALLOC     1
-#define HAVE_UTIME      1
-
-#define HAVE_GETENV     1
-#define HAVE_SETENV     1
-#define HAVE_UNSETENV   1
-
-#define HAVE_WRITEV     1
-
-/*#define DSO_USE_DLFCN */
-
-#ifdef NW_BUILD_IPV6
-#define HAVE_GETADDRINFO 1
-#define HAVE_GETNAMEINFO 1
-#endif
-
-/* 1 is used for SIGABRT on netware */
-/* 2 is used for SIGFPE on netware */
-/* 3 is used for SIGILL on netware */
-/* 4 is used for SIGINT on netware */
-/* 5 is used for SIGSEGV on netware */
-/* 6 is used for SIGTERM on netware */
-/* 7 is used for SIGPOLL on netware */
-
-#define SIGKILL         11
-#define SA_NOCLDSTOP    12
-#define SIGALRM         13
-#define SIGCHLD         14 
-#define SIGCONT         15
-#define SIGHUP          16
-#define SIGPIPE         17
-#define SIGQUIT         18
-#define SIGSTOP         19
-#define SIGTSTP         20
-#define SIGTTIN         21
-#define SIGTTOU         22
-#define SIGUSR1         23
-#define SIGUSR2         24
-    
-#define SIGTRAP         25
-#define SIGIOT          26
-#define SIGBUS          27
-#define SIGSTKFLT       28
-#define SIGURG          29
-#define SIGXCPU         30
-#define SIGXFSZ         31
-#define SIGVTALRM       32
-#define SIGPROF         33
-#define SIGWINCH        34
-#define SIGIO           35
-
-#if 0
-#define __attribute__(__x) 
-
-/* APR COMPATABILITY FUNCTIONS
- * This section should be used to define functions and
- * macros which are need to make Windows features look
- * like POSIX features.
- */
-typedef void (Sigfunc)(int);
-#endif
-
-#define strcasecmp(s1, s2)       stricmp(s1, s2)
-#define Sleep(t)                 delay(t)
-#define lstat(a,b)               stat(a,b)
-#define _getch()                 getcharacter()
-
-#define SIZEOF_SHORT           2
-#define SIZEOF_INT             4
-#define SIZEOF_LONGLONG        8
-#define SIZEOF_CHAR            1
-#define SIZEOF_SSIZE_T         SIZEOF_INT
-
-void netware_pool_proc_cleanup ();
-
-/* NLM registration routines for managing which NLMs
-    are using the library. */
-int register_NLM(void *NLMHandle);
-int unregister_NLM(void *NLMHandle);
-
-/* Application global data management */
-extern int  gLibId;
-extern void *gLibHandle;
-
-typedef struct app_data {
-    int     initialized;
-    void*   gPool;
-    void*   gs_aHooksToSort;
-    void*   gs_phOptionalHooks;
-    void*   gs_phOptionalFunctions;
-    void*   gs_nlmhandle;
-    rtag_t  gs_startup_rtag;
-    rtag_t  gs_socket_rtag;
-    rtag_t  gs_lookup_rtag;
-    rtag_t  gs_event_rtag;
-    rtag_t  gs_pcp_rtag;
-} APP_DATA;
-
-int setGlobalPool(void *data);
-void* getGlobalPool();
-int setStatCache(void *data);
-void* getStatCache();
-
-/* Redefine malloc to use the library malloc call so 
-    that all of the memory resources will be owned
-    and can be shared by the library. */
-#undef malloc
-#define malloc(x) library_malloc(gLibHandle,x)
-
-/*
- * Include common private declarations.
- */
-#include "../apr_private_common.h"
-
-#endif  /*APR_PRIVATE_H*/
-#endif  /*NETWARE*/
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_dso.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_dso.h
deleted file mode 100644
index 2bda6b7c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_dso.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef DSO_H
-#define DSO_H
-
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_dso.h"
-#include "apr.h"
-
-#if APR_HAS_DSO
-
-struct apr_dso_handle_t {
-    apr_pool_t  *cont;       /* Context for returning error strings */
-    HMODULE       handle;     /* Handle to the DSO loaded            */
-    apr_status_t   load_error;
-    char          *failed_module;
-};
-
-#endif
-
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_file_io.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_file_io.h
deleted file mode 100644
index 60700656..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_file_io.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef FILE_IO_H
-#define FILE_IO_H
-
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_thread_mutex.h"
-#include "apr_file_io.h"
-#include "apr_file_info.h"
-#include "apr_errno.h"
-
-/* We have an implementation of mkstemp but it's not very multi-threading 
- * friendly & is part of the POSIX emulation rather than native so don't
- * use it.
- */
-#undef HAVE_MKSTEMP
-
-#define APR_FILE_BUFSIZE 4096
-
-struct apr_file_t {
-    apr_pool_t *pool;
-    HFILE filedes;
-    char * fname;
-    int isopen;
-    int buffered;
-    int eof_hit;
-    apr_int32_t flags;
-    int timeout;
-    int pipe;
-    HEV pipeSem;
-    enum { BLK_UNKNOWN, BLK_OFF, BLK_ON } blocking;
-
-    /* Stuff for buffered mode */
-    char *buffer;
-    int bufpos;               // Read/Write position in buffer
-    unsigned long dataRead;   // amount of valid data read into buffer
-    int direction;            // buffer being used for 0 = read, 1 = write
-    unsigned long filePtr;    // position in file of handle
-    apr_thread_mutex_t *mutex;// mutex semaphore, must be owned to access the above fields
-};
-
-struct apr_dir_t {
-    apr_pool_t *pool;
-    char *dirname;
-    ULONG handle;
-    FILEFINDBUF3 entry;
-    int validentry;
-};
-
-apr_status_t apr_file_cleanup(void *);
-apr_status_t apr_os2_time_to_apr_time(apr_time_t *result, FDATE os2date, 
-                                      FTIME os2time);
-
-/* see win32/fileio.h for description of these */
-extern const char c_is_fnchar[256];
-
-#define IS_FNCHAR(c) c_is_fnchar[(unsigned char)c]
-
-apr_status_t filepath_root_test(char *path, apr_pool_t *p);
-apr_status_t filepath_drive_get(char **rootpath, char drive, 
-                                apr_int32_t flags, apr_pool_t *p);
-apr_status_t filepath_root_case(char **rootpath, char *root, apr_pool_t *p);
-
-#endif  /* ! FILE_IO_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_networkio.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_networkio.h
deleted file mode 100644
index 5db2def0..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_networkio.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef NETWORK_IO_H
-#define NETWORK_IO_H
-
-#include "apr_private.h"
-#include "apr_network_io.h"
-#include "apr_general.h"
-#include "apr_arch_os2calls.h"
-#if APR_HAVE_NETDB_H
-#include <netdb.h>
-#endif
-
-typedef struct sock_userdata_t sock_userdata_t;
-struct sock_userdata_t {
-    sock_userdata_t *next;
-    const char *key;
-    void *data;
-};
-
-struct apr_socket_t {
-    apr_pool_t *cntxt;
-    int socketdes;
-    int type;
-    int protocol;
-    apr_sockaddr_t *local_addr;
-    apr_sockaddr_t *remote_addr;
-    apr_interval_time_t timeout;
-    int nonblock;
-    int local_port_unknown;
-    int local_interface_unknown;
-    int remote_addr_unknown;
-    apr_int32_t netmask;
-    apr_int32_t inherit;
-    sock_userdata_t *userdata;
-};
-
-/* Error codes returned from sock_errno() */
-#define SOCBASEERR              10000
-#define SOCEPERM                (SOCBASEERR+1)             /* Not owner */
-#define SOCESRCH                (SOCBASEERR+3)             /* No such process */
-#define SOCEINTR                (SOCBASEERR+4)             /* Interrupted system call */
-#define SOCENXIO                (SOCBASEERR+6)             /* No such device or address */
-#define SOCEBADF                (SOCBASEERR+9)             /* Bad file number */
-#define SOCEACCES               (SOCBASEERR+13)            /* Permission denied */
-#define SOCEFAULT               (SOCBASEERR+14)            /* Bad address */
-#define SOCEINVAL               (SOCBASEERR+22)            /* Invalid argument */
-#define SOCEMFILE               (SOCBASEERR+24)            /* Too many open files */
-#define SOCEPIPE                (SOCBASEERR+32)            /* Broken pipe */
-#define SOCEOS2ERR              (SOCBASEERR+100)            /* OS/2 Error */
-
-const char *apr_inet_ntop(int af, const void *src, char *dst, apr_size_t size);
-int apr_inet_pton(int af, const char *src, void *dst);
-void apr_sockaddr_vars_set(apr_sockaddr_t *, int, apr_port_t);
-
-#endif  /* ! NETWORK_IO_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_os2calls.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_os2calls.h
deleted file mode 100644
index 3c739bfd..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_os2calls.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_errno.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-
-extern int (*apr_os2_socket)(int, int, int);
-extern int (*apr_os2_select)(int *, int, int, int, long);
-extern int (*apr_os2_sock_errno)();
-extern int (*apr_os2_accept)(int, struct sockaddr *, int *);
-extern int (*apr_os2_bind)(int, struct sockaddr *, int);
-extern int (*apr_os2_connect)(int, struct sockaddr *, int);
-extern int (*apr_os2_getpeername)(int, struct sockaddr *, int *);
-extern int (*apr_os2_getsockname)(int, struct sockaddr *, int *);
-extern int (*apr_os2_getsockopt)(int, int, int, char *, int *);
-extern int (*apr_os2_ioctl)(int, int, caddr_t, int);
-extern int (*apr_os2_listen)(int, int);
-extern int (*apr_os2_recv)(int, char *, int, int);
-extern int (*apr_os2_send)(int, const char *, int, int);
-extern int (*apr_os2_setsockopt)(int, int, int, char *, int);
-extern int (*apr_os2_shutdown)(int, int);
-extern int (*apr_os2_soclose)(int);
-extern int (*apr_os2_writev)(int, struct iovec *, int);
-extern int (*apr_os2_sendto)(int, const char *, int, int, const struct sockaddr *, int);
-extern int (*apr_os2_recvfrom)(int, char *, int, int, struct sockaddr *, int *);
-
-#define socket apr_os2_socket
-#define select apr_os2_select
-#define sock_errno apr_os2_sock_errno
-#define accept apr_os2_accept
-#define bind apr_os2_bind
-#define connect apr_os2_connect
-#define getpeername apr_os2_getpeername
-#define getsockname apr_os2_getsockname
-#define getsockopt apr_os2_getsockopt
-#define ioctl apr_os2_ioctl
-#define listen apr_os2_listen
-#define recv apr_os2_recv
-#define send apr_os2_send
-#define setsockopt apr_os2_setsockopt
-#define shutdown apr_os2_shutdown
-#define soclose apr_os2_soclose
-#define writev apr_os2_writev
-#define sendto apr_os2_sendto
-#define recvfrom apr_os2_recvfrom
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_proc_mutex.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_proc_mutex.h
deleted file mode 100644
index 8caf3369..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_proc_mutex.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef PROC_MUTEX_H
-#define PROC_MUTEX_H
-
-#include "apr_proc_mutex.h"
-#include "apr_file_io.h"
-
-struct apr_proc_mutex_t {
-    apr_pool_t *pool;
-    HMTX hMutex;
-    TID owner;
-    int lock_count;
-};
-
-#endif  /* PROC_MUTEX_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_thread_cond.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_thread_cond.h
deleted file mode 100644
index 648b85d1..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_thread_cond.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef THREAD_COND_H
-#define THREAD_COND_H
-
-#include "apr_thread_cond.h"
-#include "apr_file_io.h"
-
-struct apr_thread_cond_t {
-    apr_pool_t *pool;
-};
-
-#endif  /* THREAD_COND_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_thread_mutex.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_thread_mutex.h
deleted file mode 100644
index 3ae2a41d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_thread_mutex.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef THREAD_MUTEX_H
-#define THREAD_MUTEX_H
-
-#include "apr_thread_mutex.h"
-#include "apr_file_io.h"
-
-struct apr_thread_mutex_t {
-    apr_pool_t *pool;
-    HMTX hMutex;
-};
-
-#endif  /* THREAD_MUTEX_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_thread_rwlock.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_thread_rwlock.h
deleted file mode 100644
index 7187d5cb..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_thread_rwlock.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef THREAD_RWLOCK_H
-#define THREAD_RWLOCK_H
-
-#include "apr_thread_rwlock.h"
-#include "apr_file_io.h"
-
-struct apr_thread_rwlock_t {
-    apr_pool_t *pool;
-    int readers;
-    HMTX write_lock;
-    HEV read_done;
-};
-
-#endif  /* THREAD_RWLOCK_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_threadproc.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_threadproc.h
deleted file mode 100644
index c8017adb..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os2/apr_arch_threadproc.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-
-#ifndef THREAD_PROC_H
-#define THREAD_PROC_H
-
-#define APR_THREADATTR_DETACHED 1
-
-#define SHELL_PATH "cmd.exe"
-#define APR_THREAD_STACKSIZE 65536
-
-struct apr_threadattr_t {
-    apr_pool_t *pool;
-    unsigned long attr;
-    apr_size_t stacksize;
-};
-
-struct apr_thread_t {
-    apr_pool_t *pool;
-    struct apr_threadattr_t *attr;
-    unsigned long tid;
-    apr_thread_start_t func;
-    void *data;
-    apr_status_t exitval;
-};
-
-struct apr_threadkey_t {
-    apr_pool_t *pool;
-    unsigned long *key;
-};
-
-struct apr_procattr_t {
-    apr_pool_t *pool;
-    apr_file_t *parent_in;
-    apr_file_t *child_in;
-    apr_file_t *parent_out;
-    apr_file_t *child_out;
-    apr_file_t *parent_err;
-    apr_file_t *child_err;
-    char *currdir;
-    apr_int32_t cmdtype;
-    apr_int32_t detached;
-};
-
-struct apr_thread_once_t {
-    unsigned long sem;
-    char hit;
-};
-
-#endif  /* ! THREAD_PROC_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os390/apr_arch_dso.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os390/apr_arch_dso.h
deleted file mode 100644
index 4263297b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/os390/apr_arch_dso.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef DSO_H
-#define DSO_H
-
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_dso.h"
-#include "apr.h"
-
-#if APR_HAS_DSO
-
-#include <dll.h>
-
-struct apr_dso_handle_t {
-    dllhandle  *handle;     /* Handle to the DSO loaded            */
-    int failing_errno;      /* Don't save the buffer returned by
-                               strerror(); it gets reused          */
-    apr_pool_t *pool;
-};
-
-#endif
-
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_dso.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_dso.h
deleted file mode 100644
index bfd12b43..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_dso.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef DSO_H
-#define DSO_H
-
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_dso.h"
-#include "apr.h"
-
-#if APR_HAS_DSO
-
-#ifdef HAVE_MACH_O_DYLD_H
-#include <mach-o/dyld.h>
-#endif
-
-#ifdef HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#ifdef HAVE_DL_H
-#include <dl.h>
-#endif
-
-#ifndef RTLD_NOW
-#define RTLD_NOW 1
-#endif
-
-#ifndef RTLD_GLOBAL
-#define RTLD_GLOBAL 0
-#endif
-
-#if (defined(__FreeBSD__) ||\
-     defined(__OpenBSD__) ||\
-     defined(__NetBSD__)     ) && !defined(__ELF__)
-#define DLSYM_NEEDS_UNDERSCORE
-#endif
-
-struct apr_dso_handle_t {
-    apr_pool_t    *pool;
-    void          *handle;
-    const char    *errormsg;
-};
-
-#endif
-
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_file_io.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_file_io.h
deleted file mode 100644
index 5606f5bc..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_file_io.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef FILE_IO_H
-#define FILE_IO_H
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_tables.h"
-#include "apr_file_io.h"
-#include "apr_file_info.h"
-#include "apr_errno.h"
-#include "apr_lib.h"
-#include "apr_thread_mutex.h"
-
-/* System headers the file I/O library needs */
-#if APR_HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if APR_HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#if APR_HAVE_STRING_H
-#include <string.h>
-#endif
-#if APR_HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#if APR_HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#if APR_HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if APR_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#if APR_HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif
-#if APR_HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef BEOS
-#include <kernel/OS.h>
-#endif
-
-#if BEOS_BONE
-# ifndef BONE7
-  /* prior to BONE/7 fd_set & select were defined in sys/socket.h */
-#  include <sys/socket.h>
-# else
-  /* Be moved the fd_set stuff and also the FIONBIO definition... */
-#  include <sys/ioctl.h>
-# endif
-#endif
-/* End System headers */
-
-#define APR_FILE_BUFSIZE 4096
-
-struct apr_file_t {
-    apr_pool_t *pool;
-    int filedes;
-    char *fname;
-    apr_int32_t flags;
-    int eof_hit;
-    int is_pipe;
-    apr_interval_time_t timeout;
-    int buffered;
-    enum {BLK_UNKNOWN, BLK_OFF, BLK_ON } blocking;
-    int ungetchar;    /* Last char provided by an unget op. (-1 = no char)*/
-
-    /* Stuff for buffered mode */
-    char *buffer;
-    int bufpos;               /* Read/Write position in buffer */
-    unsigned long dataRead;   /* amount of valid data read into buffer */
-    int direction;            /* buffer being used for 0 = read, 1 = write */
-    unsigned long filePtr;    /* position in file of handle */
-#if APR_HAS_THREADS
-    struct apr_thread_mutex_t *thlock;
-#endif
-};
-
-#if APR_HAS_THREADS
-#define file_lock(f)   do { \
-                           if ((f)->thlock) \
-                               apr_thread_mutex_lock((f)->thlock); \
-                       } while (0)
-#define file_unlock(f) do { \
-                           if ((f)->thlock) \
-                               apr_thread_mutex_unlock((f)->thlock); \
-                       } while (0)
-#else
-#define file_lock(f)   do {} while (0)
-#define file_unlock(f) do {} while (0)
-#endif
-
-struct apr_dir_t {
-    apr_pool_t *pool;
-    char *dirname;
-    DIR *dirstruct;
-    struct dirent *entry;
-};
-
-apr_status_t apr_unix_file_cleanup(void *);
-apr_status_t apr_unix_child_file_cleanup(void *);
-
-mode_t apr_unix_perms2mode(apr_fileperms_t perms);
-apr_fileperms_t apr_unix_mode2perms(mode_t mode);
-
-apr_status_t apr_file_flush_locked(apr_file_t *thefile);
-apr_status_t apr_file_info_get_locked(apr_finfo_t *finfo, apr_int32_t wanted,
-                                      apr_file_t *thefile);
-
-
-#endif  /* ! FILE_IO_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_global_mutex.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_global_mutex.h
deleted file mode 100644
index 3add9ecf..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_global_mutex.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef GLOBAL_MUTEX_H
-#define GLOBAL_MUTEX_H
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_global_mutex.h"
-#include "apr_arch_proc_mutex.h"
-#include "apr_arch_thread_mutex.h"
-
-struct apr_global_mutex_t {
-    apr_pool_t *pool;
-    apr_proc_mutex_t *proc_mutex;
-#if APR_HAS_THREADS
-    apr_thread_mutex_t *thread_mutex;
-#endif /* APR_HAS_THREADS */
-};
-
-#endif  /* GLOBAL_MUTEX_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_inherit.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_inherit.h
deleted file mode 100644
index 5e14f67d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_inherit.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef INHERIT_H
-#define INHERIT_H
-
-#include "apr_inherit.h"
-
-#define APR_INHERIT (1 << 24)    /* Must not conflict with other bits */
-
-#define APR_IMPLEMENT_INHERIT_SET(name, flag, pool, cleanup)        \
-apr_status_t apr_##name##_inherit_set(apr_##name##_t *the##name)    \
-{                                                                   \
-    if (the##name->flag & APR_FILE_NOCLEANUP)                       \
-        return APR_EINVAL;                                          \
-    if (!(the##name->flag & APR_INHERIT)) {                         \
-        the##name->flag |= APR_INHERIT;                             \
-        apr_pool_child_cleanup_set(the##name->pool,                 \
-                                   (void *)the##name,               \
-                                   cleanup, apr_pool_cleanup_null); \
-    }                                                               \
-    return APR_SUCCESS;                                             \
-}                                                                   \
-/* Deprecated */                                                    \
-void apr_##name##_set_inherit(apr_##name##_t *the##name)            \
-{                                                                   \
-    apr_##name##_inherit_set(the##name);                            \
-}
-
-#define APR_IMPLEMENT_INHERIT_UNSET(name, flag, pool, cleanup)      \
-apr_status_t apr_##name##_inherit_unset(apr_##name##_t *the##name)  \
-{                                                                   \
-    if (the##name->flag & APR_FILE_NOCLEANUP)                       \
-        return APR_EINVAL;                                          \
-    if (the##name->flag & APR_INHERIT) {                            \
-        the##name->flag &= ~APR_INHERIT;                            \
-        apr_pool_child_cleanup_set(the##name->pool,                 \
-                                   (void *)the##name,               \
-                                   cleanup, cleanup);               \
-    }                                                               \
-    return APR_SUCCESS;                                             \
-}                                                                   \
-/* Deprecated */                                                    \
-void apr_##name##_unset_inherit(apr_##name##_t *the##name)          \
-{                                                                   \
-    apr_##name##_inherit_unset(the##name);                          \
-}
-
-#endif	/* ! INHERIT_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_internal_time.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_internal_time.h
deleted file mode 100644
index 6e12c674..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_internal_time.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef TIME_INTERNAL_H
-#define TIME_INTERNAL_H
-
-#include "apr.h"
-
-void apr_unix_setup_time(void);
-
-#endif  /* TIME_INTERNAL_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_misc.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_misc.h
deleted file mode 100644
index 82351250..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_misc.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MISC_H
-#define MISC_H
-
-#include "apr.h"
-#include "apr_portable.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_getopt.h"
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-#include "apr_errno.h"
-#include "apr_getopt.h"
-
-#if APR_HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if APR_HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-#if APR_HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
-
-#if APR_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#if APR_HAVE_STRING_H
-#include <string.h>
-#endif
-
-#ifdef BEOS
-#include <kernel/OS.h>
-#endif
-
-struct apr_other_child_rec_t {
-    apr_pool_t *p;
-    struct apr_other_child_rec_t *next;
-    apr_proc_t *proc;
-    void (*maintenance) (int, void *, int);
-    void *data;
-    apr_os_file_t write_fd;
-};
-
-#if defined(WIN32) || defined(NETWARE)
-#define WSAHighByte 2
-#define WSALowByte 0
-#endif
-
-#endif  /* ! MISC_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_networkio.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_networkio.h
deleted file mode 100644
index 9d77e5c1..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_networkio.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef NETWORK_IO_H
-#define NETWORK_IO_H
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_network_io.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-
-/* System headers the network I/O library needs */
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if APR_HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-#if APR_HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#if APR_HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#if APR_HAVE_STRING_H
-#include <string.h>
-#endif
-#if APR_HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
-#if APR_HAVE_NETINET_SCTP_UIO_H
-#include <netinet/sctp_uio.h>
-#endif
-#if APR_HAVE_NETINET_SCTP_H
-#include <netinet/sctp.h>
-#endif
-#if APR_HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#if APR_HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#if APR_HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#if APR_HAVE_SYS_SOCKIO_H
-#include <sys/sockio.h>
-#endif
-#if APR_HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#if APR_HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#if APR_HAVE_SYS_SENDFILE_H
-#include <sys/sendfile.h>
-#endif
-#if APR_HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
-/* End System Headers */
-
-#ifndef HAVE_POLLIN
-#define POLLIN   1
-#define POLLPRI  2
-#define POLLOUT  4
-#define POLLERR  8
-#define POLLHUP  16
-#define POLLNVAL 32
-#endif
-
-typedef struct sock_userdata_t sock_userdata_t;
-struct sock_userdata_t {
-    sock_userdata_t *next;
-    const char *key;
-    void *data;
-};
-
-struct apr_socket_t {
-    apr_pool_t *cntxt;
-    int socketdes;
-    int type;
-    int protocol;
-    apr_sockaddr_t *local_addr;
-    apr_sockaddr_t *remote_addr;
-    apr_interval_time_t timeout; 
-#ifndef HAVE_POLL
-    int connected;
-#endif
-    int local_port_unknown;
-    int local_interface_unknown;
-    int remote_addr_unknown;
-    apr_int32_t netmask;
-    apr_int32_t inherit;
-    sock_userdata_t *userdata;
-};
-
-const char *apr_inet_ntop(int af, const void *src, char *dst, apr_size_t size);
-int apr_inet_pton(int af, const char *src, void *dst);
-void apr_sockaddr_vars_set(apr_sockaddr_t *, int, apr_port_t);
-
-#define apr_is_option_set(mask, option)  ((mask & option) ==option)
-
-#define apr_set_option(mask, option, on) \
-    do {                                 \
-        if (on)                          \
-            *mask |= option;             \
-        else                             \
-            *mask &= ~option;            \
-    } while (0)
-
-#endif  /* ! NETWORK_IO_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_proc_mutex.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_proc_mutex.h
deleted file mode 100644
index 5f4b5acc..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_proc_mutex.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef PROC_MUTEX_H
-#define PROC_MUTEX_H
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_proc_mutex.h"
-#include "apr_pools.h"
-#include "apr_portable.h"
-#include "apr_file_io.h"
-#include "apr_arch_file_io.h"
-
-/* System headers required by Locks library */
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if APR_HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if APR_HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#ifdef HAVE_SYS_IPC_H
-#include <sys/ipc.h>
-#endif
-#ifdef HAVE_SYS_SEM_H
-#include <sys/sem.h>
-#endif
-#ifdef HAVE_SYS_FILE_H
-#include <sys/file.h>
-#endif
-#if APR_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#if APR_HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-#if APR_HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
-#if APR_HAVE_SEMAPHORE_H
-#include <semaphore.h>
-#endif
-/* End System Headers */
-
-struct apr_proc_mutex_unix_lock_methods_t {
-    unsigned int flags;
-    apr_status_t (*create)(apr_proc_mutex_t *, const char *);
-    apr_status_t (*acquire)(apr_proc_mutex_t *);
-    apr_status_t (*tryacquire)(apr_proc_mutex_t *);
-    apr_status_t (*release)(apr_proc_mutex_t *);
-    apr_status_t (*cleanup)(void *);
-    apr_status_t (*child_init)(apr_proc_mutex_t **, apr_pool_t *, const char *);
-    const char *name;
-};
-typedef struct apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_lock_methods_t;
-
-/* bit values for flags field in apr_unix_lock_methods_t */
-#define APR_PROCESS_LOCK_MECH_IS_GLOBAL          1
-
-#if APR_HAS_POSIXSEM_SERIALIZE
-extern const apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_posix_methods;
-#endif
-#if APR_HAS_SYSVSEM_SERIALIZE
-extern const apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_sysv_methods;
-#endif
-#if APR_HAS_FCNTL_SERIALIZE
-extern const apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_fcntl_methods;
-#endif
-#if APR_HAS_FLOCK_SERIALIZE
-extern const apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_flock_methods;
-#endif
-#if APR_HAS_PROC_PTHREAD_SERIALIZE
-extern const apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_proc_pthread_methods;
-#endif
-#if APR_HAS_RWLOCK_SERIALIZE
-extern const apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_rwlock_methods;
-#endif
-
-
-#if !APR_HAVE_UNION_SEMUN && defined(APR_HAS_SYSVSEM_SERIALIZE)
-union semun {
-    int val;
-    struct semid_ds *buf;
-    unsigned short *array;
-};
-#endif
-
-struct apr_proc_mutex_t {
-    apr_pool_t *pool;
-    const apr_proc_mutex_unix_lock_methods_t *meth;
-    const apr_proc_mutex_unix_lock_methods_t *inter_meth;
-    int curr_locked;
-    char *fname;
-#if APR_HAS_SYSVSEM_SERIALIZE || APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE
-    apr_file_t *interproc;
-#endif
-#if APR_HAS_PROC_PTHREAD_SERIALIZE
-    pthread_mutex_t *pthread_interproc;
-#endif
-};
-
-void apr_proc_mutex_unix_setup_lock(void);
-
-#endif  /* PROC_MUTEX_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_shm.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_shm.h
deleted file mode 100644
index dbd9b9bc..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_shm.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef SHM_H
-#define SHM_H
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_shm.h"
-#include "apr_pools.h"
-#include "apr_file_io.h"
-#include "apr_network_io.h"
-#include "apr_portable.h"
-
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-#ifdef HAVE_SYS_IPC_H
-#include <sys/ipc.h>
-#endif
-#ifdef HAVE_SYS_MUTEX_H
-#include <sys/mutex.h>
-#endif
-#ifdef HAVE_SYS_SHM_H
-#include <sys/shm.h>
-#endif
-#if !defined(SHM_R)
-#define SHM_R 0400
-#endif
-#if !defined(SHM_W)
-#define SHM_W 0200
-#endif
-#ifdef HAVE_SYS_FILE_H
-#include <sys/file.h>
-#endif
-
-/* Not all systems seem to have MAP_FAILED defined, but it should always
- * just be (void *)-1. */
-#ifndef MAP_FAILED
-#define MAP_FAILED ((void *)-1)
-#endif
-
-struct apr_shm_t {
-    apr_pool_t *pool;
-    void *base;          /* base real address */
-    void *usable;        /* base usable address */
-    apr_size_t reqsize;  /* requested segment size */
-    apr_size_t realsize; /* actual segment size */
-    const char *filename;      /* NULL if anonymous */
-#if APR_USE_SHMEM_SHMGET || APR_USE_SHMEM_SHMGET_ANON
-    int shmid;          /* shmem ID returned from shmget() */
-#endif
-};
-
-#endif /* SHM_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_thread_cond.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_thread_cond.h
deleted file mode 100644
index fd9ed339..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_thread_cond.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef THREAD_COND_H
-#define THREAD_COND_H
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_thread_mutex.h"
-#include "apr_thread_cond.h"
-#include "apr_pools.h"
-
-#if APR_HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
-
-/* XXX: Should we have a better autoconf search, something like
- * APR_HAS_PTHREAD_COND? -aaron */
-#if APR_HAS_THREADS
-struct apr_thread_cond_t {
-    apr_pool_t *pool;
-    pthread_cond_t *cond;
-};
-#endif
-
-#endif  /* THREAD_COND_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_thread_mutex.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_thread_mutex.h
deleted file mode 100644
index 40cdef3c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_thread_mutex.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef THREAD_MUTEX_H
-#define THREAD_MUTEX_H
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_thread_mutex.h"
-#include "apr_portable.h"
-#include "apr_atomic.h"
-
-#if APR_HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
-
-#if APR_HAS_THREADS
-struct apr_thread_mutex_t {
-    apr_pool_t *pool;
-    pthread_mutex_t mutex;
-};
-#endif
-
-#endif  /* THREAD_MUTEX_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_thread_rwlock.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_thread_rwlock.h
deleted file mode 100644
index 647ce264..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_thread_rwlock.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef THREAD_RWLOCK_H
-#define THREAD_RWLOCK_H
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_thread_rwlock.h"
-#include "apr_pools.h"
-
-#if APR_HAVE_PTHREAD_H
-/* this gives us pthread_rwlock_t */
-#include <pthread.h>
-#endif
-
-#if APR_HAS_THREADS
-#ifdef HAVE_PTHREAD_RWLOCKS
-
-struct apr_thread_rwlock_t {
-    apr_pool_t *pool;
-    pthread_rwlock_t *rwlock;
-};
-
-#else
-
-struct apr_thread_rwlock_t {
-    apr_pool_t *pool;
-};
-#endif
-
-#endif
-
-#endif  /* THREAD_RWLOCK_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_threadproc.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_threadproc.h
deleted file mode 100644
index 2955f502..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_arch_threadproc.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-#include "apr_arch_file_io.h"
-
-/* System headers required for thread/process library */
-#if APR_HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
-#if APR_HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-#if APR_HAVE_STRING_H
-#include <string.h>
-#endif
-#if APR_HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-#if APR_HAVE_STRING_H
-#include <string.h>
-#endif
-/* End System Headers */
-
-
-#ifndef THREAD_PROC_H
-#define THREAD_PROC_H
-
-#define SHELL_PATH "/bin/sh"
-
-#if APR_HAS_THREADS
-
-struct apr_thread_t {
-    apr_pool_t *pool;
-    pthread_t *td;
-    void *data;
-    apr_thread_start_t func;
-    apr_status_t exitval;
-};
-
-struct apr_threadattr_t {
-    apr_pool_t *pool;
-    pthread_attr_t *attr;
-};
-
-struct apr_threadkey_t {
-    apr_pool_t *pool;
-    pthread_key_t key;
-};
-
-struct apr_thread_once_t {
-    pthread_once_t once;
-};
-
-#endif
-
-struct apr_procattr_t {
-    apr_pool_t *pool;
-    apr_file_t *parent_in;
-    apr_file_t *child_in;
-    apr_file_t *parent_out;
-    apr_file_t *child_out;
-    apr_file_t *parent_err;
-    apr_file_t *child_err;
-    char *currdir;
-    apr_int32_t cmdtype;
-    apr_int32_t detached;
-#ifdef RLIMIT_CPU
-    struct rlimit *limit_cpu;
-#endif
-#if defined (RLIMIT_DATA) || defined (RLIMIT_VMEM) || defined(RLIMIT_AS)
-    struct rlimit *limit_mem;
-#endif
-#ifdef RLIMIT_NPROC
-    struct rlimit *limit_nproc;
-#endif
-#ifdef RLIMIT_NOFILE
-    struct rlimit *limit_nofile;
-#endif
-    apr_child_errfn_t *errfn;
-    apr_int32_t errchk;
-};
-
-#endif  /* ! THREAD_PROC_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_private.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_private.h
deleted file mode 100644
index c40a923b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_private.h
+++ /dev/null
@@ -1,743 +0,0 @@
-/* include/arch/unix/apr_private.h.  Generated from apr_private.h.in by configure.  */
-/* include/arch/unix/apr_private.h.in.  Generated from configure.in by autoheader.  */
-#ifndef APR_PRIVATE_H
-#define APR_PRIVATE_H
-
-
-/* Various #defines we need to know about */
-#define USE_THREADS 1
-/* #undef EGD_DEFAULT_SOCKET */
-/* #undef HAVE_isascii */
-#define DIRENT_INODE d_fileno
-#define DIRENT_TYPE d_type
-
-/* Cross process serialization techniques */
-/* #undef USE_FLOCK_SERIALIZE */
-#define USE_SYSVSEM_SERIALIZE 1
-/* #undef USE_FCNTL_SERIALIZE */
-/* #undef USE_PROC_PTHREAD_SERIALIZE */
-/* #undef USE_PTHREAD_SERIALIZE */
-
-/* #undef POSIXSEM_IS_GLOBAL */
-/* #undef SYSVSEM_IS_GLOBAL */
-/* #undef FCNTL_IS_GLOBAL */
-/* #undef FLOCK_IS_GLOBAL */
-
-/* #undef HAVE_INT64_C */
-
-
-/* Define if crypt_r has uses CRYPTD */
-/* #undef CRYPT_R_CRYPTD */
-
-/* Define if crypt_r uses struct crypt_data */
-#define CRYPT_R_STRUCT_CRYPT_DATA 1
-
-/* Define to path of random device */
-#define DEV_RANDOM "/dev/random"
-
-/* Define if DSO support uses dlfcn.h */
-#define DSO_USE_DLFCN 1
-
-/* Define if DSO support uses dyld.h */
-/* #undef DSO_USE_DYLD */
-
-/* Define if DSO support uses shl_load */
-/* #undef DSO_USE_SHL */
-
-/* Define to list of paths to EGD sockets */
-/* #undef EGD_DEFAULT_SOCKET */
-
-/* Define if fcntl locks affect threads within the process */
-/* #undef FCNTL_IS_GLOBAL */
-
-/* Define if flock locks affect threads within the process */
-/* #undef FLOCK_IS_GLOBAL */
-
-/* Define if gethostbyaddr is thread safe */
-/* #undef GETHOSTBYADDR_IS_THREAD_SAFE */
-
-/* Define if gethostbyname is thread safe */
-/* #undef GETHOSTBYNAME_IS_THREAD_SAFE */
-
-/* Define if gethostbyname_r has the glibc style */
-#define GETHOSTBYNAME_R_GLIBC2 1
-
-/* Define if gethostbyname_r has the hostent_data for the third argument */
-/* #undef GETHOSTBYNAME_R_HOSTENT_DATA */
-
-/* Define to 1 if you have the `alloca' function. */
-/* #undef HAVE_ALLOCA */
-
-/* Define to 1 if you have the <alloca.h> header file. */
-#define HAVE_ALLOCA_H 1
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#define HAVE_ARPA_INET_H 1
-
-/* Define if BONE_VERSION is defined in sys/socket.h */
-/* #undef HAVE_BONE_VERSION */
-
-/* Define to 1 if you have the <ByteOrder.h> header file. */
-/* #undef HAVE_BYTEORDER_H */
-
-/* Define to 1 if you have the `calloc' function. */
-#define HAVE_CALLOC 1
-
-/* Define to 1 if you have the <conio.h> header file. */
-/* #undef HAVE_CONIO_H */
-
-/* Define to 1 if you have the `create_area' function. */
-/* #undef HAVE_CREATE_AREA */
-
-/* Define to 1 if you have the <crypt.h> header file. */
-#define HAVE_CRYPT_H 1
-
-/* Define to 1 if you have the `crypt_r' function. */
-#define HAVE_CRYPT_R 1
-
-/* Define to 1 if you have the <ctype.h> header file. */
-#define HAVE_CTYPE_H 1
-
-/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
-   don't. */
-#define HAVE_DECL_SYS_SIGLIST 1
-
-/* Define to 1 if you have the <dirent.h> header file. */
-#define HAVE_DIRENT_H 1
-
-/* Define to 1 if you have the <dir.h> header file. */
-/* #undef HAVE_DIR_H */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the `dlopen' function. */
-/* #undef HAVE_DLOPEN */
-
-/* Define to 1 if you have the `dlsym' function. */
-#define HAVE_DLSYM 1
-
-/* Define to 1 if you have the <dl.h> header file. */
-/* #undef HAVE_DL_H */
-
-/* Define if EGD is supported */
-/* #undef HAVE_EGD */
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `flock' function. */
-#define HAVE_FLOCK 1
-
-/* Define to 1 if you have the `fork' function. */
-#define HAVE_FORK 1
-
-/* Define if fstat64 can be used */
-#define HAVE_FSTAT64 1
-
-/* Define if F_SETLK is defined in fcntl.h */
-#define HAVE_F_SETLK 1
-
-/* Define to 1 if you have the `gai_strerror' function. */
-#define HAVE_GAI_STRERROR 1
-
-/* Define if getaddrinfo exists and works well enough for APR */
-#define HAVE_GETADDRINFO 1
-
-/* Define to 1 if you have the `getenv' function. */
-#define HAVE_GETENV 1
-
-/* Define to 1 if you have the `getgrgid_r' function. */
-#define HAVE_GETGRGID_R 1
-
-/* Define to 1 if you have the `getgrnam_r' function. */
-#define HAVE_GETGRNAM_R 1
-
-/* Define to 1 if you have the `gethostbyaddr_r' function. */
-#define HAVE_GETHOSTBYADDR_R 1
-
-/* Define to 1 if you have the `gethostbyname_r' function. */
-#define HAVE_GETHOSTBYNAME_R 1
-
-/* Define if getnameinfo exists */
-#define HAVE_GETNAMEINFO 1
-
-/* Define to 1 if you have the `getpass' function. */
-#define HAVE_GETPASS 1
-
-/* Define to 1 if you have the `getpassphrase' function. */
-/* #undef HAVE_GETPASSPHRASE */
-
-/* Define to 1 if you have the `getpwnam_r' function. */
-#define HAVE_GETPWNAM_R 1
-
-/* Define to 1 if you have the `getpwuid_r' function. */
-#define HAVE_GETPWUID_R 1
-
-/* Define to 1 if you have the `getrlimit' function. */
-#define HAVE_GETRLIMIT 1
-
-/* Define to 1 if you have the `gmtime_r' function. */
-#define HAVE_GMTIME_R 1
-
-/* Define if struct tm has a tm_gmtoff field */
-#define HAVE_GMTOFF 1
-
-/* Define to 1 if you have the <grp.h> header file. */
-#define HAVE_GRP_H 1
-
-/* Define to 1 if you have the `hstrerror' function. */
-#define HAVE_HSTRERROR 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <io.h> header file. */
-/* #undef HAVE_IO_H */
-
-/* Define to 1 if you have the `isinf' function. */
-#define HAVE_ISINF 1
-
-/* Define to 1 if you have the `isnan' function. */
-#define HAVE_ISNAN 1
-
-/* Define to 1 if you have the <kernel/OS.h> header file. */
-/* #undef HAVE_KERNEL_OS_H */
-
-/* Define to 1 if you have the <langinfo.h> header file. */
-#define HAVE_LANGINFO_H 1
-
-/* Define to 1 if you have the `bsd' library (-lbsd). */
-/* #undef HAVE_LIBBSD */
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-#define HAVE_LIBNSL 1
-
-/* Define to 1 if you have the `resolv' library (-lresolv). */
-/* #undef HAVE_LIBRESOLV */
-
-/* Define to 1 if you have the `sendfile' library (-lsendfile). */
-/* #undef HAVE_LIBSENDFILE */
-
-/* Define to 1 if you have the `socket' library (-lsocket). */
-/* #undef HAVE_LIBSOCKET */
-
-/* Define to 1 if you have the `truerand' library (-ltruerand). */
-/* #undef HAVE_LIBTRUERAND */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the `localtime_r' function. */
-#define HAVE_LOCALTIME_R 1
-
-/* Define if LOCK_EX is defined in sys/file.h */
-#define HAVE_LOCK_EX 1
-
-/* Define to 1 if you have the <mach-o/dyld.h> header file. */
-/* #undef HAVE_MACH_O_DYLD_H */
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H 1
-
-/* Define if MAP_ANON is defined in sys/mman.h */
-#define HAVE_MAP_ANON 1
-
-/* Define to 1 if you have the `memchr' function. */
-#define HAVE_MEMCHR 1
-
-/* Define to 1 if you have the `memmove' function. */
-#define HAVE_MEMMOVE 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mkstemp' function. */
-#define HAVE_MKSTEMP 1
-
-/* Define to 1 if you have the `mmap' function. */
-#define HAVE_MMAP 1
-
-/* Define to 1 if you have the `munmap' function. */
-#define HAVE_MUNMAP 1
-
-/* Define to 1 if you have the <netdb.h> header file. */
-#define HAVE_NETDB_H 1
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H 1
-
-/* Define to 1 if you have the <netinet/sctp.h> header file. */
-/* #undef HAVE_NETINET_SCTP_H */
-
-/* Define to 1 if you have the <netinet/sctp_uio.h> header file. */
-/* #undef HAVE_NETINET_SCTP_UIO_H */
-
-/* Defined if netinet/tcp.h is present */
-#define HAVE_NETINET_TCP_H 1
-
-/* Define to 1 if you have the <net/errno.h> header file. */
-/* #undef HAVE_NET_ERRNO_H */
-
-/* Define to 1 if you have the `nl_langinfo' function. */
-#define HAVE_NL_LANGINFO 1
-
-/* Define to 1 if you have the `NSLinkModule' function. */
-/* #undef HAVE_NSLINKMODULE */
-
-/* Define to 1 if you have the <os2.h> header file. */
-/* #undef HAVE_OS2_H */
-
-/* Define to 1 if you have the <osreldate.h> header file. */
-/* #undef HAVE_OSRELDATE_H */
-
-/* Define to 1 if you have the `poll' function. */
-#define HAVE_POLL 1
-
-/* Define if POLLIN is defined */
-#define HAVE_POLLIN 1
-
-/* Define to 1 if you have the <poll.h> header file. */
-#define HAVE_POLL_H 1
-
-/* Define to 1 if you have the <process.h> header file. */
-/* #undef HAVE_PROCESS_H */
-
-/* Define to 1 if you have the <pthread.h> header file. */
-#define HAVE_PTHREAD_H 1
-
-/* Define to 1 if you have the `pthread_key_delete' function. */
-#define HAVE_PTHREAD_KEY_DELETE 1
-
-/* Define to 1 if you have the `pthread_mutexattr_setpshared' function. */
-#define HAVE_PTHREAD_MUTEXATTR_SETPSHARED 1
-
-/* Define if recursive pthread mutexes are available */
-#define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-
-/* Define if cross-process robust mutexes are available */
-#define HAVE_PTHREAD_MUTEX_ROBUST 1
-
-/* Define if PTHREAD_PROCESS_SHARED is defined in pthread.h */
-#define HAVE_PTHREAD_PROCESS_SHARED 1
-
-/* Define if pthread rwlocks are available */
-#define HAVE_PTHREAD_RWLOCKS 1
-
-/* Define to 1 if you have the `pthread_rwlock_init' function. */
-#define HAVE_PTHREAD_RWLOCK_INIT 1
-
-/* Define to 1 if you have the `putenv' function. */
-#define HAVE_PUTENV 1
-
-/* Define to 1 if you have the <pwd.h> header file. */
-#define HAVE_PWD_H 1
-
-/* Define to 1 if you have the <semaphore.h> header file. */
-#define HAVE_SEMAPHORE_H 1
-
-/* Define to 1 if you have the `semctl' function. */
-#define HAVE_SEMCTL 1
-
-/* Define to 1 if you have the `semget' function. */
-#define HAVE_SEMGET 1
-
-/* Define to 1 if you have the `sem_close' function. */
-#define HAVE_SEM_CLOSE 1
-
-/* Define to 1 if you have the `sem_post' function. */
-#define HAVE_SEM_POST 1
-
-/* Define if SEM_UNDO is defined in sys/sem.h */
-#define HAVE_SEM_UNDO 1
-
-/* Define to 1 if you have the `sem_unlink' function. */
-#define HAVE_SEM_UNLINK 1
-
-/* Define to 1 if you have the `sem_wait' function. */
-#define HAVE_SEM_WAIT 1
-
-/* Define to 1 if you have the `sendfile' function. */
-#define HAVE_SENDFILE 1
-
-/* Define to 1 if you have the `sendfilev' function. */
-/* #undef HAVE_SENDFILEV */
-
-/* Define to 1 if you have the `send_file' function. */
-/* #undef HAVE_SEND_FILE */
-
-/* Define to 1 if you have the `setenv' function. */
-#define HAVE_SETENV 1
-
-/* Define to 1 if you have the `setrlimit' function. */
-#define HAVE_SETRLIMIT 1
-
-/* Define to 1 if you have the `setsid' function. */
-#define HAVE_SETSID 1
-
-/* Define to 1 if you have the `set_h_errno' function. */
-/* #undef HAVE_SET_H_ERRNO */
-
-/* Define to 1 if you have the `shmat' function. */
-#define HAVE_SHMAT 1
-
-/* Define to 1 if you have the `shmctl' function. */
-#define HAVE_SHMCTL 1
-
-/* Define to 1 if you have the `shmdt' function. */
-#define HAVE_SHMDT 1
-
-/* Define to 1 if you have the `shmget' function. */
-#define HAVE_SHMGET 1
-
-/* Define to 1 if you have the `shm_open' function. */
-#define HAVE_SHM_OPEN 1
-
-/* Define to 1 if you have the `shm_unlink' function. */
-#define HAVE_SHM_UNLINK 1
-
-/* Define to 1 if you have the `sigaction' function. */
-#define HAVE_SIGACTION 1
-
-/* Define to 1 if you have the <signal.h> header file. */
-#define HAVE_SIGNAL_H 1
-
-/* Define to 1 if you have the `sigsuspend' function. */
-#define HAVE_SIGSUSPEND 1
-
-/* Define to 1 if you have the `sigwait' function. */
-#define HAVE_SIGWAIT 1
-
-/* Whether you have socklen_t */
-#define HAVE_SOCKLEN_T 1
-
-/* Define if SO_ACCEPTFILTER is defined in sys/socket.h */
-/* #undef HAVE_SO_ACCEPTFILTER */
-
-/* Define to 1 if you have the <stdarg.h> header file. */
-#define HAVE_STDARG_H 1
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#define HAVE_STDIO_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#define HAVE_STRCASECMP 1
-
-/* Define to 1 if you have the `strdup' function. */
-#define HAVE_STRDUP 1
-
-/* Define to 1 if you have the `strerror_r' function. */
-#define HAVE_STRERROR_R 1
-
-/* Define to 1 if you have the `stricmp' function. */
-/* #undef HAVE_STRICMP */
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strncasecmp' function. */
-#define HAVE_STRNCASECMP 1
-
-/* Define to 1 if you have the `strnicmp' function. */
-/* #undef HAVE_STRNICMP */
-
-/* Define to 1 if you have the `strstr' function. */
-#define HAVE_STRSTR 1
-
-/* Define to 1 if you have the <sysapi.h> header file. */
-/* #undef HAVE_SYSAPI_H */
-
-/* Define to 1 if you have the <sysgtime.h> header file. */
-/* #undef HAVE_SYSGTIME_H */
-
-/* Define to 1 if you have the <sys/file.h> header file. */
-#define HAVE_SYS_FILE_H 1
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#define HAVE_SYS_IOCTL_H 1
-
-/* Define to 1 if you have the <sys/ipc.h> header file. */
-#define HAVE_SYS_IPC_H 1
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-#define HAVE_SYS_MMAN_H 1
-
-/* Define to 1 if you have the <sys/mutex.h> header file. */
-/* #undef HAVE_SYS_MUTEX_H */
-
-/* Define to 1 if you have the <sys/poll.h> header file. */
-#define HAVE_SYS_POLL_H 1
-
-/* Define to 1 if you have the <sys/resource.h> header file. */
-#define HAVE_SYS_RESOURCE_H 1
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#define HAVE_SYS_SELECT_H 1
-
-/* Define to 1 if you have the <sys/sem.h> header file. */
-#define HAVE_SYS_SEM_H 1
-
-/* Define to 1 if you have the <sys/sendfile.h> header file. */
-#define HAVE_SYS_SENDFILE_H 1
-
-/* Define to 1 if you have the <sys/shm.h> header file. */
-#define HAVE_SYS_SHM_H 1
-
-/* Define to 1 if you have the <sys/signal.h> header file. */
-#define HAVE_SYS_SIGNAL_H 1
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#define HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/sockio.h> header file. */
-/* #undef HAVE_SYS_SOCKIO_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/sysctl.h> header file. */
-#define HAVE_SYS_SYSCTL_H 1
-
-/* Define to 1 if you have the <sys/syslimits.h> header file. */
-/* #undef HAVE_SYS_SYSLIMITS_H */
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#define HAVE_SYS_UIO_H 1
-
-/* Define to 1 if you have the <sys/un.h> header file. */
-#define HAVE_SYS_UN_H 1
-
-/* Define to 1 if you have the <sys/wait.h> header file. */
-#define HAVE_SYS_WAIT_H 1
-
-/* Define if TCP_CORK is defined in netinet/tcp.h */
-#define HAVE_TCP_CORK 1
-
-/* Define if TCP_NOPUSH is defined in netinet/tcp.h */
-/* #undef HAVE_TCP_NOPUSH */
-
-/* Define to 1 if you have the <termios.h> header file. */
-#define HAVE_TERMIOS_H 1
-
-/* Define to 1 if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
-/* Define to 1 if you have the <tpfeq.h> header file. */
-/* #undef HAVE_TPFEQ_H */
-
-/* Define to 1 if you have the <tpfio.h> header file. */
-/* #undef HAVE_TPFIO_H */
-
-/* Define if truerand is supported */
-/* #undef HAVE_TRUERAND */
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the <unix.h> header file. */
-/* #undef HAVE_UNIX_H */
-
-/* Define to 1 if you have the `unsetenv' function. */
-#define HAVE_UNSETENV 1
-
-/* Define to 1 if you have the `utime' function. */
-#define HAVE_UTIME 1
-
-/* Define to 1 if you have the `utimes' function. */
-#define HAVE_UTIMES 1
-
-/* Define if C compiler supports VLA */
-#define HAVE_VLA 1
-
-/* Define to 1 if you have the `waitpid' function. */
-#define HAVE_WAITPID 1
-
-/* Define to 1 if you have the `writev' function. */
-#define HAVE_WRITEV 1
-
-/* Define if EAI_ error codes from getaddrinfo are negative */
-#define NEGATIVE_EAI 1
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION ""
-
-/* Define if POSIX semaphores affect threads within the process */
-/* #undef POSIXSEM_IS_GLOBAL */
-
-/* Define if pthread_attr_getdetachstate() has one arg */
-/* #undef PTHREAD_ATTR_GETDETACHSTATE_TAKES_ONE_ARG */
-
-/* Define if pthread_getspecific() has two args */
-/* #undef PTHREAD_GETSPECIFIC_TAKES_TWO_ARGS */
-
-/* Define if readdir is thread safe */
-/* #undef READDIR_IS_THREAD_SAFE */
-
-/* Define if resolv.h's res_state has the fields retrans/rety */
-#define RESOLV_RETRANSRETRY 1
-
-/* Define to 1 if the `setpgrp' function takes no argument. */
-#define SETPGRP_VOID 1
-
-/* */
-/* #undef SIGWAIT_TAKES_ONE_ARG */
-
-/* The size of `char', as computed by sizeof. */
-#define SIZEOF_CHAR 1
-
-/* The size of `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 8
-
-/* The size of `long double', as computed by sizeof. */
-#define SIZEOF_LONG_DOUBLE 16
-
-/* The size of `long long', as computed by sizeof. */
-#define SIZEOF_LONG_LONG 8
-
-/* The size of off_t */
-#define SIZEOF_OFF_T 8
-
-/* The size of pid_t */
-#define SIZEOF_PID_T 4
-
-/* The size of `short', as computed by sizeof. */
-#define SIZEOF_SHORT 2
-
-/* The size of size_t */
-#define SIZEOF_SIZE_T 8
-
-/* The size of ssize_t */
-#define SIZEOF_SSIZE_T 8
-
-/* The size of `void*', as computed by sizeof. */
-#define SIZEOF_VOIDP 8
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define if strerror returns int */
-/* #undef STRERROR_R_RC_INT */
-
-/* Define if SysV semaphores affect threads within the process */
-/* #undef SYSVSEM_IS_GLOBAL */
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-
-
-/* Define if APR supports threads */
-#define USE_THREADS 1
-
-/* Define to 1 if on MINIX. */
-/* #undef _MINIX */
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-/* #undef _POSIX_SOURCE */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef gid_t */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `long int' if <sys/types.h> does not define. */
-/* #undef off_t */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef pid_t */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef ssize_t */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef uid_t */
-
-/* Make sure we have ssize_t defined to be something */
-/* #undef ssize_t */
-
-/* switch this on if we have a BeOS version below BONE */
-#if BEOS && !HAVE_BONE_VERSION
-#define BEOS_R5 1
-#else
-#define BEOS_BONE 1
-#endif
-
-#ifdef SIGWAIT_TAKES_ONE_ARG
-#define apr_sigwait(a,b) ((*(b)=sigwait((a)))<0?-1:0)
-#else
-#define apr_sigwait(a,b) sigwait((a),(b))
-#endif
-
-/*
- * Include common private declarations.
- */
-#include "../apr_private_common.h"
-
-#endif /* APR_PRIVATE_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_private.h.in b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_private.h.in
deleted file mode 100644
index 7e6b4d9d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_private.h.in
+++ /dev/null
@@ -1,742 +0,0 @@
-/* include/arch/unix/apr_private.h.in.  Generated from configure.in by autoheader.  */
-#ifndef APR_PRIVATE_H
-#define APR_PRIVATE_H
-
-
-/* Various #defines we need to know about */
-#undef USE_THREADS
-#undef EGD_DEFAULT_SOCKET
-#undef HAVE_isascii
-#undef DIRENT_INODE
-#undef DIRENT_TYPE
-
-/* Cross process serialization techniques */
-#undef USE_FLOCK_SERIALIZE
-#undef USE_SYSVSEM_SERIALIZE
-#undef USE_FCNTL_SERIALIZE
-#undef USE_PROC_PTHREAD_SERIALIZE
-#undef USE_PTHREAD_SERIALIZE
-
-#undef POSIXSEM_IS_GLOBAL
-#undef SYSVSEM_IS_GLOBAL
-#undef FCNTL_IS_GLOBAL
-#undef FLOCK_IS_GLOBAL
-
-#undef HAVE_INT64_C
-
-
-/* Define if crypt_r has uses CRYPTD */
-#undef CRYPT_R_CRYPTD
-
-/* Define if crypt_r uses struct crypt_data */
-#undef CRYPT_R_STRUCT_CRYPT_DATA
-
-/* Define to path of random device */
-#undef DEV_RANDOM
-
-/* Define if DSO support uses dlfcn.h */
-#undef DSO_USE_DLFCN
-
-/* Define if DSO support uses dyld.h */
-#undef DSO_USE_DYLD
-
-/* Define if DSO support uses shl_load */
-#undef DSO_USE_SHL
-
-/* Define to list of paths to EGD sockets */
-#undef EGD_DEFAULT_SOCKET
-
-/* Define if fcntl locks affect threads within the process */
-#undef FCNTL_IS_GLOBAL
-
-/* Define if flock locks affect threads within the process */
-#undef FLOCK_IS_GLOBAL
-
-/* Define if gethostbyaddr is thread safe */
-#undef GETHOSTBYADDR_IS_THREAD_SAFE
-
-/* Define if gethostbyname is thread safe */
-#undef GETHOSTBYNAME_IS_THREAD_SAFE
-
-/* Define if gethostbyname_r has the glibc style */
-#undef GETHOSTBYNAME_R_GLIBC2
-
-/* Define if gethostbyname_r has the hostent_data for the third argument */
-#undef GETHOSTBYNAME_R_HOSTENT_DATA
-
-/* Define to 1 if you have the `alloca' function. */
-#undef HAVE_ALLOCA
-
-/* Define to 1 if you have the <alloca.h> header file. */
-#undef HAVE_ALLOCA_H
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#undef HAVE_ARPA_INET_H
-
-/* Define if BONE_VERSION is defined in sys/socket.h */
-#undef HAVE_BONE_VERSION
-
-/* Define to 1 if you have the <ByteOrder.h> header file. */
-#undef HAVE_BYTEORDER_H
-
-/* Define to 1 if you have the `calloc' function. */
-#undef HAVE_CALLOC
-
-/* Define to 1 if you have the <conio.h> header file. */
-#undef HAVE_CONIO_H
-
-/* Define to 1 if you have the `create_area' function. */
-#undef HAVE_CREATE_AREA
-
-/* Define to 1 if you have the <crypt.h> header file. */
-#undef HAVE_CRYPT_H
-
-/* Define to 1 if you have the `crypt_r' function. */
-#undef HAVE_CRYPT_R
-
-/* Define to 1 if you have the <ctype.h> header file. */
-#undef HAVE_CTYPE_H
-
-/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
-   don't. */
-#undef HAVE_DECL_SYS_SIGLIST
-
-/* Define to 1 if you have the <dirent.h> header file. */
-#undef HAVE_DIRENT_H
-
-/* Define to 1 if you have the <dir.h> header file. */
-#undef HAVE_DIR_H
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the `dlopen' function. */
-#undef HAVE_DLOPEN
-
-/* Define to 1 if you have the `dlsym' function. */
-#undef HAVE_DLSYM
-
-/* Define to 1 if you have the <dl.h> header file. */
-#undef HAVE_DL_H
-
-/* Define if EGD is supported */
-#undef HAVE_EGD
-
-/* Define to 1 if you have the <errno.h> header file. */
-#undef HAVE_ERRNO_H
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-
-/* Define to 1 if you have the `flock' function. */
-#undef HAVE_FLOCK
-
-/* Define to 1 if you have the `fork' function. */
-#undef HAVE_FORK
-
-/* Define if fstat64 can be used */
-#undef HAVE_FSTAT64
-
-/* Define if F_SETLK is defined in fcntl.h */
-#undef HAVE_F_SETLK
-
-/* Define to 1 if you have the `gai_strerror' function. */
-#undef HAVE_GAI_STRERROR
-
-/* Define if getaddrinfo exists and works well enough for APR */
-#undef HAVE_GETADDRINFO
-
-/* Define to 1 if you have the `getenv' function. */
-#undef HAVE_GETENV
-
-/* Define to 1 if you have the `getgrgid_r' function. */
-#undef HAVE_GETGRGID_R
-
-/* Define to 1 if you have the `getgrnam_r' function. */
-#undef HAVE_GETGRNAM_R
-
-/* Define to 1 if you have the `gethostbyaddr_r' function. */
-#undef HAVE_GETHOSTBYADDR_R
-
-/* Define to 1 if you have the `gethostbyname_r' function. */
-#undef HAVE_GETHOSTBYNAME_R
-
-/* Define if getnameinfo exists */
-#undef HAVE_GETNAMEINFO
-
-/* Define to 1 if you have the `getpass' function. */
-#undef HAVE_GETPASS
-
-/* Define to 1 if you have the `getpassphrase' function. */
-#undef HAVE_GETPASSPHRASE
-
-/* Define to 1 if you have the `getpwnam_r' function. */
-#undef HAVE_GETPWNAM_R
-
-/* Define to 1 if you have the `getpwuid_r' function. */
-#undef HAVE_GETPWUID_R
-
-/* Define to 1 if you have the `getrlimit' function. */
-#undef HAVE_GETRLIMIT
-
-/* Define to 1 if you have the `gmtime_r' function. */
-#undef HAVE_GMTIME_R
-
-/* Define if struct tm has a tm_gmtoff field */
-#undef HAVE_GMTOFF
-
-/* Define to 1 if you have the <grp.h> header file. */
-#undef HAVE_GRP_H
-
-/* Define to 1 if you have the `hstrerror' function. */
-#undef HAVE_HSTRERROR
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <io.h> header file. */
-#undef HAVE_IO_H
-
-/* Define to 1 if you have the `isinf' function. */
-#undef HAVE_ISINF
-
-/* Define to 1 if you have the `isnan' function. */
-#undef HAVE_ISNAN
-
-/* Define to 1 if you have the <kernel/OS.h> header file. */
-#undef HAVE_KERNEL_OS_H
-
-/* Define to 1 if you have the <langinfo.h> header file. */
-#undef HAVE_LANGINFO_H
-
-/* Define to 1 if you have the `bsd' library (-lbsd). */
-#undef HAVE_LIBBSD
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-#undef HAVE_LIBNSL
-
-/* Define to 1 if you have the `resolv' library (-lresolv). */
-#undef HAVE_LIBRESOLV
-
-/* Define to 1 if you have the `sendfile' library (-lsendfile). */
-#undef HAVE_LIBSENDFILE
-
-/* Define to 1 if you have the `socket' library (-lsocket). */
-#undef HAVE_LIBSOCKET
-
-/* Define to 1 if you have the `truerand' library (-ltruerand). */
-#undef HAVE_LIBTRUERAND
-
-/* Define to 1 if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
-
-/* Define to 1 if you have the `localtime_r' function. */
-#undef HAVE_LOCALTIME_R
-
-/* Define if LOCK_EX is defined in sys/file.h */
-#undef HAVE_LOCK_EX
-
-/* Define to 1 if you have the <mach-o/dyld.h> header file. */
-#undef HAVE_MACH_O_DYLD_H
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
-
-/* Define if MAP_ANON is defined in sys/mman.h */
-#undef HAVE_MAP_ANON
-
-/* Define to 1 if you have the `memchr' function. */
-#undef HAVE_MEMCHR
-
-/* Define to 1 if you have the `memmove' function. */
-#undef HAVE_MEMMOVE
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `mkstemp' function. */
-#undef HAVE_MKSTEMP
-
-/* Define to 1 if you have the `mmap' function. */
-#undef HAVE_MMAP
-
-/* Define to 1 if you have the `munmap' function. */
-#undef HAVE_MUNMAP
-
-/* Define to 1 if you have the <netdb.h> header file. */
-#undef HAVE_NETDB_H
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#undef HAVE_NETINET_IN_H
-
-/* Define to 1 if you have the <netinet/sctp.h> header file. */
-#undef HAVE_NETINET_SCTP_H
-
-/* Define to 1 if you have the <netinet/sctp_uio.h> header file. */
-#undef HAVE_NETINET_SCTP_UIO_H
-
-/* Defined if netinet/tcp.h is present */
-#undef HAVE_NETINET_TCP_H
-
-/* Define to 1 if you have the <net/errno.h> header file. */
-#undef HAVE_NET_ERRNO_H
-
-/* Define to 1 if you have the `nl_langinfo' function. */
-#undef HAVE_NL_LANGINFO
-
-/* Define to 1 if you have the `NSLinkModule' function. */
-#undef HAVE_NSLINKMODULE
-
-/* Define to 1 if you have the <os2.h> header file. */
-#undef HAVE_OS2_H
-
-/* Define to 1 if you have the <osreldate.h> header file. */
-#undef HAVE_OSRELDATE_H
-
-/* Define to 1 if you have the `poll' function. */
-#undef HAVE_POLL
-
-/* Define if POLLIN is defined */
-#undef HAVE_POLLIN
-
-/* Define to 1 if you have the <poll.h> header file. */
-#undef HAVE_POLL_H
-
-/* Define to 1 if you have the <process.h> header file. */
-#undef HAVE_PROCESS_H
-
-/* Define to 1 if you have the <pthread.h> header file. */
-#undef HAVE_PTHREAD_H
-
-/* Define to 1 if you have the `pthread_key_delete' function. */
-#undef HAVE_PTHREAD_KEY_DELETE
-
-/* Define to 1 if you have the `pthread_mutexattr_setpshared' function. */
-#undef HAVE_PTHREAD_MUTEXATTR_SETPSHARED
-
-/* Define if recursive pthread mutexes are available */
-#undef HAVE_PTHREAD_MUTEX_RECURSIVE
-
-/* Define if cross-process robust mutexes are available */
-#undef HAVE_PTHREAD_MUTEX_ROBUST
-
-/* Define if PTHREAD_PROCESS_SHARED is defined in pthread.h */
-#undef HAVE_PTHREAD_PROCESS_SHARED
-
-/* Define if pthread rwlocks are available */
-#undef HAVE_PTHREAD_RWLOCKS
-
-/* Define to 1 if you have the `pthread_rwlock_init' function. */
-#undef HAVE_PTHREAD_RWLOCK_INIT
-
-/* Define to 1 if you have the `putenv' function. */
-#undef HAVE_PUTENV
-
-/* Define to 1 if you have the <pwd.h> header file. */
-#undef HAVE_PWD_H
-
-/* Define to 1 if you have the <semaphore.h> header file. */
-#undef HAVE_SEMAPHORE_H
-
-/* Define to 1 if you have the `semctl' function. */
-#undef HAVE_SEMCTL
-
-/* Define to 1 if you have the `semget' function. */
-#undef HAVE_SEMGET
-
-/* Define to 1 if you have the `sem_close' function. */
-#undef HAVE_SEM_CLOSE
-
-/* Define to 1 if you have the `sem_post' function. */
-#undef HAVE_SEM_POST
-
-/* Define if SEM_UNDO is defined in sys/sem.h */
-#undef HAVE_SEM_UNDO
-
-/* Define to 1 if you have the `sem_unlink' function. */
-#undef HAVE_SEM_UNLINK
-
-/* Define to 1 if you have the `sem_wait' function. */
-#undef HAVE_SEM_WAIT
-
-/* Define to 1 if you have the `sendfile' function. */
-#undef HAVE_SENDFILE
-
-/* Define to 1 if you have the `sendfilev' function. */
-#undef HAVE_SENDFILEV
-
-/* Define to 1 if you have the `send_file' function. */
-#undef HAVE_SEND_FILE
-
-/* Define to 1 if you have the `setenv' function. */
-#undef HAVE_SETENV
-
-/* Define to 1 if you have the `setrlimit' function. */
-#undef HAVE_SETRLIMIT
-
-/* Define to 1 if you have the `setsid' function. */
-#undef HAVE_SETSID
-
-/* Define to 1 if you have the `set_h_errno' function. */
-#undef HAVE_SET_H_ERRNO
-
-/* Define to 1 if you have the `shmat' function. */
-#undef HAVE_SHMAT
-
-/* Define to 1 if you have the `shmctl' function. */
-#undef HAVE_SHMCTL
-
-/* Define to 1 if you have the `shmdt' function. */
-#undef HAVE_SHMDT
-
-/* Define to 1 if you have the `shmget' function. */
-#undef HAVE_SHMGET
-
-/* Define to 1 if you have the `shm_open' function. */
-#undef HAVE_SHM_OPEN
-
-/* Define to 1 if you have the `shm_unlink' function. */
-#undef HAVE_SHM_UNLINK
-
-/* Define to 1 if you have the `sigaction' function. */
-#undef HAVE_SIGACTION
-
-/* Define to 1 if you have the <signal.h> header file. */
-#undef HAVE_SIGNAL_H
-
-/* Define to 1 if you have the `sigsuspend' function. */
-#undef HAVE_SIGSUSPEND
-
-/* Define to 1 if you have the `sigwait' function. */
-#undef HAVE_SIGWAIT
-
-/* Whether you have socklen_t */
-#undef HAVE_SOCKLEN_T
-
-/* Define if SO_ACCEPTFILTER is defined in sys/socket.h */
-#undef HAVE_SO_ACCEPTFILTER
-
-/* Define to 1 if you have the <stdarg.h> header file. */
-#undef HAVE_STDARG_H
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#undef HAVE_STDDEF_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
-/* Define to 1 if you have the `strerror_r' function. */
-#undef HAVE_STRERROR_R
-
-/* Define to 1 if you have the `stricmp' function. */
-#undef HAVE_STRICMP
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strncasecmp' function. */
-#undef HAVE_STRNCASECMP
-
-/* Define to 1 if you have the `strnicmp' function. */
-#undef HAVE_STRNICMP
-
-/* Define to 1 if you have the `strstr' function. */
-#undef HAVE_STRSTR
-
-/* Define to 1 if you have the <sysapi.h> header file. */
-#undef HAVE_SYSAPI_H
-
-/* Define to 1 if you have the <sysgtime.h> header file. */
-#undef HAVE_SYSGTIME_H
-
-/* Define to 1 if you have the <sys/file.h> header file. */
-#undef HAVE_SYS_FILE_H
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#undef HAVE_SYS_IOCTL_H
-
-/* Define to 1 if you have the <sys/ipc.h> header file. */
-#undef HAVE_SYS_IPC_H
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-#undef HAVE_SYS_MMAN_H
-
-/* Define to 1 if you have the <sys/mutex.h> header file. */
-#undef HAVE_SYS_MUTEX_H
-
-/* Define to 1 if you have the <sys/poll.h> header file. */
-#undef HAVE_SYS_POLL_H
-
-/* Define to 1 if you have the <sys/resource.h> header file. */
-#undef HAVE_SYS_RESOURCE_H
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#undef HAVE_SYS_SELECT_H
-
-/* Define to 1 if you have the <sys/sem.h> header file. */
-#undef HAVE_SYS_SEM_H
-
-/* Define to 1 if you have the <sys/sendfile.h> header file. */
-#undef HAVE_SYS_SENDFILE_H
-
-/* Define to 1 if you have the <sys/shm.h> header file. */
-#undef HAVE_SYS_SHM_H
-
-/* Define to 1 if you have the <sys/signal.h> header file. */
-#undef HAVE_SYS_SIGNAL_H
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#undef HAVE_SYS_SOCKET_H
-
-/* Define to 1 if you have the <sys/sockio.h> header file. */
-#undef HAVE_SYS_SOCKIO_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/sysctl.h> header file. */
-#undef HAVE_SYS_SYSCTL_H
-
-/* Define to 1 if you have the <sys/syslimits.h> header file. */
-#undef HAVE_SYS_SYSLIMITS_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#undef HAVE_SYS_UIO_H
-
-/* Define to 1 if you have the <sys/un.h> header file. */
-#undef HAVE_SYS_UN_H
-
-/* Define to 1 if you have the <sys/wait.h> header file. */
-#undef HAVE_SYS_WAIT_H
-
-/* Define if TCP_CORK is defined in netinet/tcp.h */
-#undef HAVE_TCP_CORK
-
-/* Define if TCP_NOPUSH is defined in netinet/tcp.h */
-#undef HAVE_TCP_NOPUSH
-
-/* Define to 1 if you have the <termios.h> header file. */
-#undef HAVE_TERMIOS_H
-
-/* Define to 1 if you have the <time.h> header file. */
-#undef HAVE_TIME_H
-
-/* Define to 1 if you have the <tpfeq.h> header file. */
-#undef HAVE_TPFEQ_H
-
-/* Define to 1 if you have the <tpfio.h> header file. */
-#undef HAVE_TPFIO_H
-
-/* Define if truerand is supported */
-#undef HAVE_TRUERAND
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the <unix.h> header file. */
-#undef HAVE_UNIX_H
-
-/* Define to 1 if you have the `unsetenv' function. */
-#undef HAVE_UNSETENV
-
-/* Define to 1 if you have the `utime' function. */
-#undef HAVE_UTIME
-
-/* Define to 1 if you have the `utimes' function. */
-#undef HAVE_UTIMES
-
-/* Define if C compiler supports VLA */
-#undef HAVE_VLA
-
-/* Define to 1 if you have the `waitpid' function. */
-#undef HAVE_WAITPID
-
-/* Define to 1 if you have the `writev' function. */
-#undef HAVE_WRITEV
-
-/* Define if EAI_ error codes from getaddrinfo are negative */
-#undef NEGATIVE_EAI
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define if POSIX semaphores affect threads within the process */
-#undef POSIXSEM_IS_GLOBAL
-
-/* Define if pthread_attr_getdetachstate() has one arg */
-#undef PTHREAD_ATTR_GETDETACHSTATE_TAKES_ONE_ARG
-
-/* Define if pthread_getspecific() has two args */
-#undef PTHREAD_GETSPECIFIC_TAKES_TWO_ARGS
-
-/* Define if readdir is thread safe */
-#undef READDIR_IS_THREAD_SAFE
-
-/* Define if resolv.h's res_state has the fields retrans/rety */
-#undef RESOLV_RETRANSRETRY
-
-/* Define to 1 if the `setpgrp' function takes no argument. */
-#undef SETPGRP_VOID
-
-/* */
-#undef SIGWAIT_TAKES_ONE_ARG
-
-/* The size of `char', as computed by sizeof. */
-#undef SIZEOF_CHAR
-
-/* The size of `int', as computed by sizeof. */
-#undef SIZEOF_INT
-
-/* The size of `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-
-/* The size of `long double', as computed by sizeof. */
-#undef SIZEOF_LONG_DOUBLE
-
-/* The size of `long long', as computed by sizeof. */
-#undef SIZEOF_LONG_LONG
-
-/* The size of off_t */
-#undef SIZEOF_OFF_T
-
-/* The size of pid_t */
-#undef SIZEOF_PID_T
-
-/* The size of `short', as computed by sizeof. */
-#undef SIZEOF_SHORT
-
-/* The size of size_t */
-#undef SIZEOF_SIZE_T
-
-/* The size of ssize_t */
-#undef SIZEOF_SSIZE_T
-
-/* The size of `void*', as computed by sizeof. */
-#undef SIZEOF_VOIDP
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define if strerror returns int */
-#undef STRERROR_R_RC_INT
-
-/* Define if SysV semaphores affect threads within the process */
-#undef SYSVSEM_IS_GLOBAL
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
-/* Define if APR supports threads */
-#undef USE_THREADS
-
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef gid_t
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif
-
-/* Define to `long int' if <sys/types.h> does not define. */
-#undef off_t
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef pid_t
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef ssize_t
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef uid_t
-
-/* Make sure we have ssize_t defined to be something */
-#undef ssize_t
-
-/* switch this on if we have a BeOS version below BONE */
-#if BEOS && !HAVE_BONE_VERSION
-#define BEOS_R5 1
-#else
-#define BEOS_BONE 1
-#endif
-
-#ifdef SIGWAIT_TAKES_ONE_ARG
-#define apr_sigwait(a,b) ((*(b)=sigwait((a)))<0?-1:0)
-#else
-#define apr_sigwait(a,b) sigwait((a),(b))
-#endif
-
-/*
- * Include common private declarations.
- */
-#include "../apr_private_common.h"
-
-#endif /* APR_PRIVATE_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_private.h.save b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_private.h.save
deleted file mode 100644
index c40a923b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/unix/apr_private.h.save
+++ /dev/null
@@ -1,743 +0,0 @@
-/* include/arch/unix/apr_private.h.  Generated from apr_private.h.in by configure.  */
-/* include/arch/unix/apr_private.h.in.  Generated from configure.in by autoheader.  */
-#ifndef APR_PRIVATE_H
-#define APR_PRIVATE_H
-
-
-/* Various #defines we need to know about */
-#define USE_THREADS 1
-/* #undef EGD_DEFAULT_SOCKET */
-/* #undef HAVE_isascii */
-#define DIRENT_INODE d_fileno
-#define DIRENT_TYPE d_type
-
-/* Cross process serialization techniques */
-/* #undef USE_FLOCK_SERIALIZE */
-#define USE_SYSVSEM_SERIALIZE 1
-/* #undef USE_FCNTL_SERIALIZE */
-/* #undef USE_PROC_PTHREAD_SERIALIZE */
-/* #undef USE_PTHREAD_SERIALIZE */
-
-/* #undef POSIXSEM_IS_GLOBAL */
-/* #undef SYSVSEM_IS_GLOBAL */
-/* #undef FCNTL_IS_GLOBAL */
-/* #undef FLOCK_IS_GLOBAL */
-
-/* #undef HAVE_INT64_C */
-
-
-/* Define if crypt_r has uses CRYPTD */
-/* #undef CRYPT_R_CRYPTD */
-
-/* Define if crypt_r uses struct crypt_data */
-#define CRYPT_R_STRUCT_CRYPT_DATA 1
-
-/* Define to path of random device */
-#define DEV_RANDOM "/dev/random"
-
-/* Define if DSO support uses dlfcn.h */
-#define DSO_USE_DLFCN 1
-
-/* Define if DSO support uses dyld.h */
-/* #undef DSO_USE_DYLD */
-
-/* Define if DSO support uses shl_load */
-/* #undef DSO_USE_SHL */
-
-/* Define to list of paths to EGD sockets */
-/* #undef EGD_DEFAULT_SOCKET */
-
-/* Define if fcntl locks affect threads within the process */
-/* #undef FCNTL_IS_GLOBAL */
-
-/* Define if flock locks affect threads within the process */
-/* #undef FLOCK_IS_GLOBAL */
-
-/* Define if gethostbyaddr is thread safe */
-/* #undef GETHOSTBYADDR_IS_THREAD_SAFE */
-
-/* Define if gethostbyname is thread safe */
-/* #undef GETHOSTBYNAME_IS_THREAD_SAFE */
-
-/* Define if gethostbyname_r has the glibc style */
-#define GETHOSTBYNAME_R_GLIBC2 1
-
-/* Define if gethostbyname_r has the hostent_data for the third argument */
-/* #undef GETHOSTBYNAME_R_HOSTENT_DATA */
-
-/* Define to 1 if you have the `alloca' function. */
-/* #undef HAVE_ALLOCA */
-
-/* Define to 1 if you have the <alloca.h> header file. */
-#define HAVE_ALLOCA_H 1
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#define HAVE_ARPA_INET_H 1
-
-/* Define if BONE_VERSION is defined in sys/socket.h */
-/* #undef HAVE_BONE_VERSION */
-
-/* Define to 1 if you have the <ByteOrder.h> header file. */
-/* #undef HAVE_BYTEORDER_H */
-
-/* Define to 1 if you have the `calloc' function. */
-#define HAVE_CALLOC 1
-
-/* Define to 1 if you have the <conio.h> header file. */
-/* #undef HAVE_CONIO_H */
-
-/* Define to 1 if you have the `create_area' function. */
-/* #undef HAVE_CREATE_AREA */
-
-/* Define to 1 if you have the <crypt.h> header file. */
-#define HAVE_CRYPT_H 1
-
-/* Define to 1 if you have the `crypt_r' function. */
-#define HAVE_CRYPT_R 1
-
-/* Define to 1 if you have the <ctype.h> header file. */
-#define HAVE_CTYPE_H 1
-
-/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
-   don't. */
-#define HAVE_DECL_SYS_SIGLIST 1
-
-/* Define to 1 if you have the <dirent.h> header file. */
-#define HAVE_DIRENT_H 1
-
-/* Define to 1 if you have the <dir.h> header file. */
-/* #undef HAVE_DIR_H */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the `dlopen' function. */
-/* #undef HAVE_DLOPEN */
-
-/* Define to 1 if you have the `dlsym' function. */
-#define HAVE_DLSYM 1
-
-/* Define to 1 if you have the <dl.h> header file. */
-/* #undef HAVE_DL_H */
-
-/* Define if EGD is supported */
-/* #undef HAVE_EGD */
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `flock' function. */
-#define HAVE_FLOCK 1
-
-/* Define to 1 if you have the `fork' function. */
-#define HAVE_FORK 1
-
-/* Define if fstat64 can be used */
-#define HAVE_FSTAT64 1
-
-/* Define if F_SETLK is defined in fcntl.h */
-#define HAVE_F_SETLK 1
-
-/* Define to 1 if you have the `gai_strerror' function. */
-#define HAVE_GAI_STRERROR 1
-
-/* Define if getaddrinfo exists and works well enough for APR */
-#define HAVE_GETADDRINFO 1
-
-/* Define to 1 if you have the `getenv' function. */
-#define HAVE_GETENV 1
-
-/* Define to 1 if you have the `getgrgid_r' function. */
-#define HAVE_GETGRGID_R 1
-
-/* Define to 1 if you have the `getgrnam_r' function. */
-#define HAVE_GETGRNAM_R 1
-
-/* Define to 1 if you have the `gethostbyaddr_r' function. */
-#define HAVE_GETHOSTBYADDR_R 1
-
-/* Define to 1 if you have the `gethostbyname_r' function. */
-#define HAVE_GETHOSTBYNAME_R 1
-
-/* Define if getnameinfo exists */
-#define HAVE_GETNAMEINFO 1
-
-/* Define to 1 if you have the `getpass' function. */
-#define HAVE_GETPASS 1
-
-/* Define to 1 if you have the `getpassphrase' function. */
-/* #undef HAVE_GETPASSPHRASE */
-
-/* Define to 1 if you have the `getpwnam_r' function. */
-#define HAVE_GETPWNAM_R 1
-
-/* Define to 1 if you have the `getpwuid_r' function. */
-#define HAVE_GETPWUID_R 1
-
-/* Define to 1 if you have the `getrlimit' function. */
-#define HAVE_GETRLIMIT 1
-
-/* Define to 1 if you have the `gmtime_r' function. */
-#define HAVE_GMTIME_R 1
-
-/* Define if struct tm has a tm_gmtoff field */
-#define HAVE_GMTOFF 1
-
-/* Define to 1 if you have the <grp.h> header file. */
-#define HAVE_GRP_H 1
-
-/* Define to 1 if you have the `hstrerror' function. */
-#define HAVE_HSTRERROR 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <io.h> header file. */
-/* #undef HAVE_IO_H */
-
-/* Define to 1 if you have the `isinf' function. */
-#define HAVE_ISINF 1
-
-/* Define to 1 if you have the `isnan' function. */
-#define HAVE_ISNAN 1
-
-/* Define to 1 if you have the <kernel/OS.h> header file. */
-/* #undef HAVE_KERNEL_OS_H */
-
-/* Define to 1 if you have the <langinfo.h> header file. */
-#define HAVE_LANGINFO_H 1
-
-/* Define to 1 if you have the `bsd' library (-lbsd). */
-/* #undef HAVE_LIBBSD */
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-#define HAVE_LIBNSL 1
-
-/* Define to 1 if you have the `resolv' library (-lresolv). */
-/* #undef HAVE_LIBRESOLV */
-
-/* Define to 1 if you have the `sendfile' library (-lsendfile). */
-/* #undef HAVE_LIBSENDFILE */
-
-/* Define to 1 if you have the `socket' library (-lsocket). */
-/* #undef HAVE_LIBSOCKET */
-
-/* Define to 1 if you have the `truerand' library (-ltruerand). */
-/* #undef HAVE_LIBTRUERAND */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the `localtime_r' function. */
-#define HAVE_LOCALTIME_R 1
-
-/* Define if LOCK_EX is defined in sys/file.h */
-#define HAVE_LOCK_EX 1
-
-/* Define to 1 if you have the <mach-o/dyld.h> header file. */
-/* #undef HAVE_MACH_O_DYLD_H */
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H 1
-
-/* Define if MAP_ANON is defined in sys/mman.h */
-#define HAVE_MAP_ANON 1
-
-/* Define to 1 if you have the `memchr' function. */
-#define HAVE_MEMCHR 1
-
-/* Define to 1 if you have the `memmove' function. */
-#define HAVE_MEMMOVE 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mkstemp' function. */
-#define HAVE_MKSTEMP 1
-
-/* Define to 1 if you have the `mmap' function. */
-#define HAVE_MMAP 1
-
-/* Define to 1 if you have the `munmap' function. */
-#define HAVE_MUNMAP 1
-
-/* Define to 1 if you have the <netdb.h> header file. */
-#define HAVE_NETDB_H 1
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H 1
-
-/* Define to 1 if you have the <netinet/sctp.h> header file. */
-/* #undef HAVE_NETINET_SCTP_H */
-
-/* Define to 1 if you have the <netinet/sctp_uio.h> header file. */
-/* #undef HAVE_NETINET_SCTP_UIO_H */
-
-/* Defined if netinet/tcp.h is present */
-#define HAVE_NETINET_TCP_H 1
-
-/* Define to 1 if you have the <net/errno.h> header file. */
-/* #undef HAVE_NET_ERRNO_H */
-
-/* Define to 1 if you have the `nl_langinfo' function. */
-#define HAVE_NL_LANGINFO 1
-
-/* Define to 1 if you have the `NSLinkModule' function. */
-/* #undef HAVE_NSLINKMODULE */
-
-/* Define to 1 if you have the <os2.h> header file. */
-/* #undef HAVE_OS2_H */
-
-/* Define to 1 if you have the <osreldate.h> header file. */
-/* #undef HAVE_OSRELDATE_H */
-
-/* Define to 1 if you have the `poll' function. */
-#define HAVE_POLL 1
-
-/* Define if POLLIN is defined */
-#define HAVE_POLLIN 1
-
-/* Define to 1 if you have the <poll.h> header file. */
-#define HAVE_POLL_H 1
-
-/* Define to 1 if you have the <process.h> header file. */
-/* #undef HAVE_PROCESS_H */
-
-/* Define to 1 if you have the <pthread.h> header file. */
-#define HAVE_PTHREAD_H 1
-
-/* Define to 1 if you have the `pthread_key_delete' function. */
-#define HAVE_PTHREAD_KEY_DELETE 1
-
-/* Define to 1 if you have the `pthread_mutexattr_setpshared' function. */
-#define HAVE_PTHREAD_MUTEXATTR_SETPSHARED 1
-
-/* Define if recursive pthread mutexes are available */
-#define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-
-/* Define if cross-process robust mutexes are available */
-#define HAVE_PTHREAD_MUTEX_ROBUST 1
-
-/* Define if PTHREAD_PROCESS_SHARED is defined in pthread.h */
-#define HAVE_PTHREAD_PROCESS_SHARED 1
-
-/* Define if pthread rwlocks are available */
-#define HAVE_PTHREAD_RWLOCKS 1
-
-/* Define to 1 if you have the `pthread_rwlock_init' function. */
-#define HAVE_PTHREAD_RWLOCK_INIT 1
-
-/* Define to 1 if you have the `putenv' function. */
-#define HAVE_PUTENV 1
-
-/* Define to 1 if you have the <pwd.h> header file. */
-#define HAVE_PWD_H 1
-
-/* Define to 1 if you have the <semaphore.h> header file. */
-#define HAVE_SEMAPHORE_H 1
-
-/* Define to 1 if you have the `semctl' function. */
-#define HAVE_SEMCTL 1
-
-/* Define to 1 if you have the `semget' function. */
-#define HAVE_SEMGET 1
-
-/* Define to 1 if you have the `sem_close' function. */
-#define HAVE_SEM_CLOSE 1
-
-/* Define to 1 if you have the `sem_post' function. */
-#define HAVE_SEM_POST 1
-
-/* Define if SEM_UNDO is defined in sys/sem.h */
-#define HAVE_SEM_UNDO 1
-
-/* Define to 1 if you have the `sem_unlink' function. */
-#define HAVE_SEM_UNLINK 1
-
-/* Define to 1 if you have the `sem_wait' function. */
-#define HAVE_SEM_WAIT 1
-
-/* Define to 1 if you have the `sendfile' function. */
-#define HAVE_SENDFILE 1
-
-/* Define to 1 if you have the `sendfilev' function. */
-/* #undef HAVE_SENDFILEV */
-
-/* Define to 1 if you have the `send_file' function. */
-/* #undef HAVE_SEND_FILE */
-
-/* Define to 1 if you have the `setenv' function. */
-#define HAVE_SETENV 1
-
-/* Define to 1 if you have the `setrlimit' function. */
-#define HAVE_SETRLIMIT 1
-
-/* Define to 1 if you have the `setsid' function. */
-#define HAVE_SETSID 1
-
-/* Define to 1 if you have the `set_h_errno' function. */
-/* #undef HAVE_SET_H_ERRNO */
-
-/* Define to 1 if you have the `shmat' function. */
-#define HAVE_SHMAT 1
-
-/* Define to 1 if you have the `shmctl' function. */
-#define HAVE_SHMCTL 1
-
-/* Define to 1 if you have the `shmdt' function. */
-#define HAVE_SHMDT 1
-
-/* Define to 1 if you have the `shmget' function. */
-#define HAVE_SHMGET 1
-
-/* Define to 1 if you have the `shm_open' function. */
-#define HAVE_SHM_OPEN 1
-
-/* Define to 1 if you have the `shm_unlink' function. */
-#define HAVE_SHM_UNLINK 1
-
-/* Define to 1 if you have the `sigaction' function. */
-#define HAVE_SIGACTION 1
-
-/* Define to 1 if you have the <signal.h> header file. */
-#define HAVE_SIGNAL_H 1
-
-/* Define to 1 if you have the `sigsuspend' function. */
-#define HAVE_SIGSUSPEND 1
-
-/* Define to 1 if you have the `sigwait' function. */
-#define HAVE_SIGWAIT 1
-
-/* Whether you have socklen_t */
-#define HAVE_SOCKLEN_T 1
-
-/* Define if SO_ACCEPTFILTER is defined in sys/socket.h */
-/* #undef HAVE_SO_ACCEPTFILTER */
-
-/* Define to 1 if you have the <stdarg.h> header file. */
-#define HAVE_STDARG_H 1
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#define HAVE_STDIO_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#define HAVE_STRCASECMP 1
-
-/* Define to 1 if you have the `strdup' function. */
-#define HAVE_STRDUP 1
-
-/* Define to 1 if you have the `strerror_r' function. */
-#define HAVE_STRERROR_R 1
-
-/* Define to 1 if you have the `stricmp' function. */
-/* #undef HAVE_STRICMP */
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strncasecmp' function. */
-#define HAVE_STRNCASECMP 1
-
-/* Define to 1 if you have the `strnicmp' function. */
-/* #undef HAVE_STRNICMP */
-
-/* Define to 1 if you have the `strstr' function. */
-#define HAVE_STRSTR 1
-
-/* Define to 1 if you have the <sysapi.h> header file. */
-/* #undef HAVE_SYSAPI_H */
-
-/* Define to 1 if you have the <sysgtime.h> header file. */
-/* #undef HAVE_SYSGTIME_H */
-
-/* Define to 1 if you have the <sys/file.h> header file. */
-#define HAVE_SYS_FILE_H 1
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#define HAVE_SYS_IOCTL_H 1
-
-/* Define to 1 if you have the <sys/ipc.h> header file. */
-#define HAVE_SYS_IPC_H 1
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-#define HAVE_SYS_MMAN_H 1
-
-/* Define to 1 if you have the <sys/mutex.h> header file. */
-/* #undef HAVE_SYS_MUTEX_H */
-
-/* Define to 1 if you have the <sys/poll.h> header file. */
-#define HAVE_SYS_POLL_H 1
-
-/* Define to 1 if you have the <sys/resource.h> header file. */
-#define HAVE_SYS_RESOURCE_H 1
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#define HAVE_SYS_SELECT_H 1
-
-/* Define to 1 if you have the <sys/sem.h> header file. */
-#define HAVE_SYS_SEM_H 1
-
-/* Define to 1 if you have the <sys/sendfile.h> header file. */
-#define HAVE_SYS_SENDFILE_H 1
-
-/* Define to 1 if you have the <sys/shm.h> header file. */
-#define HAVE_SYS_SHM_H 1
-
-/* Define to 1 if you have the <sys/signal.h> header file. */
-#define HAVE_SYS_SIGNAL_H 1
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#define HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/sockio.h> header file. */
-/* #undef HAVE_SYS_SOCKIO_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/sysctl.h> header file. */
-#define HAVE_SYS_SYSCTL_H 1
-
-/* Define to 1 if you have the <sys/syslimits.h> header file. */
-/* #undef HAVE_SYS_SYSLIMITS_H */
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#define HAVE_SYS_UIO_H 1
-
-/* Define to 1 if you have the <sys/un.h> header file. */
-#define HAVE_SYS_UN_H 1
-
-/* Define to 1 if you have the <sys/wait.h> header file. */
-#define HAVE_SYS_WAIT_H 1
-
-/* Define if TCP_CORK is defined in netinet/tcp.h */
-#define HAVE_TCP_CORK 1
-
-/* Define if TCP_NOPUSH is defined in netinet/tcp.h */
-/* #undef HAVE_TCP_NOPUSH */
-
-/* Define to 1 if you have the <termios.h> header file. */
-#define HAVE_TERMIOS_H 1
-
-/* Define to 1 if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
-/* Define to 1 if you have the <tpfeq.h> header file. */
-/* #undef HAVE_TPFEQ_H */
-
-/* Define to 1 if you have the <tpfio.h> header file. */
-/* #undef HAVE_TPFIO_H */
-
-/* Define if truerand is supported */
-/* #undef HAVE_TRUERAND */
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the <unix.h> header file. */
-/* #undef HAVE_UNIX_H */
-
-/* Define to 1 if you have the `unsetenv' function. */
-#define HAVE_UNSETENV 1
-
-/* Define to 1 if you have the `utime' function. */
-#define HAVE_UTIME 1
-
-/* Define to 1 if you have the `utimes' function. */
-#define HAVE_UTIMES 1
-
-/* Define if C compiler supports VLA */
-#define HAVE_VLA 1
-
-/* Define to 1 if you have the `waitpid' function. */
-#define HAVE_WAITPID 1
-
-/* Define to 1 if you have the `writev' function. */
-#define HAVE_WRITEV 1
-
-/* Define if EAI_ error codes from getaddrinfo are negative */
-#define NEGATIVE_EAI 1
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION ""
-
-/* Define if POSIX semaphores affect threads within the process */
-/* #undef POSIXSEM_IS_GLOBAL */
-
-/* Define if pthread_attr_getdetachstate() has one arg */
-/* #undef PTHREAD_ATTR_GETDETACHSTATE_TAKES_ONE_ARG */
-
-/* Define if pthread_getspecific() has two args */
-/* #undef PTHREAD_GETSPECIFIC_TAKES_TWO_ARGS */
-
-/* Define if readdir is thread safe */
-/* #undef READDIR_IS_THREAD_SAFE */
-
-/* Define if resolv.h's res_state has the fields retrans/rety */
-#define RESOLV_RETRANSRETRY 1
-
-/* Define to 1 if the `setpgrp' function takes no argument. */
-#define SETPGRP_VOID 1
-
-/* */
-/* #undef SIGWAIT_TAKES_ONE_ARG */
-
-/* The size of `char', as computed by sizeof. */
-#define SIZEOF_CHAR 1
-
-/* The size of `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 8
-
-/* The size of `long double', as computed by sizeof. */
-#define SIZEOF_LONG_DOUBLE 16
-
-/* The size of `long long', as computed by sizeof. */
-#define SIZEOF_LONG_LONG 8
-
-/* The size of off_t */
-#define SIZEOF_OFF_T 8
-
-/* The size of pid_t */
-#define SIZEOF_PID_T 4
-
-/* The size of `short', as computed by sizeof. */
-#define SIZEOF_SHORT 2
-
-/* The size of size_t */
-#define SIZEOF_SIZE_T 8
-
-/* The size of ssize_t */
-#define SIZEOF_SSIZE_T 8
-
-/* The size of `void*', as computed by sizeof. */
-#define SIZEOF_VOIDP 8
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define if strerror returns int */
-/* #undef STRERROR_R_RC_INT */
-
-/* Define if SysV semaphores affect threads within the process */
-/* #undef SYSVSEM_IS_GLOBAL */
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-
-
-/* Define if APR supports threads */
-#define USE_THREADS 1
-
-/* Define to 1 if on MINIX. */
-/* #undef _MINIX */
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-/* #undef _POSIX_SOURCE */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef gid_t */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `long int' if <sys/types.h> does not define. */
-/* #undef off_t */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef pid_t */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef ssize_t */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef uid_t */
-
-/* Make sure we have ssize_t defined to be something */
-/* #undef ssize_t */
-
-/* switch this on if we have a BeOS version below BONE */
-#if BEOS && !HAVE_BONE_VERSION
-#define BEOS_R5 1
-#else
-#define BEOS_BONE 1
-#endif
-
-#ifdef SIGWAIT_TAKES_ONE_ARG
-#define apr_sigwait(a,b) ((*(b)=sigwait((a)))<0?-1:0)
-#else
-#define apr_sigwait(a,b) sigwait((a),(b))
-#endif
-
-/*
- * Include common private declarations.
- */
-#include "../apr_private_common.h"
-
-#endif /* APR_PRIVATE_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_atime.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_atime.h
deleted file mode 100644
index 47b75a95..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_atime.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ATIME_H
-#define ATIME_H
-
-#include "apr_private.h"
-#include "apr_time.h"
-#if APR_HAVE_TIME_H
-#include <time.h>
-#endif
-
-struct atime_t {
-    apr_pool_t *cntxt;
-    apr_time_t currtime;
-    SYSTEMTIME *explodedtime;
-};
-
-
-/* Number of micro-seconds between the beginning of the Windows epoch
- * (Jan. 1, 1601) and the Unix epoch (Jan. 1, 1970) 
- */
-#define APR_DELTA_EPOCH_IN_USEC   APR_TIME_C(11644473600000000);
-
-
-__inline void FileTimeToAprTime(apr_time_t *result, FILETIME *input)
-{
-    /* Convert FILETIME one 64 bit number so we can work with it. */
-    *result = input->dwHighDateTime;
-    *result = (*result) << 32;
-    *result |= input->dwLowDateTime;
-    *result /= 10;    /* Convert from 100 nano-sec periods to micro-seconds. */
-    *result -= APR_DELTA_EPOCH_IN_USEC;  /* Convert from Windows epoch to Unix epoch */
-    return;
-}
-
-
-__inline void AprTimeToFileTime(LPFILETIME pft, apr_time_t t)
-{
-    LONGLONG ll;
-    t += APR_DELTA_EPOCH_IN_USEC;
-    ll = t * 10;
-    pft->dwLowDateTime = (DWORD)ll;
-    pft->dwHighDateTime = (DWORD) (ll >> 32);
-    return;
-}
-
-
-#endif  /* ! ATIME_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_dso.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_dso.h
deleted file mode 100644
index e2e4e40f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_dso.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef DSO_H
-#define DSO_H
-
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_dso.h"
-#include "apr.h"
-
-#if APR_HAS_DSO
-
-struct apr_dso_handle_t {
-    apr_pool_t  *cont;
-    void          *handle;
-    apr_status_t   load_error;
-};
-
-#endif
-
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_file_io.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_file_io.h
deleted file mode 100644
index dc3f442a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_file_io.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef FILE_IO_H
-#define FILE_IO_H
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_pools.h"
-#include "apr_general.h"
-#include "apr_tables.h"
-#include "apr_thread_mutex.h"
-#include "apr_file_io.h"
-#include "apr_file_info.h"
-#include "apr_errno.h"
-#include "apr_arch_misc.h"
-
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef HAVE_TIME_H
-#include <time.h>
-#endif
-#if APR_HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
-#if APR_HAS_UNICODE_FS
-#include "arch/win32/apr_arch_utf8.h"
-#include <wchar.h>
-
-/* Helper functions for the WinNT ApiW() functions.  APR treats all
- * resource identifiers (files, etc) by their UTF-8 name, to provide 
- * access to all named identifiers.  [UTF-8 completely maps Unicode 
- * into char type strings.]
- *
- * The _path flavors below provide us fast mappings of the
- * Unicode filename //?/D:/path and //?/UNC/mach/share/path mappings,
- * which allow unlimited (well, 32000 wide character) length names.
- * These prefixes may appear in Unicode, but must not appear in the
- * Ascii API calls.  So we tack them on in utf8_to_unicode_path, and
- * strip them right back off in unicode_to_utf8_path.
- */
-apr_status_t utf8_to_unicode_path(apr_wchar_t* dststr, apr_size_t dstchars, 
-                                  const char* srcstr);
-apr_status_t unicode_to_utf8_path(char* dststr, apr_size_t dstchars, 
-                                  const apr_wchar_t* srcstr);
-
-#endif /* APR_HAS_UNICODE_FS */
-
-/* Another Helper functions for the WinNT ApiW() functions.  We need to
- * derive some 'resource' names (max length 255 characters, prefixed with
- * Global/ or Local/ on WinNT) from something that looks like a filename.
- * Since 'resource' names never contain slashes, convert these to '_'s
- * and return the appropriate char* or wchar* for ApiA or ApiW calls.
- */
-
-void *res_name_from_filename(const char *file, int global, apr_pool_t *pool);
-
-#define APR_FILE_MAX MAX_PATH
-
-#define APR_FILE_BUFSIZE 4096
-
-/* obscure ommissions from msvc's sys/stat.h */
-#ifdef _MSC_VER
-#define S_IFIFO        _S_IFIFO /* pipe */
-#define S_IFBLK        0060000  /* Block Special */
-#define S_IFLNK        0120000  /* Symbolic Link */
-#define S_IFSOCK       0140000  /* Socket */
-#define S_IFWHT        0160000  /* Whiteout */
-#endif
-
-/* Internal Flags for apr_file_open */
-#define APR_OPENINFO     0x00100000 /* Open without READ or WRITE access */
-#define APR_OPENLINK     0x00200000 /* Open a link itself, if supported */
-#define APR_READCONTROL  0x00400000 /* Read the file's owner/perms */
-#define APR_WRITECONTROL 0x00800000 /* Modifythe file's owner/perms */
-#define APR_WRITEATTRS   0x01000000 /* Modify the file's attributes */
-#define APR_STDIN_FLAG   0x02000000 /* Obtained via apr_file_open_stdin() */
-#define APR_STDOUT_FLAG  0x04000000 /* Obtained via apr_file_open_stdout() */
-#define APR_STDERR_FLAG  0x06000000 /* Obtained via apr_file_open_stderr() */
-#define APR_STD_FLAGS    (APR_STDIN_FLAG | APR_STDOUT_FLAG | APR_STDERR_FLAG)
-
-/* Entries missing from the MSVC 5.0 Win32 SDK:
- */
-#ifndef FILE_ATTRIBUTE_DEVICE
-#define FILE_ATTRIBUTE_DEVICE        0x00000040
-#endif
-#ifndef FILE_ATTRIBUTE_REPARSE_POINT
-#define FILE_ATTRIBUTE_REPARSE_POINT 0x00000400
-#endif
-#ifndef FILE_FLAG_OPEN_NO_RECALL
-#define FILE_FLAG_OPEN_NO_RECALL     0x00100000
-#endif
-#ifndef FILE_FLAG_OPEN_REPARSE_POINT
-#define FILE_FLAG_OPEN_REPARSE_POINT 0x00200000
-#endif
-#ifndef TRUSTEE_IS_WELL_KNOWN_GROUP
-#define TRUSTEE_IS_WELL_KNOWN_GROUP  5
-#endif
-
-/* Information bits available from the WIN32 FindFirstFile function */
-#define APR_FINFO_WIN32_DIR (APR_FINFO_NAME  | APR_FINFO_TYPE \
-                           | APR_FINFO_CTIME | APR_FINFO_ATIME \
-                           | APR_FINFO_MTIME | APR_FINFO_SIZE)
-
-/* Sneak the Readonly bit through finfo->protection for internal use _only_ */
-#define APR_FREADONLY 0x10000000 
-
-/* Private function for apr_stat/lstat/getfileinfo/dir_read */
-int fillin_fileinfo(apr_finfo_t *finfo, WIN32_FILE_ATTRIBUTE_DATA *wininfo, 
-                    int byhandle, apr_int32_t wanted);
-
-/* Private function that extends apr_stat/lstat/getfileinfo/dir_read */
-apr_status_t more_finfo(apr_finfo_t *finfo, const void *ufile, 
-                        apr_int32_t wanted, int whatfile);
-
-/* whatfile types for the ufile arg */
-#define MORE_OF_HANDLE 0
-#define MORE_OF_FSPEC  1
-#define MORE_OF_WFSPEC 2
-
-/* quick run-down of fields in windows' apr_file_t structure that may have 
- * obvious uses.
- * fname --  the filename as passed to the open call.
- * dwFileAttricutes -- Attributes used to open the file.
- * append -- Windows doesn't support the append concept when opening files.
- *           APR needs to keep track of this, and always make sure we append
- *           correctly when writing to a file with this flag set TRUE.
- */
-
-// for apr_poll.c;
-#define filedes filehand
-
-struct apr_file_t {
-    apr_pool_t *pool;
-    HANDLE filehand;
-    BOOLEAN pipe;              // Is this a pipe of a file?
-    OVERLAPPED *pOverlapped;
-    apr_interval_time_t timeout;
-    apr_int32_t flags;
-
-    /* File specific info */
-    apr_finfo_t *finfo;
-    char *fname;
-    DWORD dwFileAttributes;
-    int eof_hit;
-    BOOLEAN buffered;          // Use buffered I/O?
-    int ungetchar;             // Last char provided by an unget op. (-1 = no char)
-    int append; 
-
-    /* Stuff for buffered mode */
-    char *buffer;
-    apr_size_t bufpos;         // Read/Write position in buffer
-    apr_size_t dataRead;       // amount of valid data read into buffer
-    int direction;             // buffer being used for 0 = read, 1 = write
-    apr_off_t filePtr;         // position in file of handle
-    apr_thread_mutex_t *mutex; // mutex semaphore, must be owned to access the above fields
-
-    /* Pipe specific info */    
-};
-
-struct apr_dir_t {
-    apr_pool_t *pool;
-    HANDLE dirhand;
-    apr_size_t rootlen;
-    char *dirname;
-    char *name;
-    union {
-#if APR_HAS_UNICODE_FS
-        struct {
-            WIN32_FIND_DATAW *entry;
-        } w;
-#endif
-#if APR_HAS_ANSI_FS
-        struct {
-            WIN32_FIND_DATAA *entry;
-        } n;
-#endif        
-    };
-    int bof;
-};
-
-/* There are many goofy characters the filesystem can't accept
- * or can confound the cmd.exe shell.  Here's the list
- * [declared in filesys.c]
- */
-extern const char apr_c_is_fnchar[256];
-
-#define IS_FNCHAR(c) (apr_c_is_fnchar[(unsigned char)(c)] & 1)
-#define IS_SHCHAR(c) ((apr_c_is_fnchar[(unsigned char)(c)] & 2) == 2)
-
-
-/* If the user passes APR_FILEPATH_TRUENAME to either
- * apr_filepath_root or apr_filepath_merge, this fn determines
- * that the root really exists.  It's expensive, wouldn't want
- * to do this too frequenly.
- */
-apr_status_t filepath_root_test(char *path, apr_pool_t *p);
-
-
-/* The apr_filepath_merge wants to canonicalize the cwd to the 
- * addpath if the user passes NULL as the old root path (this
- * isn't true of an empty string "", which won't be concatenated.
- *
- * But we need to figure out what the cwd of a given volume is,
- * when the user passes D:foo.  This fn will determine D:'s cwd.
- *
- * If flags includes the bit APR_FILEPATH_NATIVE, the path returned
- * is in the os-native format.
- */
-apr_status_t filepath_drive_get(char **rootpath, char drive, 
-                                apr_int32_t flags, apr_pool_t *p);
-
-
-/* If the user passes d: vs. D: (or //mach/share vs. //MACH/SHARE),
- * we need to fold the case to canonical form.  This function is
- * supposed to do so.
- */
-apr_status_t filepath_root_case(char **rootpath, char *root, apr_pool_t *p);
-
-
-apr_status_t file_cleanup(void *);
-
-/**
- * Internal function to create a Win32/NT pipe that respects some async
- * timeout options.
- * @param in new read end of the created pipe
- * @param out new write end of the created pipe
- * @param blocking_mode one of
- * <pre>
- *       APR_FULL_BLOCK
- *       APR_READ_BLOCK
- *       APR_WRITE_BLOCK
- *       APR_FULL_NONBLOCK
- * </pre>
- * @remark It so happens that APR_FULL_BLOCK and APR_FULL_NONBLOCK
- * are common to apr_procattr_io_set() in, out and err modes.
- * Because APR_CHILD_BLOCK and APR_WRITE_BLOCK share the same value,
- * as do APR_PARENT_BLOCK and APR_READ_BLOCK, it's possible to use
- * that value directly for creating the stdout/stderr pipes.  When
- * creating the stdin pipe, the values must be transposed.
- * @see apr_procattr_io_set
- */
-apr_status_t apr_create_nt_pipe(apr_file_t **in, apr_file_t **out, 
-                                apr_int32_t blocking_mode, 
-                                apr_pool_t *p);
-
-/** @see apr_create_nt_pipe */
-#define APR_READ_BLOCK     3
-/** @see apr_create_nt_pipe */
-#define APR_WRITE_BLOCK      4
-
-#endif  /* ! FILE_IO_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_inherit.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_inherit.h
deleted file mode 100644
index 88e6f0de..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_inherit.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef INHERIT_H
-#define INHERIT_H
-
-#include "apr_inherit.h"
-
-#define APR_INHERIT (1 << 24)    /* Must not conflict with other bits */
-
-#if APR_HAS_UNICODE_FS && APR_HAS_ANSI_FS
-/* !defined(_WIN32_WCE) is implicit here */
-
-#define APR_IMPLEMENT_INHERIT_SET(name, flag, pool, cleanup)        \
-APR_DECLARE(apr_status_t) apr_##name##_inherit_set(apr_##name##_t *the##name) \
-{                                                                   \
-    IF_WIN_OS_IS_UNICODE                                            \
-    {                                                               \
-/*     if (!SetHandleInformation(the##name->filehand,              \
- *                                HANDLE_FLAG_INHERIT,              \
- *                                HANDLE_FLAG_INHERIT))             \
- *          return apr_get_os_error();                              \
- */  }                                                               \
-    ELSE_WIN_OS_IS_ANSI                                             \
-    {                                                               \
-        HANDLE temp, hproc = GetCurrentProcess();                   \
-        if (!DuplicateHandle(hproc, the##name->filehand,            \
-                             hproc, &temp, 0, TRUE,                 \
-                             DUPLICATE_SAME_ACCESS))                \
-            return apr_get_os_error();                              \
-        CloseHandle(the##name->filehand);                           \
-        the##name->filehand = temp;                                 \
-    }                                                               \
-    return APR_SUCCESS;                                             \
-}                                                                   \
-/* Deprecated */                                                    \
-APR_DECLARE(void) apr_##name##_set_inherit(apr_##name##_t *the##name) \
-{                                                                   \
-    apr_##name##_inherit_set(the##name);                            \
-}
-
-#define APR_IMPLEMENT_INHERIT_UNSET(name, flag, pool, cleanup)      \
-APR_DECLARE(apr_status_t) apr_##name##_inherit_unset(apr_##name##_t *the##name)\
-{                                                                   \
-    IF_WIN_OS_IS_UNICODE                                            \
-    {                                                               \
-/*      if (!SetHandleInformation(the##name->filehand,              \
- *                                HANDLE_FLAG_INHERIT, 0))          \
- *          return apr_get_os_error();                              \
- */ }                                                               \
-    ELSE_WIN_OS_IS_ANSI                                             \
-    {                                                               \
-        HANDLE temp, hproc = GetCurrentProcess();                   \
-        if (!DuplicateHandle(hproc, the##name->filehand,            \
-                             hproc, &temp, 0, FALSE,                \
-                             DUPLICATE_SAME_ACCESS))                \
-            return apr_get_os_error();                              \
-        CloseHandle(the##name->filehand);                           \
-        the##name->filehand = temp;                                 \
-    }                                                               \
-    return APR_SUCCESS;                                             \
-}                                                                   \
-/* Deprecated */                                                    \
-APR_DECLARE(void) apr_##name##_unset_inherit(apr_##name##_t *the##name) \
-{                                                                   \
-    apr_##name##_inherit_unset(the##name);                          \
-}
-
-#elif APR_HAS_ANSI_FS || defined(_WIN32_WCE)
-
-#define APR_IMPLEMENT_INHERIT_SET(name, flag, pool, cleanup)        \
-APR_DECLARE(apr_status_t) apr_##name##_inherit_set(apr_##name##_t *the##name) \
-{                                                                   \
-    HANDLE temp, hproc = GetCurrentProcess();                       \
-    if (!DuplicateHandle(hproc, the##name->filehand,                \
-                         hproc, &temp, 0, TRUE,                     \
-                         DUPLICATE_SAME_ACCESS))                    \
-        return apr_get_os_error();                                  \
-    CloseHandle(the##name->filehand);                               \
-    the##name->filehand = temp;                                     \
-    return APR_SUCCESS;                                             \
-}
-
-#define APR_IMPLEMENT_INHERIT_UNSET(name, flag, pool, cleanup)      \
-APR_DECLARE(apr_status_t) apr_##name##_inherit_unset(apr_##name##_t *the##name)\
-{                                                                   \
-    HANDLE temp, hproc = GetCurrentProcess();                       \
-    if (!DuplicateHandle(hproc, the##name->filehand,                \
-                         hproc, &temp, 0, FALSE,                    \
-                         DUPLICATE_SAME_ACCESS))                    \
-        return apr_get_os_error();                                  \
-    CloseHandle(the##name->filehand);                               \
-    the##name->filehand = temp;                                     \
-    return APR_SUCCESS;                                             \
-}
-
-#else /* APR_HAS_UNICODE_FS && !APR_HAS_ANSI_FS && !defined(_WIN32_WCE) */
-
-#define APR_IMPLEMENT_INHERIT_SET(name, flag, pool, cleanup)        \
-APR_DECLARE(apr_status_t) apr_##name##_inherit_set(apr_##name##_t *the##name) \
-{                                                                   \
-/*  if (!SetHandleInformation(the##name->filehand,                  \
- *                            HANDLE_FLAG_INHERIT,                  \
- *                            HANDLE_FLAG_INHERIT))                 \
- *      return apr_get_os_error();                                  \
- */ return APR_SUCCESS;                                             \
-}
-
-#define APR_IMPLEMENT_INHERIT_UNSET(name, flag, pool, cleanup)      \
-APR_DECLARE(apr_status_t) apr_##name##_inherit_unset(apr_##name##_t *the##name)\
-{                                                                   \
-/*  if (!SetHandleInformation(the##name->filehand,                  \
- *                            HANDLE_FLAG_INHERIT, 0))              \
- *      return apr_get_os_error();                                  \
- */ return APR_SUCCESS;                                             \
-}
-
-#endif /* defined(APR_HAS_UNICODE_FS) */
-
-#endif	/* ! INHERIT_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_misc.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_misc.h
deleted file mode 100644
index dc61ac61..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_misc.h
+++ /dev/null
@@ -1,324 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef MISC_H
-#define MISC_H
-
-#include "apr.h"
-#include "apr_portable.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_getopt.h"
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-#include "apr_errno.h"
-#include "apr_getopt.h"
-
-#if APR_HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if APR_HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-#if APR_HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
-
-/* ### create APR_HAVE_* macros for these? */
-#if APR_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#if APR_HAVE_STRING_H
-#include <string.h>
-#endif
-
-struct apr_other_child_rec_t {
-    apr_pool_t *p;
-    struct apr_other_child_rec_t *next;
-    apr_proc_t *proc;
-    void (*maintenance) (int, void *, int);
-    void *data;
-    apr_os_file_t write_fd;
-};
-
-#define WSAHighByte 2
-#define WSALowByte 0
-
-/* start.c and apr_app.c helpers and communication within misc.c
- *
- * They are not for public consumption, although apr_app_init_complete
- * must be an exported symbol to avoid reinitialization.
- */
-extern int APR_DECLARE_DATA apr_app_init_complete;
-
-int apr_wastrtoastr(char const * const * *retarr, 
-                    wchar_t const * const *arr, int args);
-
-/* Platform specific designation of run time os version.
- * Gaps allow for specific service pack levels that
- * export new kernel or winsock functions or behavior.
- */
-typedef enum {
-        APR_WIN_UNK =       0,
-        APR_WIN_UNSUP =     1,
-        APR_WIN_95 =       10,
-        APR_WIN_95_B =     11,
-        APR_WIN_95_OSR2 =  12,
-        APR_WIN_98 =       14,
-        APR_WIN_98_SE =    16,
-        APR_WIN_ME =       18,
-
-	APR_WIN_UNICODE =  20, /* Prior versions support only narrow chars */
-
-        APR_WIN_CE_3 =     23, /* CE is an odd beast, not supporting */
-                               /* some pre-NT features, such as the    */
-        APR_WIN_NT =       30, /* narrow charset APIs (fooA fns), while  */
-        APR_WIN_NT_3_5 =   35, /* not supporting some NT-family features.  */
-        APR_WIN_NT_3_51 =  36,
-
-        APR_WIN_NT_4 =     40,
-        APR_WIN_NT_4_SP2 = 42,
-        APR_WIN_NT_4_SP3 = 43,
-        APR_WIN_NT_4_SP4 = 44,
-        APR_WIN_NT_4_SP5 = 45,
-        APR_WIN_NT_4_SP6 = 46,
-
-        APR_WIN_2000 =     50,
-        APR_WIN_2000_SP1 = 51,
-        APR_WIN_2000_SP2 = 52,
-        APR_WIN_XP =       60
-} apr_oslevel_e;
-
-extern APR_DECLARE_DATA apr_oslevel_e apr_os_level;
-
-apr_status_t apr_get_oslevel(apr_oslevel_e *);
-
-/* The APR_HAS_ANSI_FS symbol is PRIVATE, and internal to APR.
- * APR only supports char data for filenames.  Like most applications,
- * characters >127 are essentially undefined.  APR_HAS_UNICODE_FS lets
- * the application know that utf-8 is the encoding method of APR, and
- * only incidently hints that we have Wide OS calls.
- *
- * APR_HAS_ANSI_FS is simply an OS flag to tell us all calls must be
- * the unicode eqivilant.
- */
-
-#if defined(_WIN32_WCE) || defined(WINNT)
-#define APR_HAS_ANSI_FS           0
-#else
-#define APR_HAS_ANSI_FS           1
-#endif
-
-/* IF_WIN_OS_IS_UNICODE / ELSE_WIN_OS_IS_ANSI help us keep the code trivial
- * where have runtime tests for unicode-ness, that aren't needed in any
- * build which supports only WINNT or WCE.
- */
-#if APR_HAS_ANSI_FS && APR_HAS_UNICODE_FS
-#define IF_WIN_OS_IS_UNICODE if (apr_os_level >= APR_WIN_UNICODE)
-#define ELSE_WIN_OS_IS_ANSI else
-#else /* APR_HAS_UNICODE_FS */
-#define IF_WIN_OS_IS_UNICODE
-#define ELSE_WIN_OS_IS_ANSI
-#endif /* WINNT */
-
-typedef enum {
-    DLL_WINBASEAPI = 0,    // kernel32 From WinBase.h
-    DLL_WINADVAPI = 1,     // advapi32 From WinBase.h
-    DLL_WINSOCKAPI = 2,    // mswsock  From WinSock.h
-    DLL_WINSOCK2API = 3,   // ws2_32   From WinSock2.h
-    DLL_SHSTDAPI = 4,      // shell32  From ShellAPI.h
-    DLL_NTDLL = 5,         // shell32  From our real kernel
-    DLL_defined = 6        // must define as last idx_ + 1
-} apr_dlltoken_e;
-
-FARPROC apr_load_dll_func(apr_dlltoken_e fnLib, char *fnName, int ordinal);
-
-/* The apr_load_dll_func call WILL fault if the function cannot be loaded */
-
-#define APR_DECLARE_LATE_DLL_FUNC(lib, rettype, calltype, fn, ord, args, names) \
-    typedef rettype (calltype *apr_winapi_fpt_##fn) args; \
-    static apr_winapi_fpt_##fn apr_winapi_pfn_##fn = NULL; \
-    __inline rettype apr_winapi_##fn args \
-    {   if (!apr_winapi_pfn_##fn) \
-            apr_winapi_pfn_##fn = (apr_winapi_fpt_##fn) \
-                                      apr_load_dll_func(lib, #fn, ord); \
-        return (*(apr_winapi_pfn_##fn)) names; }; \
-
-/* Provide late bound declarations of every API function missing from
- * one or more supported releases of the Win32 API
- *
- * lib is the enumerated token from apr_dlltoken_e, and must correspond
- * to the string table entry in start.c used by the apr_load_dll_func().
- * Token names (attempt to) follow Windows.h declarations prefixed by DLL_
- * in order to facilitate comparison.  Use the exact declaration syntax
- * and names from Windows.h to prevent ambigutity and bugs.
- *
- * rettype and calltype follow the original declaration in Windows.h
- * fn is the true function name - beware Ansi/Unicode #defined macros
- * ord is the ordinal within the library, use 0 if it varies between versions
- * args is the parameter list following the original declaration, in parens
- * names is the parameter list sans data types, enclosed in parens
- *
- * #undef/re#define the Ansi/Unicode generic name to abate confusion
- * In the case of non-text functions, simply #define the original name
- */
-
-#if !defined(_WIN32_WCE) && !defined(WINNT)
-
-#ifdef GetFileAttributesExA
-#undef GetFileAttributesExA
-#endif
-APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, GetFileAttributesExA, 0, (
-    IN LPCSTR lpFileName,
-    IN GET_FILEEX_INFO_LEVELS fInfoLevelId,
-    OUT LPVOID lpFileInformation),
-    (lpFileName, fInfoLevelId, lpFileInformation));
-#define GetFileAttributesExA apr_winapi_GetFileAttributesExA
-#undef GetFileAttributesEx
-#define GetFileAttributesEx apr_winapi_GetFileAttributesExA
-
-#ifdef GetFileAttributesExW
-#undef GetFileAttributesExW
-#endif
-APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, GetFileAttributesExW, 0, (
-    IN LPCWSTR lpFileName,
-    IN GET_FILEEX_INFO_LEVELS fInfoLevelId,
-    OUT LPVOID lpFileInformation),
-    (lpFileName, fInfoLevelId, lpFileInformation));
-#define GetFileAttributesExW apr_winapi_GetFileAttributesExW
-
-APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, CancelIo, 0, (
-    IN HANDLE hFile),
-    (hFile));
-#define CancelIo apr_winapi_CancelIo
-
-APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, TryEnterCriticalSection, 0, (
-    LPCRITICAL_SECTION lpCriticalSection),
-    (lpCriticalSection));
-#define TryEnterCriticalSection apr_winapi_TryEnterCriticalSection
-
-APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, SwitchToThread, 0, (
-    void),
-    ());
-#define SwitchToThread apr_winapi_SwitchToThread
-
-APR_DECLARE_LATE_DLL_FUNC(DLL_WINADVAPI, BOOL, WINAPI, GetEffectiveRightsFromAclW, 0, (
-    IN PACL pacl,
-    IN PTRUSTEE_W pTrustee,
-    OUT PACCESS_MASK pAccessRights),
-    (pacl, pTrustee, pAccessRights));
-#define GetEffectiveRightsFromAclW apr_winapi_GetEffectiveRightsFromAclW
-
-APR_DECLARE_LATE_DLL_FUNC(DLL_WINADVAPI, BOOL, WINAPI, GetNamedSecurityInfoW, 0, (
-    IN LPWSTR pObjectName,
-    IN SE_OBJECT_TYPE ObjectType,
-    IN SECURITY_INFORMATION SecurityInfo,
-    OUT PSID *ppsidOwner,
-    OUT PSID *ppsidGroup,
-    OUT PACL *ppDacl,
-    OUT PACL *ppSacl,
-    OUT PSECURITY_DESCRIPTOR *ppSecurityDescriptor),
-    (pObjectName, ObjectType, SecurityInfo, ppsidOwner, ppsidGroup, 
-	 ppDacl, ppSacl, ppSecurityDescriptor));
-#define GetNamedSecurityInfoW apr_winapi_GetNamedSecurityInfoW
-
-APR_DECLARE_LATE_DLL_FUNC(DLL_WINADVAPI, BOOL, WINAPI, GetNamedSecurityInfoA, 0, (
-    IN LPSTR pObjectName,
-    IN SE_OBJECT_TYPE ObjectType,
-    IN SECURITY_INFORMATION SecurityInfo,
-    OUT PSID *ppsidOwner,
-    OUT PSID *ppsidGroup,
-    OUT PACL *ppDacl,
-    OUT PACL *ppSacl,
-    OUT PSECURITY_DESCRIPTOR *ppSecurityDescriptor),
-    (pObjectName, ObjectType, SecurityInfo, ppsidOwner, ppsidGroup, 
-	 ppDacl, ppSacl, ppSecurityDescriptor));
-#define GetNamedSecurityInfoA apr_winapi_GetNamedSecurityInfoA
-#undef GetNamedSecurityInfo
-#define GetNamedSecurityInfo apr_winapi_GetNamedSecurityInfoA
-
-APR_DECLARE_LATE_DLL_FUNC(DLL_WINADVAPI, BOOL, WINAPI, GetSecurityInfo, 0, (
-    IN HANDLE handle,
-    IN SE_OBJECT_TYPE ObjectType,
-    IN SECURITY_INFORMATION SecurityInfo,
-    OUT PSID *ppsidOwner,
-    OUT PSID *ppsidGroup,
-    OUT PACL *ppDacl,
-    OUT PACL *ppSacl,
-    OUT PSECURITY_DESCRIPTOR *ppSecurityDescriptor),
-    (handle, ObjectType, SecurityInfo, ppsidOwner, ppsidGroup, 
-	 ppDacl, ppSacl, ppSecurityDescriptor));
-#define GetSecurityInfo apr_winapi_GetSecurityInfo
-
-APR_DECLARE_LATE_DLL_FUNC(DLL_SHSTDAPI, LPWSTR *, WINAPI, CommandLineToArgvW, 0, (
-    LPCWSTR lpCmdLine, 
-    int *pNumArgs),
-    (lpCmdLine, pNumArgs));
-#define CommandLineToArgvW apr_winapi_CommandLineToArgvW
-
-#endif /* !defined(_WIN32_WCE) && !defined(WINNT) */
-
-#if !defined(_WIN32_WCE)
-
-APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, DWORD, WINAPI, NtQueryTimerResolution, 0, (
-    ULONG *pMaxRes,  /* Minimum NS Resolution */
-    ULONG *pMinRes,  /* Maximum NS Resolution */
-    ULONG *pCurRes), /* Current NS Resolution */
-    (pMaxRes, pMinRes, pCurRes));
-#define QueryTimerResolution apr_winapi_NtQueryTimerResolution
-
-APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, DWORD, WINAPI, NtSetTimerResolution, 0, (
-    ULONG ReqRes,    /* Requested NS Clock Resolution */
-    BOOL  Acquire,   /* Aquire (1) or Release (0) our interest */
-    ULONG *pNewRes), /* The NS Clock Resolution granted */
-    (ReqRes, Acquire, pNewRes));
-#define SetTimerResolution apr_winapi_NtSetTimerResolution
-
-/* ### These are ULONG_PTR values, but that's int32 for all we care
- * until the Win64 port is prepared.
- */
-typedef struct PBI {
-    DWORD ExitStatus;
-    PVOID PebBaseAddress;
-    ULONG AffinityMask;
-    LONG  BasePriority;
-    ULONG UniqueProcessId;
-    ULONG InheritedFromUniqueProcessId;
-} PBI, *PPBI;
-
-APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, DWORD, WINAPI, NtQueryInformationProcess, 0, (
-    HANDLE hProcess,  /* Obvious */
-    INT   info,       /* Use 0 for PBI documented above */
-    PVOID pPI,        /* The PIB buffer */
-    ULONG LenPI,      /* Use sizeof(PBI) */
-    ULONG *pSizePI),  /* returns pPI buffer used (may pass NULL) */
-    (hProcess, info, pPI, LenPI, pSizePI));
-#define QueryInformationProcess apr_winapi_NtQueryInformationProcess
-
-APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, DWORD, WINAPI, NtQueryObject, 0, (
-    HANDLE hObject,   /* Obvious */
-    INT   info,       /* Use 0 for PBI documented above */
-    PVOID pOI,        /* The PIB buffer */
-    ULONG LenOI,      /* Use sizeof(PBI) */
-    ULONG *pSizeOI),  /* returns pPI buffer used (may pass NULL) */
-    (hObject, info, pOI, LenOI, pSizeOI));
-#define QueryObject apr_winapi_NtQueryObject
-
-#endif /* !defined(_WIN32_WCE) */
-
-#endif  /* ! MISC_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_networkio.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_networkio.h
deleted file mode 100644
index be6edc5b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_networkio.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef NETWORK_IO_H
-#define NETWORK_IO_H
-
-#include "apr_network_io.h"
-#include "apr_general.h"
-
-typedef struct sock_userdata_t sock_userdata_t;
-struct sock_userdata_t {
-    sock_userdata_t *next;
-    const char *key;
-    void *data;
-};
-
-struct apr_socket_t {
-    apr_pool_t         *cntxt;
-    SOCKET              socketdes;
-    int                 type; /* SOCK_STREAM, SOCK_DGRAM */
-    int                 protocol;
-    apr_sockaddr_t     *local_addr;
-    apr_sockaddr_t     *remote_addr;
-    int                 timeout_ms; /* MUST MATCH if timeout > 0 */
-    apr_interval_time_t timeout;
-    apr_int32_t         disconnected;
-    int                 local_port_unknown;
-    int                 local_interface_unknown;
-    int                 remote_addr_unknown;
-    apr_int32_t         netmask;
-    apr_int32_t         inherit;
-#if APR_HAS_SENDFILE
-    /* As of 07.20.04, the overlapped structure is only used by 
-     * apr_socket_sendfile and that's where it will be allocated 
-     * and initialized.
-     */
-    OVERLAPPED         *overlapped;
-#endif
-    sock_userdata_t    *userdata;
-};
-
-#ifdef _WIN32_WCE
-#ifndef WSABUF
-typedef struct _WSABUF {
-    u_long      len;     /* the length of the buffer */
-    char FAR *  buf;     /* the pointer to the buffer */
-} WSABUF, FAR * LPWSABUF;
-#endif
-#endif
-
-apr_status_t status_from_res_error(int);
-
-const char *apr_inet_ntop(int af, const void *src, char *dst, apr_size_t size);
-int apr_inet_pton(int af, const char *src, void *dst);
-void apr_sockaddr_vars_set(apr_sockaddr_t *, int, apr_port_t);
-
-#define apr_is_option_set(mask, option)  ((mask & option) ==option)
-#define apr_set_option(mask, option, on) \
-    do {                                 \
-        if (on)                          \
-            *mask |= option;             \
-        else                             \
-            *mask &= ~option;            \
-    } while (0)
-
-#endif  /* ! NETWORK_IO_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_proc_mutex.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_proc_mutex.h
deleted file mode 100644
index 4e3e3993..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_proc_mutex.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef PROC_MUTEX_H
-#define PROC_MUTEX_H
-
-#include "apr_proc_mutex.h"
-
-struct apr_proc_mutex_t {
-    apr_pool_t *pool;
-    HANDLE handle;
-    const char *fname;
-};
-
-#endif  /* PROC_MUTEX_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_thread_cond.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_thread_cond.h
deleted file mode 100644
index 840949c2..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_thread_cond.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef THREAD_COND_H
-#define THREAD_COND_H
-
-#include "apr_thread_cond.h"
-
-struct apr_thread_cond_t {
-    apr_pool_t *pool;
-    HANDLE event;
-    int signal_all;
-    int num_waiting;
-    int signalled;
-};
-
-#endif  /* THREAD_COND_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_thread_mutex.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_thread_mutex.h
deleted file mode 100644
index 13d3c1cb..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_thread_mutex.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef THREAD_MUTEX_H
-#define THREAD_MUTEX_H
-
-#include "apr_pools.h"
-
-typedef enum thread_mutex_type {
-    thread_mutex_critical_section,
-    thread_mutex_unnested_event,
-    thread_mutex_nested_mutex
-} thread_mutex_type;
-
-/* handle applies only to unnested_event on all platforms 
- * and nested_mutex on Win9x only.  Otherwise critical_section 
- * is used for NT nexted mutexes providing optimal performance.
- */
-struct apr_thread_mutex_t {
-    apr_pool_t       *pool;
-    thread_mutex_type type;
-    HANDLE            handle;
-    CRITICAL_SECTION  section;
-};
-
-#endif  /* THREAD_MUTEX_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_thread_rwlock.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_thread_rwlock.h
deleted file mode 100644
index 1177e529..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_thread_rwlock.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef THREAD_RWLOCK_H
-#define THREAD_RWLOCK_H
-
-#include "apr_thread_rwlock.h"
-
-struct apr_thread_rwlock_t {
-    apr_pool_t *pool;
-    HANDLE      write_mutex;
-    HANDLE      read_event;
-    LONG        readers;
-};
-
-#endif  /* THREAD_RWLOCK_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_threadproc.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_threadproc.h
deleted file mode 100644
index d5e43fd1..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_threadproc.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_private.h"
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-
-#ifndef THREAD_PROC_H
-#define THREAD_PROC_H
-
-#define SHELL_PATH "cmd.exe"
-
-struct apr_thread_t {
-    apr_pool_t *pool;
-    HANDLE td;
-    apr_int32_t cancel;
-    apr_int32_t cancel_how;
-    void *data;
-    apr_thread_start_t func;
-    apr_status_t exitval;
-};
-
-struct apr_threadattr_t {
-    apr_pool_t *pool;
-    apr_int32_t detach;
-    apr_size_t stacksize;
-};
-
-struct apr_threadkey_t {
-    apr_pool_t *pool;
-    DWORD key;
-};
-
-struct apr_procattr_t {
-    apr_pool_t *pool;
-    apr_file_t *parent_in;
-    apr_file_t *child_in;
-    apr_file_t *parent_out;
-    apr_file_t *child_out;
-    apr_file_t *parent_err;
-    apr_file_t *child_err;
-    char *currdir;
-    apr_int32_t cmdtype;
-    apr_int32_t detached;
-    apr_child_errfn_t *errfn;
-    apr_int32_t errchk;
-};
-
-struct apr_thread_once_t {
-    long value;
-};
-
-extern apr_status_t apr_threadproc_init(apr_pool_t *pool);
-
-#endif  /* ! THREAD_PROC_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_utf8.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_utf8.h
deleted file mode 100644
index 84f8bf77..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_arch_utf8.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef UTF8_H
-#define UTF8_H
-
-#include "apr.h"
-#include "apr_lib.h"
-#include "apr_errno.h"
-
-/* If we ever support anything more exciting than char... this could move.
- */
-typedef apr_uint16_t apr_wchar_t;
-
-/**
- * An APR internal function for fast utf-8 octet-encoded Unicode conversion
- * to the ucs-2 wide Unicode format.  This function is used for filename and 
- * other resource conversions for platforms providing native Unicode support.
- *
- * @tip Only the errors APR_EINVAL and APR_INCOMPLETE may occur, the former
- * when the character code is invalid (in or out of context) and the later
- * when more characters were expected, but insufficient characters remain.
- */
-APR_DECLARE(apr_status_t) apr_conv_utf8_to_ucs2(const char *in, 
-                                                apr_size_t *inbytes,
-                                                apr_wchar_t *out, 
-                                                apr_size_t *outwords);
-
-/**
- * An APR internal function for fast ucs-2 wide Unicode format conversion to 
- * the utf-8 octet-encoded Unicode.  This function is used for filename and 
- * other resource conversions for platforms providing native Unicode support.
- *
- * @tip Only the errors APR_EINVAL and APR_INCOMPLETE may occur, the former
- * when the character code is invalid (in or out of context) and the later
- * when more words were expected, but insufficient words remain.
- */
-APR_DECLARE(apr_status_t) apr_conv_ucs2_to_utf8(const apr_wchar_t *in, 
-                                                apr_size_t *inwords,
-                                                char *out, 
-                                                apr_size_t *outbytes);
-
-#endif /* def UTF8_H */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_dbg_win32_handles.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_dbg_win32_handles.h
deleted file mode 100644
index 471cd66d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_dbg_win32_handles.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_DBG_WIN32_HANDLES_H
-#define APR_DBG_WIN32_HANDLES_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* USAGE:
- * 
- * Add the following include to apr_private.h for internal debugging,
- * or copy this header into apr/include add the include below to apr.h
- * for really global debugging;
- *
- *   #include "apr_dbg_win32_handles.h"
- *
- * apr_dbg_log is the crux of this function ... it uses Win32 API and
- * no apr calls itself to log all activity to a file named for the
- * executing application with a .pid suffix.  Ergo several instances
- * may be executing and logged at once.
- *
- * HANDLE apr_dbg_log(char* fn, HANDLE ha, char* fl, int ln, int nh 
- *                           [, HANDLE *hv, char *dsc...])
- *
- * returns: the handle passed in ha, which is cast back to the real return type.
- *
- * formats one line into the debug log file if nh is zero;
- * ha (hex) seq(hex) tid(hex) fn     fl         ln
- * xxxxxxxx xxxxxxxx xxxxxxxx func() sourcefile:lineno
- * The macro apr_dbg_rv makes this simple to implement for many APIs
- * that simply take args that don't interest us, and return a handle.
- *
- * formats multiple lines (nh) into the debug log file for each hv/dsc pair
- * (nh must correspond to the number of pairs);
- * hv (hex) seq(hex) tid(hex) fn   dsc  fl         ln
- * xxxxxxxx xxxxxxxx xxxxxxxx func(arg) sourcefile:lineno
- * In this later usage, hv is the still the return value but is not
- * treated as a handle.
- */
-
-APR_DECLARE_NONSTD(HANDLE) apr_dbg_log(char* fn, HANDLE ha, char* fl, int ln, 
-                                       int nh,/* HANDLE *hv, char *dsc */...);
-
-#define apr_dbg_rv(fn, args) (apr_dbg_log(#fn,(fn) args,__FILE__,__LINE__,0))
-
-#define CloseHandle(h) \
-    ((BOOL)apr_dbg_log("CloseHandle", \
-                       (HANDLE)(CloseHandle)(h), \
-                       __FILE__,__LINE__,1, \
-                       &(h),""))
-
-#define CreateEventA(sd,b1,b2,nm) apr_dbg_rv(CreateEventA,(sd,b1,b2,nm))
-#define CreateEventW(sd,b1,b2,nm) apr_dbg_rv(CreateEventW,(sd,b1,b2,nm))
-
-#define CreateFileA(nm,d1,d2,sd,d3,d4,h) apr_dbg_rv(CreateFileA,(nm,d1,d2,sd,d3,d4,h))
-#define CreateFileW(nm,d1,d2,sd,d3,d4,h) apr_dbg_rv(CreateFileW,(nm,d1,d2,sd,d3,d4,h))
-
-#define CreateFileMappingA(fh,sd,d1,d2,d3,nm) apr_dbg_rv(CreateFileMappingA,(fh,sd,d1,d2,d3,nm))
-#define CreateFileMappingW(fh,sd,d1,d2,d3,nm) apr_dbg_rv(CreateFileMappingW,(fh,sd,d1,d2,d3,nm))
-
-#define CreateMutexA(sd,b,nm) apr_dbg_rv(CreateMutexA,(sd,b,nm))
-#define CreateMutexW(sd,b,nm) apr_dbg_rv(CreateMutexW,(sd,b,nm))
-
-#define CreateIoCompletionPort(h1,h2,pd1,d2) apr_dbg_rv(CreateIoCompletionPort,(h1,h2,pd1,d2))
-
-#define CreateNamedPipeA(nm,d1,d2,d3,d4,d5,d6,sd) apr_dbg_rv(CreateNamedPipeA,(nm,d1,d2,d3,d4,d5,d6,sd))
-#define CreateNamedPipeW(nm,d1,d2,d3,d4,d5,d6,sd) apr_dbg_rv(CreateNamedPipeW,(nm,d1,d2,d3,d4,d5,d6,sd))
-
-#define CreatePipe(ph1,ph2,sd,d) \
-    ((BOOL)apr_dbg_log("CreatePipe", \
-                       (HANDLE)(CreatePipe)(ph1,ph2,sd,d), \
-                       __FILE__,__LINE__,2, \
-                       (ph1),"hRead", \
-                       (ph2),"hWrite"))
-
-#define CreateProcessA(s1,s2,sd1,sd2,b,d1,s3,s4,pd2,hr) \
-    ((BOOL)apr_dbg_log("CreateProcessA", \
-                       (HANDLE)(CreateProcessA)(s1,s2,sd1,sd2,b,d1,s3,s4,pd2,hr), \
-                       __FILE__,__LINE__,2, \
-                       &((hr)->hProcess),"hProcess", \
-                       &((hr)->hThread),"hThread"))
-#define CreateProcessW(s1,s2,sd1,sd2,b,d1,s3,s4,pd2,hr) \
-    ((BOOL)apr_dbg_log("CreateProcessW", \
-                       (HANDLE)(CreateProcessW)(s1,s2,sd1,sd2,b,d1,s3,s4,pd2,hr), \
-                       __FILE__,__LINE__,2, \
-                       &((hr)->hProcess),"hProcess", \
-                       &((hr)->hThread),"hThread"))
-
-#define CreateSemaphoreA(sd,d1,d2,nm) apr_dbg_rv(CreateSemaphoreA,(sd,d1,d2,nm))
-#define CreateSemaphoreW(sd,d1,d2,nm) apr_dbg_rv(CreateSemaphoreW,(sd,d1,d2,nm))
-
-#define CreateThread(sd,d1,fn,pv,d2,pd3) apr_dbg_rv(CreateThread,(sd,d1,fn,pv,d2,pd3))
-
-#define DeregisterEventSource(h) \
-    ((BOOL)apr_dbg_log("DeregisterEventSource", \
-                       (HANDLE)(DeregisterEventSource)(h), \
-                       __FILE__,__LINE__,1, \
-                       &(h),""))
-
-#define DuplicateHandle(h1,h2,h3,ph4,d1,b,d2) \
-    ((BOOL)apr_dbg_log("DuplicateHandle", \
-                       (HANDLE)(DuplicateHandle)(h1,h2,h3,ph4,d1,b,d2), \
-                       __FILE__,__LINE__,2, \
-                       (ph4),((h3)==GetCurrentProcess()) \
-                                   ? "Target" : "EXTERN Target", \
-                       &(h2),((h1)==GetCurrentProcess()) \
-                                 ? "Source" : "EXTERN Source"))
-
-#define GetCurrentProcess() \
-    (apr_dbg_log("GetCurrentProcess", \
-                 (GetCurrentProcess)(),__FILE__,__LINE__,0))
-
-#define GetCurrentThread() \
-    (apr_dbg_log("GetCurrentThread", \
-                 (GetCurrentThread)(),__FILE__,__LINE__,0))
-
-#define GetModuleHandleA(nm) apr_dbg_rv(GetModuleHandleA,(nm))
-#define GetModuleHandleW(nm) apr_dbg_rv(GetModuleHandleW,(nm))
-
-#define GetStdHandle(d) apr_dbg_rv(GetStdHandle,(d))
-
-#define LoadLibraryA(nm) apr_dbg_rv(LoadLibraryA,(nm))
-#define LoadLibraryW(nm) apr_dbg_rv(LoadLibraryW,(nm))
-
-#define LoadLibraryExA(nm,h,d) apr_dbg_rv(LoadLibraryExA,(nm,h,d))
-#define LoadLibraryExW(nm,h,d) apr_dbg_rv(LoadLibraryExW,(nm,h,d))
-
-#define OpenEventA(d,b,nm) apr_dbg_rv(OpenEventA,(d,b,nm))
-#define OpenEventW(d,b,nm) apr_dbg_rv(OpenEventW,(d,b,nm))
-
-#define OpenFileMappingA(d,b,nm) apr_dbg_rv(OpenFileMappingA,(d,b,nm))
-#define OpenFileMappingW(d,b,nm) apr_dbg_rv(OpenFileMappingW,(d,b,nm))
-
-#define RegisterEventSourceA(s1,s2) apr_dbg_rv(RegisterEventSourceA,(s1,s2))
-#define RegisterEventSourceW(s1,s2) apr_dbg_rv(RegisterEventSourceW,(s1,s2))
-
-#define SetEvent(h) \
-    ((BOOL)apr_dbg_log("SetEvent", \
-                       (HANDLE)(SetEvent)(h), \
-                       __FILE__,__LINE__,1, \
-                       &(h),""))
-
-#define SetStdHandle(d,h) \
-    ((BOOL)apr_dbg_log("SetStdHandle", \
-                       (HANDLE)(SetStdHandle)(d,h), \
-                       __FILE__,__LINE__,1,&(h),""))
-
-#define socket(i1,i2,i3) \
-    ((SOCKET)apr_dbg_log("socket", \
-                         (HANDLE)(socket)(i1,i2,i3), \
-                       __FILE__,__LINE__,0))
-
-#define WaitForSingleObject(h,d) \
-    ((DWORD)apr_dbg_log("WaitForSingleObject", \
-                        (HANDLE)(WaitForSingleObject)(h,d), \
-                        __FILE__,__LINE__,1,&(h),"Signaled"))
-
-#define WaitForSingleObjectEx(h,d,b) \
-    ((DWORD)apr_dbg_log("WaitForSingleObjectEx", \
-                        (HANDLE)(WaitForSingleObjectEx)(h,d,b), \
-                        __FILE__,__LINE__,1,&(h),"Signaled"))
-
-#define WaitForMultipleObjects(d1,ah,b,d2) \
-    ((DWORD)apr_dbg_log("WaitForMultipleObjects", \
-                        (HANDLE)(WaitForMultipleObjects)(d1,ah,b,d2), \
-                        __FILE__,__LINE__,1,ah,"Signaled"))
-
-#define WaitForMultipleObjectsEx(d1,ah,b1,d2,b2) \
-    ((DWORD)apr_dbg_log("WaitForMultipleObjectsEx", \
-                        (HANDLE)(WaitForMultipleObjectsEx)(d1,ah,b1,d2,b2), \
-                        __FILE__,__LINE__,1,ah,"Signaled"))
-
-#define WSASocketA(i1,i2,i3,pi,g,dw) \
-    ((SOCKET)apr_dbg_log("WSASocketA", \
-                         (HANDLE)(WSASocketA)(i1,i2,i3,pi,g,dw), \
-                       __FILE__,__LINE__,0))
-
-#define WSASocketW(i1,i2,i3,pi,g,dw) \
-    ((SOCKET)apr_dbg_log("WSASocketW", \
-                         (HANDLE)(WSASocketW)(i1,i2,i3,pi,g,dw), \
-                       __FILE__,__LINE__,0))
-
-#define closesocket(sh) \
-    ((int)apr_dbg_log("closesocket", \
-                      (HANDLE)(closesocket)(sh), \
-                      __FILE__,__LINE__,1,&(sh),""))
-
-#define _beginthread(fn,d,pv) \
-    ((unsigned long)apr_dbg_log("_beginthread", \
-                                (HANDLE)(_beginthread)(fn,d,pv), \
-                                __FILE__,__LINE__,0))
-
-#define _beginthreadex(sd,d1,fn,pv,d2,pd3) \
-    ((unsigned long)apr_dbg_log("_beginthreadex", \
-                                (HANDLE)(_beginthreadex)(sd,d1,fn,pv,d2,pd3), \
-                                __FILE__,__LINE__,0))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !defined(APR_DBG_WIN32_HANDLES_H) */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_private.h b/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_private.h
deleted file mode 100644
index 40a7f750..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/include/arch/win32/apr_private.h
+++ /dev/null
@@ -1,151 +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.
- */
-
-/*
- * Note: 
- * This is the windows specific autoconf-like config file
- * which unix would create at build time.
- */
-
-#ifdef WIN32
-
-#ifndef APR_PRIVATE_H
-#define APR_PRIVATE_H
-
-/* Include the public APR symbols, include our idea of the 'right'
- * subset of the Windows.h header.  This saves us repetition.
- */
-#include "apr.h"
-
-/* 
- * Add a _very_few_ declarations missing from the restricted set of headers
- * (If this list becomes extensive, re-enable the required headers above!)
- * winsock headers were excluded by WIN32_LEAN_AND_MEAN, so include them now
- */
-#ifndef SW_HIDE
-#define SW_HIDE             0
-#endif
-
-/* For the misc.h late-loaded dynamic symbols, we need some obscure types 
- * Avoid dragging in wtypes.h unless it's absolutely necessary [generally
- * not with APR itself, until some GUI-related security is introduced.]
- */
-#ifndef _WIN32_WCE
-#define HAVE_ACLAPI 1
-#ifdef __wtypes_h__
-#include <accctrl.h>
-#else
-#define __wtypes_h__
-#include <accctrl.h>
-#undef __wtypes_h__
-#endif
-#else
-#define HAVE_ACLAPI 0
-#endif
-
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if APR_HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-#include <stdio.h>
-#if APR_HAVE_TIME_H
-#include <time.h>
-#endif
-
-/* Use this section to define all of the HAVE_FOO_H
- * that are required to build properly.
- */
-#define HAVE_LIMITS_H 1
-#define HAVE_MALLOC_H 1
-#define HAVE_SIGNAL_H 1
-/* #define HAVE_STDDEF_H 1 why not? */
-#define HAVE_STDLIB_H 1
-
-#define HAVE_STRICMP  1
-#define HAVE_STRNICMP 1
-#define HAVE_STRDUP   1
-#define HAVE_STRSTR   1
-#define HAVE_MEMCHR   1
-
-#define SIGHUP     1
-/* 2 is used for SIGINT on windows */
-#define SIGQUIT    3
-/* 4 is used for SIGILL on windows */
-#define SIGTRAP    5
-#define SIGIOT     6
-#define SIGBUS     7
-/* 8 is used for SIGFPE on windows */
-#define SIGKILL    9
-#define SIGUSR1    10
-/* 11 is used for SIGSEGV on windows */
-#define SIGUSR2    12
-#define SIGPIPE    13
-#define SIGALRM    14
-/* 15 is used for SIGTERM on windows */
-#define SIGSTKFLT  16
-#define SIGCHLD    17 
-#define SIGCONT    18
-#define SIGSTOP    19
-#define SIGTSTP    20
-/* 21 is used for SIGBREAK on windows */
-/* 22 is used for SIGABRT on windows */
-#define SIGTTIN    23
-#define SIGTTOU    24
-#define SIGURG     25
-#define SIGXCPU    26
-#define SIGXFSZ    27
-#define SIGVTALRM  28
-#define SIGPROF    29
-#define SIGWINCH   30
-#define SIGIO      31
-
-/* APR COMPATABILITY FUNCTIONS
- * This section should be used to define functions and
- * macros which are need to make Windows features look
- * like POSIX features.
- */
-typedef void (Sigfunc)(int);
-
-#define sleep(t)                 Sleep((t) * 1000)
-
-#define SIZEOF_SHORT           2
-#define SIZEOF_INT             4
-#define SIZEOF_LONGLONG        8
-#define SIZEOF_CHAR            1
-#define SIZEOF_SSIZE_T         SIZEOF_INT
-
-unsigned __stdcall SignalHandling(void *);
-int thread_ready(void);
-
-#if !APR_HAVE_ERRNO_H
-APR_DECLARE_DATA int errno;
-#define ENOSPC 1
-#endif
-
-#if APR_HAVE_IPV6
-#define HAVE_GETADDRINFO 1
-#define HAVE_GETNAMEINFO 1
-#endif
-
-/*
- * Include common private declarations.
- */
-#include "../apr_private_common.h"
-
-#endif  /*APR_PRIVATE_H*/
-#endif  /*WIN32*/
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/libapr-0.la b/rubbos/app/httpd-2.0.64/srclib/apr/libapr-0.la
deleted file mode 100644
index 213c75df..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/libapr-0.la
+++ /dev/null
@@ -1,35 +0,0 @@
-# libapr-0.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libapr-0.so.0'
-
-# Names of this library.
-library_names='libapr-0.so.0.9.19 libapr-0.so.0 libapr-0.so'
-
-# The name of the static archive.
-old_library='libapr-0.a'
-
-# Libraries that this one depends upon.
-dependency_libs=' -lrt -lm -lcrypt -lnsl -lpthread -ldl'
-
-# Version information for libapr-0.
-current=9
-age=9
-revision=19
-
-# Is this an already installed library?
-installed=no
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/bottlenecks/rubbos/app/apache2/lib'
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/libapr.dsp b/rubbos/app/httpd-2.0.64/srclib/apr/libapr.dsp
deleted file mode 100644
index c394aafe..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/libapr.dsp
+++ /dev/null
@@ -1,653 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libapr" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=libapr - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libapr.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libapr.mak" CFG="libapr - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libapr - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libapr - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libapr - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Release\libapr_src" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG" /d "APR_VERSION_ONLY" /I "./include"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /opt:ref
-# Begin Special Build Tool
-OutDir=.\Release
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(OUTDIR)\libapr.dll.manifest mt.exe -manifest $(OUTDIR)\libapr.dll.manifest -outputresource:$(OUTDIR)\libapr.dll;2
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "libapr - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Debug\libapr_src" /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG" /d "APR_VERSION_ONLY" /I "./include"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug
-# Begin Special Build Tool
-OutDir=.\Debug
-SOURCE="$(InputPath)"
-PostBuild_Desc=Embed .manifest
-PostBuild_Cmds=if exist $(OUTDIR)\libapr.dll.manifest mt.exe -manifest $(OUTDIR)\libapr.dll.manifest -outputresource:$(OUTDIR)\libapr.dll;2
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libapr - Win32 Release"
-# Name "libapr - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ".c"
-# Begin Group "dso"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\dso\win32\dso.c
-# End Source File
-# End Group
-# Begin Group "file_io"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\file_io\unix\copy.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\win32\dir.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\unix\fileacc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\win32\filedup.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\win32\filepath.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\unix\filepath_util.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\win32\filestat.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\win32\filesys.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\win32\flock.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\unix\fullrw.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\unix\mktemp.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\win32\open.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\win32\pipe.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\win32\readwrite.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\win32\seek.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\unix\tempdir.c
-# End Source File
-# End Group
-# Begin Group "locks"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\locks\win32\proc_mutex.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\locks\win32\thread_cond.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\locks\win32\thread_mutex.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\locks\win32\thread_rwlock.c
-# End Source File
-# End Group
-# Begin Group "memory"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\memory\unix\apr_pools.c
-# End Source File
-# End Group
-# Begin Group "misc"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\misc\win32\apr_app.c
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\win32\charset.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\win32\env.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\unix\errorcodes.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\unix\getopt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\win32\internal.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\win32\misc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\unix\otherchild.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\win32\rand.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\win32\start.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\win32\utf8.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\misc\unix\version.c
-# End Source File
-# End Group
-# Begin Group "mmap"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\mmap\unix\common.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mmap\win32\mmap.c
-# End Source File
-# End Group
-# Begin Group "network_io"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\network_io\unix\inet_ntop.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\network_io\unix\inet_pton.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\poll\unix\poll.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\poll\unix\pollacc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\network_io\win32\sendrecv.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\network_io\unix\sockaddr.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\network_io\win32\sockets.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\network_io\win32\sockopt.c
-# End Source File
-# End Group
-# Begin Group "passwd"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\passwd\apr_getpass.c
-# End Source File
-# End Group
-# Begin Group "shmem"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\shmem\win32\shm.c
-# End Source File
-# End Group
-# Begin Group "strings"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\strings\apr_cpystrn.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\strings\apr_fnmatch.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\strings\apr_snprintf.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\strings\apr_strings.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\strings\apr_strnatcmp.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\strings\apr_strtok.c
-# End Source File
-# End Group
-# Begin Group "tables"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\tables\apr_hash.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tables\apr_tables.c
-# End Source File
-# End Group
-# Begin Group "threadproc"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\threadproc\win32\proc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\threadproc\win32\signals.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\threadproc\win32\thread.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\threadproc\win32\threadpriv.c
-# End Source File
-# End Group
-# Begin Group "time"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\time\win32\access.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\time\win32\time.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\time\win32\timestr.c
-# End Source File
-# End Group
-# Begin Group "user"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\user\win32\groupinfo.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\user\win32\userinfo.c
-# End Source File
-# End Group
-# End Group
-# Begin Group "Private Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_arch_atime.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_arch_dso.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_arch_file_io.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_arch_inherit.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_arch_misc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_arch_networkio.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_arch_thread_mutex.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_arch_thread_rwlock.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_arch_threadproc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_arch_utf8.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\win32\apr_private.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\arch\apr_private_common.h
-# End Source File
-# End Group
-# Begin Group "Public Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\include\apr.h.in
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr.hnw
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr.hw
-
-!IF  "$(CFG)" == "libapr - Win32 Release"
-
-# Begin Custom Build - Creating apr.h from apr.hw
-InputPath=.\include\apr.hw
-
-".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	type .\include\apr.hw > .\include\apr.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "libapr - Win32 Debug"
-
-# Begin Custom Build - Creating apr.h from apr.hw
-InputPath=.\include\apr.hw
-
-".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	type .\include\apr.hw > .\include\apr.h
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_allocator.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_atomic.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_compat.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_dso.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_env.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_errno.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_file_info.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_file_io.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_fnmatch.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_general.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_getopt.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_global_mutex.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_hash.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_inherit.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_lib.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_mmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_network_io.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_poll.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_pools.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_portable.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_proc_mutex.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_ring.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_shm.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_signal.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_strings.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_support.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_tables.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_thread_cond.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_thread_mutex.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_thread_proc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_thread_rwlock.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_time.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_user.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_version.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\apr_want.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\libapr.rc
-# End Source File
-# End Target
-# End Project
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/libapr.rc b/rubbos/app/httpd-2.0.64/srclib/apr/libapr.rc
deleted file mode 100644
index 207b8b58..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/libapr.rc
+++ /dev/null
@@ -1,73 +0,0 @@
-#include "apr_general.h"
-#include "apr_version.h"
-
-#define APR_COPYRIGHT "Copyright (c) 2009 The Apache Software " \
-                      "Foundation or its licensors, as applicable."
-
-#define APR_LICENSE "Licensed under the Apache License, Version 2.0 " \
-                    "(the ""License""); you may not use this file except " \
-                    "in compliance with the License.  You may obtain a " \
-                    "copy of the License at\r\n\r\n" \
-                    "http://www.apache.org/licenses/LICENSE-2.0\r\n\r\n" \
-                    "Unless required by applicable law or agreed to in " \
-                    "writing, software distributed under the License is " \
-                    "distributed on an ""AS IS"" BASIS, WITHOUT " \
-                    "WARRANTIES OR CONDITIONS OF ANY KIND, either " \
-                    "express or implied.  See the License for the " \
-                    "specific language governing permissions and " \
-                    "limitations under the License."
-
-#define APR_DLL_BASENAME "libapr"
-
-/** An alternative formatted string of APR's version */
-/* macro for Win32 .rc files using numeric csv representation */
-#define APR_VERSION_STRING_CSV APR_MAJOR_VERSION ##, \
-                             ##APR_MINOR_VERSION ##, \
-                             ##APR_PATCH_VERSION
-
-
-1 VERSIONINFO
- FILEVERSION APR_VERSION_STRING_CSV,0
- PRODUCTVERSION APR_VERSION_STRING_CSV,0
- FILEFLAGSMASK 0x3fL
-#if defined(APR_IS_DEV_VERSION)
-#if defined(_DEBUG)
- FILEFLAGS 0x03L
-#else
- FILEFLAGS 0x02L
-#endif
-#else
-#if defined(_DEBUG)
- FILEFLAGS 0x01L
-#else
- FILEFLAGS 0x00L
-#endif
-#endif
-#if defined(WINNT) || defined(WIN64)
- FILEOS 0x40004L
-#else
- FILEOS 0x4L
-#endif
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904b0"
-    BEGIN
-      VALUE "Comments", APR_LICENSE "\0"
-      VALUE "CompanyName", "Apache Software Foundation\0"
-      VALUE "FileDescription", "Apache Portable Runtime Library\0"
-      VALUE "FileVersion", APR_VERSION_STRING "\0"
-      VALUE "InternalName", APR_DLL_BASENAME "\0"
-      VALUE "LegalCopyright", APR_COPYRIGHT "\0"
-      VALUE "OriginalFilename", APR_DLL_BASENAME ".dll\0"
-      VALUE "ProductName", "Apache Portable Runtime Project\0"
-      VALUE "ProductVersion", APR_VERSION_STRING "\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x409, 1200
-  END
-END
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/libaprnw.mcp.zip b/rubbos/app/httpd-2.0.64/srclib/apr/libaprnw.mcp.zip
deleted file mode 100644
index f9d5c14e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/libaprnw.mcp.zip
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/libtool b/rubbos/app/httpd-2.0.64/srclib/apr/libtool
deleted file mode 100755
index 5ae0c56c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/libtool
+++ /dev/null
@@ -1,7621 +0,0 @@
-#! /bin/bash
-
-# libtoolT - Provide generalized library-building support services.
-# Generated automatically by  (GNU  )
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED="/bin/sed"
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="/bin/sed -e 1s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# The names of the tagged configurations supported by this script.
-available_tags=" CXX"
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Libtool was configured on host ubuntu:
-
-# Shell to use when invoking shell scripts.
-SHELL="/bin/bash"
-
-# Whether or not to build shared libraries.
-build_libtool_libs=yes
-
-# Whether or not to build static libraries.
-build_old_libs=yes
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=no
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=no
-
-# Whether or not to optimize for fast installation.
-fast_install=yes
-
-# The host system.
-host_alias=
-host=x86_64-unknown-linux-gnu
-host_os=linux-gnu
-
-# The build system.
-build_alias=
-build=x86_64-unknown-linux-gnu
-build_os=linux-gnu
-
-# An echo program that does not interpret backslashes.
-echo="echo"
-
-# The archiver.
-AR="ar"
-AR_FLAGS="cru"
-
-# A C compiler.
-LTCC="gcc"
-
-# LTCC compiler flags.
-LTCFLAGS="-g -O2"
-
-# A language-specific compiler.
-CC="gcc"
-
-# Is the compiler the GNU C compiler?
-with_gcc=yes
-
-# An ERE matcher.
-EGREP="/bin/grep -E"
-
-# The linker used to build libraries.
-LD="/usr/bin/ld -m elf_x86_64"
-
-# Whether we need hard or soft links.
-LN_S="ln -s"
-
-# A BSD-compatible nm program.
-NM="/usr/bin/nm -B"
-
-# A symbol stripping program
-STRIP="strip"
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=file
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="dlltool"
-
-# Used on cygwin: object dumper.
-OBJDUMP="objdump"
-
-# Used on cygwin: assembler.
-AS="as"
-
-# The name of the directory that contains temporary libtool files.
-objdir=.libs
-
-# How to create reloadable object files.
-reload_flag=" -r"
-reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
-
-# How to pass a linker flag through the compiler.
-wl="-Wl,"
-
-# Object file suffix (normally "o").
-objext="o"
-
-# Old archive suffix (normally "a").
-libext="a"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='.so'
-
-# Executable file suffix (normally "").
-exeext=""
-
-# Additional compiler flags for building library objects.
-pic_flag=" -fPIC -DPIC"
-pic_mode=default
-
-# What is the maximum length of a command?
-max_cmd_len=1572864
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o="yes"
-
-# Must we lock files when doing compilation?
-need_locks="no"
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=no
-
-# Do we need a version for libraries?
-need_version=no
-
-# Whether dlopen is supported.
-dlopen_support=unknown
-
-# Whether dlopen of programs is supported.
-dlopen_self=unknown
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=unknown
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag="-static"
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=" -fno-builtin"
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec="\${wl}--export-dynamic"
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=""
-
-# Library versioning type.
-version_type=linux
-
-# Format of library name prefix.
-libname_spec="lib\$name"
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
-
-# The coded name of the library, if different from the real name.
-soname_spec="\${libname}\${release}\${shared_ext}\$major"
-
-# Commands used to build and install an old-style archive.
-RANLIB="ranlib"
-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
-old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
-old_postuninstall_cmds=""
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=""
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=""
-
-# Commands used to build and install a shared archive.
-archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
-archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~
-  cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~
-  \$echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~
-	  \$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
-postinstall_cmds=""
-postuninstall_cmds=""
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=""
-module_expsym_cmds=""
-
-# Commands to strip libraries.
-old_striplib="strip --strip-debug"
-striplib="strip --strip-unneeded"
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=""
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=""
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=""
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=""
-
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=""
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=""
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method="pass_all"
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd="\$MAGIC_CMD"
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=""
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=""
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=""
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[ 	]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ 	][ 	]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'"
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'"
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/  {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/  {\"\\2\", (lt_ptr) \\&\\2},/p'"
-
-# This is the shared library runtime path variable.
-runpath_var=LD_RUN_PATH
-
-# This is the shared library path variable.
-shlibpath_var=LD_LIBRARY_PATH
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=no
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=immediate
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=yes
-
-# Flag to hardcode $libdir into a binary during linking.
-# This must work even if $libdir does not exist.
-hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
-
-# If ld is used when linking, flag to hardcode $libdir into
-# a binary during linking. This must work even if $libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=""
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=""
-
-# Set to yes if using DIR/libNAME during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=no
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=no
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=unsupported
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=no
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=unknown
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec="/usr/lib64 /lib64 /usr/local/lib64"
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/usr/lib64 /lib64 /usr/lib/x86_64-linux-gnu/libfakeroot /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu "
-
-# Fix the shell variable $srcfile for the compiler.
-fix_srcfile_path=""
-
-# Set to yes if exported symbols are required.
-always_export_symbols=no
-
-# The commands to list exported symbols.
-export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols"
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=""
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms="_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*"
-
-# Symbols that must always be exported.
-include_expsyms=""
-
-# ### END LIBTOOL CONFIG
-
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008  Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-basename="s,^.*/,,g"
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5.26
-TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
-
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  SP2NL='tr \040 \012'
-  NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  SP2NL='tr \100 \n'
-  NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-lt_env=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-do
-  eval "if test \"\${$lt_var+set}\" = set; then
-	  save_$lt_var=\$$lt_var
-	  lt_env=\"$lt_var=\$$lt_var \$lt_env\"
-	  $lt_var=C
-	  export $lt_var
-	fi"
-done
-
-if test -n "$lt_env"; then
-  lt_env="env $lt_env"
-fi
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
-
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$modename: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit $EXIT_FAILURE
-fi
-
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-duplicate_deps=no
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
-
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
-
-# func_mktempdir [string]
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
-func_mktempdir ()
-{
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
-
-    if test "$run" = ":"; then
-      # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
-    else
-
-      # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-
-      if test ! -d "$my_tmpdir"; then
-	# Failing that, at least try and use $RANDOM to avoid a race
-	my_tmpdir="${my_template}-${RANDOM-0}$$"
-
-	save_mktempdir_umask=`umask`
-	umask 0077
-	$mkdir "$my_tmpdir"
-	umask $save_mktempdir_umask
-      fi
-
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || {
-        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
-	exit $EXIT_FAILURE
-      }
-    fi
-
-    $echo "X$my_tmpdir" | $Xsed
-}
-
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid ()
-{
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 | \
-	$SED -n -e '1,100{
-		/ I /{
-			s,.*,import,
-			p
-			q
-			}
-		}'`
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $echo $win32_libid_type
-}
-
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	case $arg in
-	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	CC_quoted="$CC_quoted $arg"
-      done
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	    # Double-quote args containing other shell metacharacters.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    CC_quoted="$CC_quoted $arg"
-	  done
-	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit $EXIT_FAILURE
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-
-    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
-    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
-      exit $EXIT_FAILURE
-    fi
-}
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-    my_status=""
-
-    $show "${rm}r $my_gentop"
-    $run ${rm}r "$my_gentop"
-    $show "$mkdir $my_gentop"
-    $run $mkdir "$my_gentop"
-    my_status=$?
-    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
-      exit $my_status
-    fi
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-	*" $my_xlib_u "*)
-	  extracted_serial=`expr $extracted_serial + 1`
-	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
-	*) break ;;
-	esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
-
-      $show "${rm}r $my_xdir"
-      $run ${rm}r "$my_xdir"
-      $show "$mkdir $my_xdir"
-      $run $mkdir "$my_xdir"
-      exit_status=$?
-      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
-	exit $exit_status
-      fi
-      case $host in
-      *-darwin*)
-	$show "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	if test -z "$run"; then
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
-	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-	  if test -n "$darwin_arches"; then 
-	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-	      cd "$darwin_curdir"
-	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-	    done # $darwin_arches
-      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-	      lipo -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    ${rm}r unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd "$darwin_orig_dir"
- 	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	fi # $run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-        ;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-    done
-    func_extract_archives_result="$my_oldobjs"
-}
-# End of Shell function definitions
-#####################################
-
-# Darwin sucks
-eval std_shrext=\"$shrext_cmds\"
-
-disable_libs=no
-
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
-  arg="$1"
-  shift
-
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
-      ;;
-    tag)
-      tagname="$arg"
-      preserve_args="${preserve_args}=$arg"
-
-      # Check whether tagname contains only valid characters
-      case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit $EXIT_FAILURE
-	;;
-      esac
-
-      case $tagname in
-      CC)
-	# Don't test for the "default" C tag, as we know, it's there, but
-	# not specially marked.
-	;;
-      *)
-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
-	  taglist="$taglist $tagname"
-	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
-	else
-	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
-	fi
-	;;
-      esac
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
-
-    prev=
-    prevopt=
-    continue
-  fi
-
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
-
-  --version)
-    echo "\
-$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
-
-Copyright (C) 2008  Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit $?
-    ;;
-
-  --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-    done
-    exit $?
-    ;;
-
-  --debug)
-    $echo "$progname: enabling shell trace mode"
-    set -x
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --dry-run | -n)
-    run=:
-    ;;
-
-  --features)
-    $echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
-    else
-      $echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
-    else
-      $echo "disable static libraries"
-    fi
-    exit $?
-    ;;
-
-  --finish) mode="finish" ;;
-
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
-
-  --preserve-dup-deps) duplicate_deps="yes" ;;
-
-  --quiet | --silent)
-    show=:
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --tag)
-    prevopt="--tag"
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
-  --tag=*)
-    set tag "$optarg" ${1+"$@"}
-    shift
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
-    ;;
-
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-
-  *)
-    nonopt="$arg"
-    break
-    ;;
-  esac
-done
-
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-fi
-
-case $disable_libs in
-no) 
-  ;;
-shared)
-  build_libtool_libs=no
-  build_old_libs=yes
-  ;;
-static)
-  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-  ;;
-esac
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-if test -z "$show_help"; then
-
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
-    case $nonopt in
-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-      mode=link
-      for arg
-      do
-	case $arg in
-	-c)
-	   mode=compile
-	   break
-	   ;;
-	esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
-      ;;
-    *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
-
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-	if test -n "$nonopt"; then
-	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-	else
-	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-	fi
-      fi
-      ;;
-    esac
-  fi
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
-
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  if test -n "$libobj" ; then
-	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
- 	  for arg in $args; do
-	    IFS="$save_ifs"
-
-	    # Double-quote args containing other shell metacharacters.
-	    # Many Bourne shells cannot handle close brackets correctly
-	    # in scan sets, so we specify it separately.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    lastarg="$lastarg $arg"
-	  done
-	  IFS="$save_ifs"
-	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-
-	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
-	  continue
-	  ;;
-
-	* )
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      case $lastarg in
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, and some SunOS ksh mistreat backslash-escaping
-      # in scan sets (worked around with variable expansion),
-      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
-      # at all, so we specify them separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      base_compile="$base_compile $lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      $echo "$modename: you must specify an argument for -Xcompile"
-      exit $EXIT_FAILURE
-      ;;
-    target)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *)
-      # Get the name of the library object.
-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSifmso]'
-    case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.ii) xform=ii ;;
-    *.class) xform=class ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.[fF][09]?) xform=[fF][09]. ;;
-    *.for) xform=for ;;
-    *.java) xform=java ;;
-    *.obj) xform=obj ;;
-    *.sx) xform=sx ;;
-    esac
-
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
-    case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-    *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -static)
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
-    case $qlibobj in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qlibobj="\"$qlibobj\"" ;;
-    esac
-    test "X$libobj" != "X$qlibobj" \
-	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
-	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$xdir" = "X$obj"; then
-      xdir=
-    else
-      xdir=$xdir/
-    fi
-    lobj=${xdir}$objdir/$objname
-
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
-	$show "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$echo "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-      $echo "$srcfile" > "$lockfile"
-    fi
-
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
-    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
-    case $qsrcfile in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      qsrcfile="\"$qsrcfile\"" ;;
-    esac
-
-    $run $rm "$libobj" "${libobj}T"
-
-    # Create a libtool object file (analogous to a ".la" file),
-    # but don't create it if we're doing a dry run.
-    test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      if test ! -d "${xdir}$objdir"; then
-	$show "$mkdir ${xdir}$objdir"
-	$run $mkdir ${xdir}$objdir
-	exit_status=$?
-	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
-	  exit $exit_status
-	fi
-      fi
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	command="$command -o $lobj"
-      fi
-
-      $run $rm "$lobj" "$output_obj"
-
-      $show "$command"
-      if $run eval $lt_env "$command"; then :
-      else
-	test -n "$output_obj" && $run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	$show "$mv $output_obj $lobj"
-	if $run $mv $output_obj $lobj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the PIC object to the libtool object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-        suppress_output=' >/dev/null 2>&1'
-      fi
-    else
-      # No PIC object so indicate it doesn't exist in the libtool
-      # object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      $run $rm "$obj" "$output_obj"
-      $show "$command"
-      if $run eval $lt_env "$command"; then :
-      else
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	$show "$mv $output_obj $obj"
-	if $run $mv $output_obj $obj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
-
-EOF
-    else
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
-
-EOF
-    fi
-
-    $run $mv "${libobj}T" "${libobj}"
-
-    # Unlock the critical section if it was locked
-    if test "$need_locks" != no; then
-      $run $rm "$lockfile"
-    fi
-
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args="$nonopt"
-    base_compile="$nonopt $@"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    notinst_path= # paths that contain not-installed libtool libraries
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-    single_module="${wl}-single_module"
-
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -all-static | -static | -static-libtool-libs)
-	case $arg in
-	-all-static)
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	-static)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=built
-	  ;;
-	-static-libtool-libs)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	esac
-	build_libtool_libs=no
-	build_old_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-	;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  compile_command="$compile_command @OUTPUT@"
-	  finalize_command="$finalize_command @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    compile_command="$compile_command @SYMFILE@"
-	    finalize_command="$finalize_command @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
-	    else
-	      dlprefiles="$dlprefiles $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  if test ! -f "$arg"; then
-	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat $save_arg`
-	    do
-#	      moreargs="$moreargs $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		# If there is no directory component, then add one.
-		case $arg in
-		*/* | *\\*) . $arg ;;
-		*) . ./$arg ;;
-		esac
-
-		if test -z "$pic_object" || \
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none && \
-		   test "$non_pic_object" = none; then
-		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-
-		# Extract subdirectory from the argument.
-		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		if test "X$xdir" = "X$arg"; then
-		  xdir=
-		else
-		  xdir="$xdir/"
-		fi
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  libobjs="$libobjs $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		else
-		  # If the PIC object exists, use it instead.
-		  # $xdir was prepended to $pic_object above.
-		  non_pic_object="$pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if test -z "$run"; then
-		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-		  exit $EXIT_FAILURE
-		else
-		  # Dry-run case.
-
-		  # Extract subdirectory from the argument.
-		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		  if test "X$xdir" = "X$arg"; then
-		    xdir=
-		  else
-		    xdir="$xdir/"
-		  fi
-
-		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-		  libobjs="$libobjs $pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      fi
-	    done
-	  else
-	    $echo "$modename: link input file \`$save_arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
-	  prev=
-	  compile_command="$compile_command $wl$qarg"
-	  finalize_command="$finalize_command $wl$qarg"
-	  continue
-	  ;;
-	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	shrext)
-  	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
-	darwin_framework|darwin_framework_skip)
-	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  prev=
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-	continue
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit $EXIT_FAILURE
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -framework|-arch|-isysroot)
-	case " $CC " in
-	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
-		prev=darwin_framework_skip ;;
-	  *) compiler_flags="$compiler_flags $arg"
-	     prev=darwin_framework ;;
-	esac
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  if test -z "$absdir"; then
-	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    absdir="$dir"
-	    notinst_path="$notinst_path $dir"
-	  fi
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "*) ;;
-	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      -model)
-	compile_command="$compile_command $arg"
-	compiler_flags="$compiler_flags $arg"
-	finalize_command="$finalize_command $arg"
-	prev=xcompiler
-	continue
-	;;
-
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	compiler_flags="$compiler_flags $arg"
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-	continue
-	;;
-
-      -multi_module)
-	single_module="${wl}-multi_module"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -m* pass through architecture-specific compiler args for GCC
-      # -m*, -t[45]*, -txscale* pass through architecture-specific
-      # compiler args for GCC
-      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-      # -F/path gives path to uninstalled frameworks, gcc on darwin
-      # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-        compile_command="$compile_command $arg"
-        finalize_command="$finalize_command $arg"
-        compiler_flags="$compiler_flags $arg"
-        continue
-        ;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # and Darwin in order for the loader to find any dlls it needs.
-	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
-	esac
-	continue
-	;;
-
-      -static | -static-libtool-libs)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Wl,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $wl$flag"
-	  linker_flags="$linker_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # Some other compiler flag.
-      -* | +*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-
-      *.$objext)
-	# A standard object.
-	objs="$objs $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  # If there is no directory component, then add one.
-	  case $arg in
-	  */* | *\\*) . $arg ;;
-	  *) . ./$arg ;;
-	  esac
-
-	  if test -z "$pic_object" || \
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none && \
-	     test "$non_pic_object" = none; then
-	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	  if test "X$xdir" = "X$arg"; then
-	    xdir=
- 	  else
-	    xdir="$xdir/"
-	  fi
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    libobjs="$libobjs $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  else
-	    # If the PIC object exists, use it instead.
-	    # $xdir was prepended to $pic_object above.
-	    non_pic_object="$pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if test -z "$run"; then
-	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-	    exit $EXIT_FAILURE
-	  else
-	    # Dry-run case.
-
-	    # Extract subdirectory from the argument.
-	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	    if test "X$xdir" = "X$arg"; then
-	      xdir=
-	    else
-	      xdir="$xdir/"
-	    fi
-
-	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-	    libobjs="$libobjs $pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
-	  prev=
-	else
-	  deplibs="$deplibs $arg"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-      fi
-    done # argument parsing loop
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$output_objdir" = "X$output"; then
-      output_objdir="$objdir"
-    else
-      output_objdir="$output_objdir/$objdir"
-    fi
-    # Create the object directory.
-    if test ! -d "$output_objdir"; then
-      $show "$mkdir $output_objdir"
-      $run $mkdir $output_objdir
-      exit_status=$?
-      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
-	exit $exit_status
-      fi
-    fi
-
-    # Determine the type of output
-    case $output in
-    "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplications in $postdeps and $predeps
-      duplicate_compiler_generated_deps=yes
-      ;;
-    *)
-      duplicate_compiler_generated_deps=$duplicate_deps
-      ;;
-    esac
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if test "X$duplicate_deps" = "Xyes" ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	esac
-      fi
-      libs="$libs $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    case $linkmode in
-    lib)
-	passes="conv link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-    for pass in $passes; do
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-	esac
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    compiler_flags="$compiler_flags $deplib"
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
-	    continue
-	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  if test "$linkmode" = lib; then
-	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-	  else
-	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-	  fi
-	  for searchdir in $searchdirs; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if (${SED} -e '2q' $lib |
-                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		  library_names=
-		  old_library=
-		  case $lib in
-		  */* | *\\*) . $lib ;;
-		  *) . ./$lib ;;
-		  esac
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-		    test "X$ladir" = "X$lib" && ladir="."
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-	        ;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  *)
-	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la) lib="$deplib" ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    valid_a_lib=no
-	    case $deplibs_check_method in
-	      match_pattern*)
-		set dummy $deplibs_check_method
-	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-		if eval $echo \"$deplib\" 2>/dev/null \
-		    | $SED 10q \
-		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		  valid_a_lib=yes
-		fi
-		;;
-	      pass_all)
-		valid_a_lib=yes
-		;;
-            esac
-	    if test "$valid_a_lib" != yes; then
-	      $echo
-	      $echo "*** Warning: Trying to link with static lib archive $deplib."
-	      $echo "*** I have the capability to make that library automatically link in when"
-	      $echo "*** you link to this library.  But I can only do this if you have a"
-	      $echo "*** shared version of the library, which you do not appear to have"
-	      $echo "*** because the file extensions .$libext of this argument makes me believe"
-	      $echo "*** that it is just a static archive that I should not used here."
-	    else
-	      $echo
-	      $echo "*** Warning: Linking the shared library $output against the"
-	      $echo "*** static library $deplib is not portable!"
-	      deplibs="$deplib $deplibs"
-	    fi
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      newdlfiles="$newdlfiles $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$ladir" = "X$lib" && ladir="."
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	case $lib in
-	*/* | *\\*) . $lib ;;
-	*) . ./$lib ;;
-	esac
-
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit $EXIT_FAILURE
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-              if test "X$duplicate_deps" = "Xyes" ; then
-	        case "$tmp_libs " in
-	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	        esac
-              fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
-	  else
-	    newdlfiles="$newdlfiles $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$libdir"
-	    absdir="$libdir"
-	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  fi
-	fi # $installed = yes
-	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { { test "$prefer_static_libs" = no ||
-		 test "$prefer_static_libs,$installed" = "built,yes"; } ||
-	       test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath " in
-	      *" $dir "*) ;;
-	      *" $absdir "*) ;;
-	      *) temp_rpath="$temp_rpath $absdir" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes ; then
-	  use_static_libs=no
-	fi
-	if test -n "$library_names" &&
-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
-	  if test "$installed" = no; then
-	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
-	  fi
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on
-	  # some systems (darwin)
-	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
-	    $echo
-	    if test "$linkmode" = prog; then
-	      $echo "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $echo "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $echo "*** $linklib is not portable!"
-	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    realname="$2"
-	    shift; shift
-	    libname=`eval \\$echo \"$libname_spec\"`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw*)
-		major=`expr $current - $age`
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      $show "extracting exported symbol list from \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$extract_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      $show "generating import library for \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$old_archive_from_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		    *-*-unixware7*) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a module then we can not link against
-		    # it, someone is ignoring the new warnings I added
-		    if /usr/bin/file -L $add 2> /dev/null |
-                      $EGREP ": [^:]* bundle" >/dev/null ; then
-		      $echo "** Warning, lib $linklib is a module, not a shared library"
-		      if test -z "$old_library" ; then
-		        $echo
-		        $echo "** And there doesn't seem to be a static archive available"
-		        $echo "** The link will probably fail, sorry"
-		      else
-		        add="$dir/$old_library"
-		      fi
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit $EXIT_FAILURE
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes && \
-		 test "$hardcode_minus_L" != yes && \
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-	        add="$inst_prefix_dir$libdir/$linklib"
-	      else
-	        add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case $libdir in
-		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    $echo
-	    $echo "*** Warning: This system can not link to static lib archive $lib."
-	    $echo "*** I have the capability to make that library automatically link in when"
-	    $echo "*** you link to this library.  But I can only do this if you have a"
-	    $echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      $echo "*** But as you try to build a module library, libtool will still create "
-	      $echo "*** a static module, that should work as long as the dlopening application"
-	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		$echo
-		$echo "*** However, this would only work if libtool was able to extract symbol"
-		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$echo "*** not find such a program.  So, this module is probably useless."
-		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
-		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  newlib_search_path="$newlib_search_path $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-		test "X$dir" = "X$deplib" && dir="."
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if grep "^installed=no" $deplib > /dev/null; then
-		  path="$absdir/$objdir"
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  if test -z "$libdir"; then
-		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		    exit $EXIT_FAILURE
-		  fi
-		  if test "$absdir" != "$libdir"; then
-		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  fi
-		  path="$absdir"
-		fi
-		depdepl=
-		case $host in
-		*-*-darwin*)
-		  # we do not want to link against static libs,
-		  # but need to link against shared
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$deplibdir/$depdepl" ; then
-		      depdepl="$deplibdir/$depdepl"
-	      	    elif test -f "$path/$depdepl" ; then
-		      depdepl="$path/$depdepl"
-		    else
-		      # Can't find it, oh well...
-		      depdepl=
-		    fi
-		    # do not add paths which are already there
-		    case " $newlib_search_path " in
-		    *" $path "*) ;;
-		    *) newlib_search_path="$newlib_search_path $path";;
-		    esac
-		  fi
-		  path=""
-		  ;;
-		*)
-		  path="-L$path"
-		  ;;
-		esac
-		;;
-	      -l*)
-		case $host in
-		*-*-darwin*)
-		  # Again, we only want to link against shared libraries
-		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-		  for tmp in $newlib_search_path ; do
-		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
-		      eval depdepl="$tmp/lib$tmp_libs.dylib"
-		      break
-		    fi
-		  done
-		  path=""
-		  ;;
-		*) continue ;;
-		esac
-		;;
-	      *) continue ;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	      case " $deplibs " in
-	      *" $depdepl "*) ;;
-	      *) deplibs="$depdepl $deplibs" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
-	      esac
-	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
-      esac
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-      fi
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	if test "$module" = no; then
-	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-	  exit $EXIT_FAILURE
-	else
-	  $echo
-	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-	  $echo "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
-	fi
-      fi
-
-      if test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-      fi
-
-      set dummy $rpath
-      if test "$#" -gt 2; then
-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	if test -n "$vinfo"; then
-	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
-	fi
-
-	if test -n "$release"; then
-	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-	fi
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	IFS="$save_ifs"
-
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major="$2"
-	  number_minor="$3"
-	  number_revision="$4"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  darwin|linux|osf|windows|none)
-	    current=`expr $number_major + $number_minor`
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor`
-	    age="$number_minor"
-	    revision="$number_minor"
-	    lt_irix_increment=no
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$2"
-	  revision="$3"
-	  age="$4"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  minor_current=`expr $current + 1`
-	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current";
-	  ;;
-
-	irix | nonstopux)
-	  if test "X$lt_irix_increment" = "Xno"; then
-	    major=`expr $current - $age`
-	  else
-	    major=`expr $current - $age + 1`
-	  fi
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux)
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  major=.`expr $current - $age`
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    iface=`expr $current - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  major=`expr $current - $age`
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-      fi
-
-      if test "$mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$echo "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
-	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-	         then
-		   continue
-		 fi
-	       fi
-	       removelist="$removelist $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	if test -n "$removelist"; then
-	  $show "${rm}r $removelist"
-	  $run ${rm}r $removelist
-	fi
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      #for path in $notinst_path; do
-      #	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-      #	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-      #	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-      #done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs -framework System"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    ;;
- 	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $rm conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $rm conftest
-	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
-		    i=""
-		    ;;
-		  esac
-	        fi
-		if test -n "$i" ; then
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    $echo
-		    $echo "*** Warning: dynamic linker does not accept needed library $i."
-		    $echo "*** I have the capability to make that library automatically link in when"
-		    $echo "*** you link to this library.  But I can only do this if you have a"
-		    $echo "*** shared version of the library, which I believe you do not have"
-		    $echo "*** because a test_compile did reveal that the linker did not use it for"
-		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-		$rm conftest
-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
-		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval \\$echo \"$libname_spec\"`
-		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		    set dummy $deplib_matches
-		    deplib_match=$2
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
-		    else
-		      droppeddeps=yes
-		      $echo
-		      $echo "*** Warning: dynamic linker does not accept needed library $i."
-		      $echo "*** I have the capability to make that library automatically link in when"
-		      $echo "*** you link to this library.  But I can only do this if you have a"
-		      $echo "*** shared version of the library, which you do not appear to have"
-		      $echo "*** because a test_compile did reveal that the linker did not use this one"
-		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  $echo
-		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "*** make it link in!  You will probably need to install it or some"
-		  $echo "*** library that it depends on before this library will be fully"
-		  $echo "*** functional.  Installing it before continuing would be even better."
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method
-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-            if test "$name" != "" && test  "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null \
-			 | grep " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | ${SED} 10q \
-			 | $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-	    if test -n "$name" && test "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval $echo \"$potent_lib\" 2>/dev/null \
-		        | ${SED} 10q \
-		        | $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	    -e 's/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
-	    done
-	  fi
-	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
-	    | grep . >/dev/null; then
-	    $echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      $echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    $echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	  fi
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library is the System framework
-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    $echo
-	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $echo "*** a static module, that should work as long as the dlopening"
-	    $echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      $echo
-	      $echo "*** However, this would only work if libtool was able to extract symbol"
-	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $echo "*** not find such a program.  So, this module is probably useless."
-	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    $echo "*** The inter-library dependencies that have been dropped here will be"
-	    $echo "*** automatically added whenever a program is linked with this library"
-	    $echo "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      $echo
-	      $echo "*** Since this library must not contain undefined symbols,"
-	      $echo "*** because either the platform does not support them or"
-	      $echo "*** it was explicitly requested with -no-undefined,"
-	      $echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $deplibs " in
-	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
-	  esac
-	  ;;
-	*) new_libs="$new_libs $deplib" ;;
-	esac
-      done
-      deplibs="$new_libs"
-
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      case $archive_cmds in
-	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
-	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
-	      esac
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	realname="$2"
-	shift; shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	linknames=
-	for link
-	do
-	  linknames="$linknames $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      if len=`expr "X$cmd" : ".*"` &&
-	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	        $show "$cmd"
-	        $run eval "$cmd" || exit $?
-	        skipped_export=false
-	      else
-	        # The command line is too long to execute in one step.
-	        $show "using reloadable object file for export list..."
-	        skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex"; then
-	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-		case " $convenience " in
-		*" $test_deplib "*) ;;
-		*)
-			tmp_deplibs="$tmp_deplibs $test_deplib"
-			;;
-		esac
-	done
-	deplibs="$tmp_deplibs"
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    func_extract_archives $gentop $convenience
-	    libobjs="$libobjs $func_extract_archives_result"
-	  fi
-	fi
-	
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	  eval test_cmds=\"$archive_expsym_cmds\"
-	  cmds=$archive_expsym_cmds
-	else
-	  eval test_cmds=\"$archive_cmds\"
-	  cmds=$archive_cmds
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" &&
-	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise.
-	  $echo "creating reloadable object files..."
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  delfiles=
-	  last_robj=
-	  k=1
-	  output=$output_objdir/$output_la-${k}.$objext
-	  # Loop over the list of objects to be linked.
-	  for obj in $save_libobjs
-	  do
-	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-	    if test "X$objlist" = X ||
-	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-		 test "$len" -le "$max_cmd_len"; }; then
-	      objlist="$objlist $obj"
-	    else
-	      # The command $test_cmds is almost too long, add a
-	      # command to the queue.
-	      if test "$k" -eq 1 ; then
-		# The first file doesn't have a previous command to add.
-		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-	      else
-		# All subsequent reloadable object files will link in
-		# the last one created.
-		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
-	      fi
-	      last_robj=$output_objdir/$output_la-${k}.$objext
-	      k=`expr $k + 1`
-	      output=$output_objdir/$output_la-${k}.$objext
-	      objlist=$obj
-	      len=1
-	    fi
-	  done
-	  # Handle the remaining objects by creating one last
-	  # reloadable object file.  All subsequent reloadable object
-	  # files will link in the last one created.
-	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-
-	  if ${skipped_export-false}; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    libobjs=$output
-	    # Append the command to create the export file.
-	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-          fi
-
-	  # Set up a command to remove the reloadable object files
-	  # after they are used.
-	  i=0
-	  while test "$i" -lt "$k"
-	  do
-	    i=`expr $i + 1`
-	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
-	  done
-
-	  $echo "creating a temporary reloadable object file: $output"
-
-	  # Loop through the commands generated above and execute them.
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $concat_cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    cmds=$archive_expsym_cmds
-	  else
-	    cmds=$archive_cmds
-	    fi
-	  fi
-
-	  # Append the command to remove the reloadable object files
-	  # to the just-reset $cmds.
-	  eval cmds=\"\$cmds~\$rm $delfiles\"
-	fi
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || {
-	    lt_exit=$?
-
-	    # Restore the uninstalled library and exit
-	    if test "$mode" = relink; then
-	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-	    fi
-
-	    exit $lt_exit
-	  }
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-
-	  if test -n "$convenience"; then
-	    if test -z "$whole_archive_flag_spec"; then
-	      $show "${rm}r $gentop"
-	      $run ${rm}r "$gentop"
-	    fi
-	  fi
-
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
-      esac
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
-
-      case $output in
-      *.lo)
-	if test -n "$objs$old_deplibs"; then
-	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	libobj="$output"
-	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $run $rm $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
-      wl=
-
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
-	else
-	  gentop="$output_objdir/${obj}x"
-	  generated="$generated $gentop"
-
-	  func_extract_archives $gentop $convenience
-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-	fi
-      fi
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      cmds=$reload_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $run eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	cmds=$reload_cmds
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-      fi
-
-      if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-      esac
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
-
-      if test "$preload" = yes; then
-	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-	   test "$dlopen_self_static" = unknown; then
-	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-	fi
-      fi
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	;;
-      esac
-
-      case $host in
-      *darwin*)
-        # Don't allow lazy linking, it breaks C++ global constructors
-        if test "$tagname" = CXX ; then
-        compile_command="$compile_command ${wl}-bind_at_load"
-        finalize_command="$finalize_command ${wl}-bind_at_load"
-        fi
-        ;;
-      esac
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $compile_deplibs " in
-	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $compile_deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
-	  esac
-	  ;;
-	*) new_libs="$new_libs $deplib" ;;
-	esac
-      done
-      compile_deplibs="$new_libs"
-
-
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-      fi
-
-      dlsyms=
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	  dlsyms="${outputname}S.c"
-	else
-	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-	fi
-      fi
-
-      if test -n "$dlsyms"; then
-	case $dlsyms in
-	"") ;;
-	*.c)
-	  # Discover the nlist of each of the dlfiles.
-	  nlist="$output_objdir/${outputname}.nm"
-
-	  $show "$rm $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Parse the name list into a source file.
-	  $show "creating $output_objdir/$dlsyms"
-
-	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
-	  if test "$dlself" = yes; then
-	    $show "generating symbol list for \`$output'"
-
-	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-
-	    # Add our own program objects to the symbol list.
-	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	    for arg in $progfiles; do
-	      $show "extracting global C symbols from \`$arg'"
-	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	    done
-
-	    if test -n "$exclude_expsyms"; then
-	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    if test -n "$export_symbols_regex"; then
-	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    # Prepare the list of exported symbols
-	    if test -z "$export_symbols"; then
-	      export_symbols="$output_objdir/$outputname.exp"
-	      $run $rm $export_symbols
-	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-              case $host in
-              *cygwin* | *mingw* )
-	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-		$run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-                ;;
-              esac
-	    else
-	      $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      $run eval 'mv "$nlist"T "$nlist"'
-              case $host in
-              *cygwin* | *mingw* )
-	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-		$run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-                ;;
-              esac
-	    fi
-	  fi
-
-	  for arg in $dlprefiles; do
-	    $show "extracting global C symbols from \`$arg'"
-	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
-	    $run eval '$echo ": $name " >> "$nlist"'
-	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -z "$run"; then
-	    # Make sure we have at least an empty file.
-	    test -f "$nlist" || : > "$nlist"
-
-	    if test -n "$exclude_expsyms"; then
-	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	      $mv "$nlist"T "$nlist"
-	    fi
-
-	    # Try sorting and uniquifying the output.
-	    if grep -v "^: " < "$nlist" |
-		if sort -k 3 </dev/null >/dev/null 2>&1; then
-		  sort -k 3
-		else
-		  sort +2
-		fi |
-		uniq > "$nlist"S; then
-	      :
-	    else
-	      grep -v "^: " < "$nlist" > "$nlist"S
-	    fi
-
-	    if test -f "$nlist"S; then
-	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-	    else
-	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-"
-
-	    case $host in
-	    *cygwin* | *mingw* )
-	  $echo >> "$output_objdir/$dlsyms" "\
-/* DATA imports from DLLs on WIN32 can't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs */
-struct {
-"
-	      ;;
-	    * )
-	  $echo >> "$output_objdir/$dlsyms" "\
-const struct {
-"
-	      ;;
-	    esac
-
-
-	  $echo >> "$output_objdir/$dlsyms" "\
-  const char *name;
-  lt_ptr address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	  fi
-
-	  pic_flag_for_symtable=
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
-	    esac;;
-	  *-*-hpux*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag";;
-	    esac
-	  esac
-
-	  # Now compile the dynamic symbol file.
-	  $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-	  $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
-	  # Clean up the generated files.
-	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Transform the symbol file into the correct name.
-          case $host in
-          *cygwin* | *mingw* )
-            if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            else
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-             fi
-            ;;
-          * )
-            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            ;;
-          esac
-	  ;;
-	*)
-	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      else
-	# We keep going just in case the user didn't refer to
-	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-	# really was required.
-
-	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-      fi
-
-      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	$show "$link_command"
-	$run eval "$link_command"
-	exit_status=$?
-
-	# Delete the generated files.
-	if test -n "$dlsyms"; then
-	  $show "$rm $output_objdir/${outputname}S.${objext}"
-	  $run $rm "$output_objdir/${outputname}S.${objext}"
-	fi
-
-	exit $exit_status
-      fi
-
-      if test -n "$shlibpath_var"; then
-	# We should set the shlibpath_var
-	rpath=
-	for dir in $temp_rpath; do
-	  case $dir in
-	  [\\/]* | [A-Za-z]:[\\/]*)
-	    # Absolute path.
-	    rpath="$rpath$dir:"
-	    ;;
-	  *)
-	    # Relative path: add a thisdir entry.
-	    rpath="$rpath\$thisdir/$dir:"
-	    ;;
-	  esac
-	done
-	temp_rpath="$rpath"
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$run $rm $output
-	# Link the executable and exit
-	$show "$link_command"
-	$run eval "$link_command" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-	$echo "$modename: \`$output' will be relinked during installation" 1>&2
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      $show "$link_command"
-      $run eval "$link_command" || exit $?
-
-      # Now create the wrapper script.
-      $show "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
-      fi
-
-      # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
-	case $progpath in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-	esac
-	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if our run command is non-null.
-      if test -z "$run"; then
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-            output_name=`basename $output`
-            output_path=`dirname $output`
-            cwrappersource="$output_path/$objdir/lt-$output_name.c"
-            cwrapper="$output_path/$output_name.exe"
-            $rm $cwrappersource $cwrapper
-            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    cat > $cwrappersource <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "/bin/sh $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-	    cat >> $cwrappersource<<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/stat.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-/* -DDEBUG is fairly common in CFLAGS.  */
-#undef DEBUG
-#if defined DEBUGWRAPPER
-# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
-#else
-# define DEBUG(format, ...)
-#endif
-
-const char *program_name = NULL;
-
-void * xmalloc (size_t num);
-char * xstrdup (const char *string);
-const char * base_name (const char *name);
-char * find_executable(const char *wrapper);
-int    check_executable(const char *path);
-char * strendzap(char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int i;
-
-  program_name = (char *) xstrdup (base_name (argv[0]));
-  DEBUG("(main) argv[0]      : %s\n",argv[0]);
-  DEBUG("(main) program_name : %s\n",program_name);
-  newargz = XMALLOC(char *, argc+2);
-EOF
-
-            cat >> $cwrappersource <<EOF
-  newargz[0] = (char *) xstrdup("$SHELL");
-EOF
-
-            cat >> $cwrappersource <<"EOF"
-  newargz[1] = find_executable(argv[0]);
-  if (newargz[1] == NULL)
-    lt_fatal("Couldn't find %s", argv[0]);
-  DEBUG("(main) found exe at : %s\n",newargz[1]);
-  /* we know the script has the same name, without the .exe */
-  /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe");
-  for (i = 1; i < argc; i++)
-    newargz[i+1] = xstrdup(argv[i]);
-  newargz[argc+1] = NULL;
-
-  for (i=0; i<argc+1; i++)
-  {
-    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
-    ;
-  }
-
-EOF
-
-            case $host_os in
-              mingw*)
-                cat >> $cwrappersource <<EOF
-  execv("$SHELL",(char const **)newargz);
-EOF
-              ;;
-              *)
-                cat >> $cwrappersource <<EOF
-  execv("$SHELL",newargz);
-EOF
-              ;;
-            esac
-
-            cat >> $cwrappersource <<"EOF"
-  return 127;
-}
-
-void *
-xmalloc (size_t num)
-{
-  void * p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-;
-}
-
-const char *
-base_name (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return base;
-}
-
-int
-check_executable(const char * path)
-{
-  struct stat st;
-
-  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
-  if ((!path) || (!*path))
-    return 0;
-
-  if ((stat (path, &st) >= 0) &&
-      (
-        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
-#if defined (S_IXOTH)
-       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
-#endif
-#if defined (S_IXGRP)
-       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
-#endif
-       ((st.st_mode & S_IXUSR) == S_IXUSR))
-      )
-    return 1;
-  else
-    return 0;
-}
-
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise */
-char *
-find_executable (const char* wrapper)
-{
-  int has_slash = 0;
-  const char* p;
-  const char* p_next;
-  /* static buffer for getcwd */
-  char tmp[LT_PATHMAX + 1];
-  int tmp_len;
-  char* concat_name;
-
-  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
-
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
-
-  /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
-  {
-    concat_name = xstrdup (wrapper);
-    if (check_executable(concat_name))
-      return concat_name;
-    XFREE(concat_name);
-  }
-  else
-  {
-#endif
-    if (IS_DIR_SEPARATOR (wrapper[0]))
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable(concat_name))
-        return concat_name;
-      XFREE(concat_name);
-    }
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  }
-#endif
-
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-    {
-      has_slash = 1;
-      break;
-    }
-  if (!has_slash)
-  {
-    /* no slashes; search PATH */
-    const char* path = getenv ("PATH");
-    if (path != NULL)
-    {
-      for (p = path; *p; p = p_next)
-      {
-        const char* q;
-        size_t p_len;
-        for (q = p; *q; q++)
-          if (IS_PATH_SEPARATOR(*q))
-            break;
-        p_len = q - p;
-        p_next = (*q == '\0' ? q : q + 1);
-        if (p_len == 0)
-        {
-          /* empty path: current directory */
-          if (getcwd (tmp, LT_PATHMAX) == NULL)
-            lt_fatal ("getcwd failed");
-          tmp_len = strlen(tmp);
-          concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-          memcpy (concat_name, tmp, tmp_len);
-          concat_name[tmp_len] = '/';
-          strcpy (concat_name + tmp_len + 1, wrapper);
-        }
-        else
-        {
-          concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
-          memcpy (concat_name, p, p_len);
-          concat_name[p_len] = '/';
-          strcpy (concat_name + p_len + 1, wrapper);
-        }
-        if (check_executable(concat_name))
-          return concat_name;
-        XFREE(concat_name);
-      }
-    }
-    /* not found in PATH; assume curdir */
-  }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  tmp_len = strlen(tmp);
-  concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_name[tmp_len] = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
-
-  if (check_executable(concat_name))
-    return concat_name;
-  XFREE(concat_name);
-  return NULL;
-}
-
-char *
-strendzap(char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert(str != NULL);
-  assert(pat != NULL);
-
-  len = strlen(str);
-  patlen = strlen(pat);
-
-  if (patlen <= len)
-  {
-    str += len - patlen;
-    if (strcmp(str, pat) == 0)
-      *str = '\0';
-  }
-  return str;
-}
-
-static void
-lt_error_core (int exit_status, const char * mode,
-          const char * message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-EOF
-          # we should really use a build-platform specific compiler
-          # here, but OTOH, the wrappers (shell script and this C one)
-          # are only useful if you want to execute the "real" binary.
-          # Since the "real" binary is built for $host, then this
-          # wrapper might as well be built for $host, too.
-          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
-          ;;
-        esac
-        $rm $output
-        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
-
-	$echo > $output "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variable:
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    echo=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$echo will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$echo >> $output "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $echo >> $output "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" || \\
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $mkdir \"\$progdir\"
-    else
-      $rm \"\$progdir/\$file\"
-    fi"
-
-	  $echo >> $output "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$echo \"\$relink_command_output\" >&2
-	$rm \"\$progdir/\$file\"
-	exit $EXIT_FAILURE
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-	else
-	  $echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$echo >> $output "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $echo >> $output "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $echo >> $output "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	$echo >> $output "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $echo >> $output "\
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \$*\"
-      exit $EXIT_FAILURE
-    fi
-  else
-    # The program doesn't exist.
-    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi\
-"
-	chmod +x $output
-      fi
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	generated="$generated $gentop"
-
-	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-       cmds=$old_archive_from_new_cmds
-      else
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  $echo "copying selected object files to avoid basename conflicts..."
-
-	  if test -z "$gentop"; then
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    exit_status=$?
-	    if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
-	      exit $exit_status
-	    fi
-	  fi
-
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		counter=`expr $counter + 1`
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      $run ln "$obj" "$gentop/$newobj" ||
-	      $run cp "$obj" "$gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
-	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
-	    esac
-	  done
-	fi
-
-	eval cmds=\"$old_archive_cmds\"
-
-	if len=`expr "X$cmds" : ".*"` &&
-	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  $echo "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  for obj in $save_oldobjs
-	  do
-	    oldobjs="$objlist $obj"
-	    objlist="$objlist $obj"
-	    eval test_cmds=\"$old_archive_cmds\"
-	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	       test "$len" -le "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-	        RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-        eval cmd=\"$cmd\"
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$generated"; then
-      $show "${rm}r$generated"
-      $run ${rm}r$generated
-    fi
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      $show "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
-      if test "$hardcode_automatic" = yes ; then
-	relink_command=
-      fi
-
-
-      # Only create the output if not a dry run.
-      if test -z "$run"; then
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		if test -z "$libdir"; then
-		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-		newdependency_libs="$newdependency_libs $libdir/$name"
-		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlfiles="$newdlfiles $libdir/$name"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlprefiles="$newdlprefiles $libdir/$name"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlfiles="$newdlfiles $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlprefiles="$newdlprefiles $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $rm $output
-	  # place dlname in correct position for cygwin
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-	  esac
-	  $echo > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $echo >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      fi
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool install mode
-  install)
-    modename="$modename: install"
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | grep shtool > /dev/null; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f) 
-      	case " $install_prog " in
-	*[\\\ /]cp\ *) ;;
-	*) prev=$arg ;;
-	esac
-	;;
-      -g | -m | -o) prev=$arg ;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	$echo "$modename: no file or destination specified" 1>&2
-      else
-	$echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test "$#" -gt 2; then
-	$echo "$modename: \`$dest' is not a directory" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	library_names=
-	old_library=
-	relink_command=
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
-	  esac
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-	test "X$dir" = "X$file/" && dir=
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  if test "$inst_prefix_dir" = "$destdir"; then
-	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
-	  else
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
-	  fi
-
-	  $echo "$modename: warning: relinking \`$file'" 1>&2
-	  $show "$relink_command"
-	  if $run eval "$relink_command"; then :
-	  else
-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names
-	if test -n "$2"; then
-	  realname="$2"
-	  shift
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  $show "$install_prog $dir/$srcname $destdir/$realname"
-	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-	  if test -n "$stripme" && test -n "$striplib"; then
-	    $show "$striplib $destdir/$realname"
-	    $run eval "$striplib $destdir/$realname" || exit $?
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      if test "$linkname" != "$realname"; then
-                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-	      fi
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  cmds=$postinstall_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || {
-	      lt_exit=$?
-
-	      # Restore the uninstalled library and exit
-	      if test "$mode" = relink; then
-		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-	      fi
-
-	      exit $lt_exit
-	    }
-	  done
-	  IFS="$save_ifs"
-	fi
-
-	# Install the pseudo-library for information purposes.
-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	if test -n "$destfile"; then
-	  $show "$install_prog $file $destfile"
-	  $run eval "$install_prog $file $destfile" || exit $?
-	fi
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
-	  $show "$install_prog $staticobj $staticdest"
-	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      file=`$echo $file|${SED} 's,.exe$,,'`
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin*|*mingw*)
-	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-	  # `FILE.' does not work on cygwin managed mounts.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  # Check the variables that should have been set.
-	  if test -z "$notinst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      # If there is no directory component, then add one.
-	      case $lib in
-	      */* | *\\*) . $lib ;;
-	      *) . ./$lib ;;
-	      esac
-	    fi
-	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-	  # `FILE.' does not work on cygwin managed mounts.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    if test "$finalize" = yes && test -z "$run"; then
-	      tmpdir=`func_mktempdir`
-	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
-	      outputname="$tmpdir/$file"
-	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
-
-	      $show "$relink_command"
-	      if $run eval "$relink_command"; then :
-	      else
-		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-		${rm}r "$tmpdir"
-		continue
-	      fi
-	      file="$outputname"
-	    else
-	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
-	    fi
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway 
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
-	    ;;
-	  esac
-	  ;;
-	esac
-	$show "$install_prog$stripme $file $destfile"
-	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-	test -n "$outputname" && ${rm}r "$tmpdir"
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	$show "$old_striplib $oldlib"
-	$run eval "$old_striplib $oldlib" || exit $?
-      fi
-
-      # Do each command in the postinstall commands.
-      cmds=$old_postinstall_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  cmds=$finish_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-	  done
-	  IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    test "$show" = : && exit $EXIT_SUCCESS
-
-    $echo "X----------------------------------------------------------------------" | $Xsed
-    $echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $echo "   $libdir"
-    done
-    $echo
-    $echo "If you ever happen to want to link against installed libraries"
-    $echo "in a given directory, LIBDIR, you must either use libtool, and"
-    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $echo
-    $echo "See any operating system documentation about shared libraries for"
-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "X----------------------------------------------------------------------" | $Xsed
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit $EXIT_FAILURE
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-	$echo "$modename: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  if test ! -f "$dir/$dlname"; then
-	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-	;;
-
-      *)
-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
-
-    if test -z "$run"; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-	eval "if test \"\${save_$lt_var+set}\" = set; then
-		$lt_var=\$save_$lt_var; export $lt_var
-	      fi"
-      done
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-	$echo "export $shlibpath_var"
-      fi
-      $echo "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool clean and uninstall mode
-  clean | uninstall)
-    modename="$modename: $mode"
-    rm="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) rm="$rm $arg"; rmforce=yes ;;
-      -*) rm="$rm $arg" ;;
-      *) files="$files $arg" ;;
-      esac
-    done
-
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    rmdirs=
-
-    origobjdir="$objdir"
-    for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-	dir=.
-	objdir="$origobjdir"
-      else
-	objdir="$dir/$origobjdir"
-      fi
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-      test "$mode" = uninstall && objdir="$dir"
-
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
-	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if (test -L "$file") >/dev/null 2>&1 \
-	|| (test -h "$file") >/dev/null 2>&1 \
-	|| test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
-	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-
-	  case "$mode" in
-	  clean)
-	    case "  $library_names " in
-	    # "  " in the beginning catches empty $dlname
-	    *" $dlname "*) ;;
-	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
-	    esac
-	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-	    ;;
-	  uninstall)
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      cmds=$postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      cmds=$old_postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	    ;;
-	  esac
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-
-	  # Read the .lo file
-	  . $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" \
-	     && test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" \
-	     && test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    file=`$echo $file|${SED} 's,.exe$,,'`
-	    noexename=`$echo $name|${SED} 's,.exe$,,'`
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	    relink_command=
-	    . $dir/$noexename
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles || exit_status=1
-    done
-    objdir="$origobjdir"
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	$show "rmdir $dir"
-	$run rmdir $dir >/dev/null 2>&1
-      fi
-    done
-
-    exit $exit_status
-    ;;
-
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-  esac
-
-  if test -z "$exec_cmd"; then
-    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi # test -z "$show_help"
-
-if test -n "$exec_cmd"; then
-  eval exec $exec_cmd
-  exit $EXIT_FAILURE
-fi
-
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-Provide generalized library-building support services.
-
-    --config          show all configuration variables
-    --debug           enable verbose shell tracing
--n, --dry-run         display commands without modifying any files
-    --features        display basic configuration information and exit
-    --finish          same as \`--mode=finish'
-    --help            display this help message and exit
-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
-    --tag=TAG         use configuration variables from tag TAG
-    --version         print version information
-
-MODE must be one of the following:
-
-      clean           remove files from the build directory
-      compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
-      finish          complete the installation of libtool libraries
-      install         install libraries or executables
-      link            create a library or an executable
-      uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-
-Report bugs to <bug-libtool@gnu.org>."
-  exit $EXIT_SUCCESS
-  ;;
-
-clean)
-  $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-compile)
-  $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -static           always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-  ;;
-
-execute)
-  $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-  ;;
-
-finish)
-  $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-  ;;
-
-install)
-  $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-  ;;
-
-uninstall)
-  $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-  ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit $?
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-disable_libs=shared
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-disable_libs=static
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
-# ### BEGIN LIBTOOL TAG CONFIG: CXX
-
-# Libtool was configured on host ubuntu:
-
-# Shell to use when invoking shell scripts.
-SHELL="/bin/bash"
-
-# Whether or not to build shared libraries.
-build_libtool_libs=yes
-
-# Whether or not to build static libraries.
-build_old_libs=yes
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=no
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=no
-
-# Whether or not to optimize for fast installation.
-fast_install=yes
-
-# The host system.
-host_alias=
-host=x86_64-unknown-linux-gnu
-host_os=linux-gnu
-
-# The build system.
-build_alias=
-build=x86_64-unknown-linux-gnu
-build_os=linux-gnu
-
-# An echo program that does not interpret backslashes.
-echo="echo"
-
-# The archiver.
-AR="ar"
-AR_FLAGS="cru"
-
-# A C compiler.
-LTCC="gcc"
-
-# LTCC compiler flags.
-LTCFLAGS="-g -O2"
-
-# A language-specific compiler.
-CC="g++"
-
-# Is the compiler the GNU C compiler?
-with_gcc=yes
-
-# An ERE matcher.
-EGREP="/bin/grep -E"
-
-# The linker used to build libraries.
-LD="/usr/bin/ld -m elf_x86_64"
-
-# Whether we need hard or soft links.
-LN_S="ln -s"
-
-# A BSD-compatible nm program.
-NM="/usr/bin/nm -B"
-
-# A symbol stripping program
-STRIP="strip"
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=file
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="dlltool"
-
-# Used on cygwin: object dumper.
-OBJDUMP="objdump"
-
-# Used on cygwin: assembler.
-AS="as"
-
-# The name of the directory that contains temporary libtool files.
-objdir=.libs
-
-# How to create reloadable object files.
-reload_flag=" -r"
-reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
-
-# How to pass a linker flag through the compiler.
-wl="-Wl,"
-
-# Object file suffix (normally "o").
-objext="o"
-
-# Old archive suffix (normally "a").
-libext="a"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='.so'
-
-# Executable file suffix (normally "").
-exeext=""
-
-# Additional compiler flags for building library objects.
-pic_flag=" -fPIC -DPIC"
-pic_mode=default
-
-# What is the maximum length of a command?
-max_cmd_len=1572864
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o="yes"
-
-# Must we lock files when doing compilation?
-need_locks="no"
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=no
-
-# Do we need a version for libraries?
-need_version=no
-
-# Whether dlopen is supported.
-dlopen_support=unknown
-
-# Whether dlopen of programs is supported.
-dlopen_self=unknown
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=unknown
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag="-static"
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=" -fno-builtin"
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec="\${wl}--export-dynamic"
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=""
-
-# Library versioning type.
-version_type=linux
-
-# Format of library name prefix.
-libname_spec="lib\$name"
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
-
-# The coded name of the library, if different from the real name.
-soname_spec="\${libname}\${release}\${shared_ext}\$major"
-
-# Commands used to build and install an old-style archive.
-RANLIB="ranlib"
-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
-old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
-old_postuninstall_cmds=""
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=""
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=""
-
-# Commands used to build and install a shared archive.
-archive_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
-archive_expsym_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-retain-symbols-file \$wl\$export_symbols -o \$lib"
-postinstall_cmds=""
-postuninstall_cmds=""
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=""
-module_expsym_cmds=""
-
-# Commands to strip libraries.
-old_striplib="strip --strip-debug"
-striplib="strip --strip-unneeded"
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects="/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../x86_64-linux-gnu/crti.o /usr/lib/gcc/x86_64-linux-gnu/4.8/crtbeginS.o"
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects="/usr/lib/gcc/x86_64-linux-gnu/4.8/crtendS.o /usr/lib/gcc/x86_64-linux-gnu/4.8/../../../x86_64-linux-gnu/crtn.o"
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=""
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
-
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs="/usr/lib/gcc/x86_64-linux-gnu/4.8 /usr/lib/gcc/x86_64-linux-gnu/4.8/../../../x86_64-linux-gnu /usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../lib /lib/x86_64-linux-gnu /lib/../lib /usr/lib/x86_64-linux-gnu /usr/lib/../lib /usr/lib/gcc/x86_64-linux-gnu/4.8/../../.."
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path="-L/usr/lib/gcc/x86_64-linux-gnu/4.8 -L/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../x86_64-linux-gnu -L/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../../lib -L/lib/x86_64-linux-gnu -L/lib/../lib -L/usr/lib/x86_64-linux-gnu -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-linux-gnu/4.8/../../.."
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method="pass_all"
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd="\$MAGIC_CMD"
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=""
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=""
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=""
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[ 	]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ 	][ 	]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'"
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'"
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/  {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/  {\"\\2\", (lt_ptr) \\&\\2},/p'"
-
-# This is the shared library runtime path variable.
-runpath_var=LD_RUN_PATH
-
-# This is the shared library path variable.
-shlibpath_var=LD_LIBRARY_PATH
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=no
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=immediate
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=yes
-
-# Flag to hardcode $libdir into a binary during linking.
-# This must work even if $libdir does not exist.
-hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
-
-# If ld is used when linking, flag to hardcode $libdir into
-# a binary during linking. This must work even if $libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=""
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=""
-
-# Set to yes if using DIR/libNAME during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=no
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=no
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=unsupported
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=no
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=unknown
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec="/usr/lib64 /lib64 /usr/local/lib64"
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/usr/lib64 /lib64 /usr/lib/x86_64-linux-gnu/libfakeroot /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu "
-
-# Fix the shell variable $srcfile for the compiler.
-fix_srcfile_path=""
-
-# Set to yes if exported symbols are required.
-always_export_symbols=no
-
-# The commands to list exported symbols.
-export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols"
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=""
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms="_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*"
-
-# Symbols that must always be exported.
-include_expsyms=""
-
-# ### END LIBTOOL TAG CONFIG: CXX
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/beos/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/locks/beos/Makefile.in
deleted file mode 100644
index 6c8a1bcc..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/beos/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = \
-	thread_mutex.lo \
-	thread_rwlock.lo \
-	thread_cond.lo \
-	proc_mutex.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/beos/proc_mutex.c b/rubbos/app/httpd-2.0.64/srclib/apr/locks/beos/proc_mutex.c
deleted file mode 100644
index da315ce6..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/beos/proc_mutex.c
+++ /dev/null
@@ -1,169 +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.
- */
-
-/*Read/Write locking implementation based on the MultiLock code from
- * Stephen Beaulieu <hippo@be.com>
- */
- 
-#include "beos/apr_arch_proc_mutex.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-
-static apr_status_t _proc_mutex_cleanup(void * data)
-{
-    apr_proc_mutex_t *lock = (apr_proc_mutex_t*)data;
-    if (lock->LockCount != 0) {
-        /* we're still locked... */
-    	while (atomic_add(&lock->LockCount , -1) > 1){
-    	    /* OK we had more than one person waiting on the lock so 
-    	     * the sem is also locked. Release it until we have no more
-    	     * locks left.
-    	     */
-            release_sem (lock->Lock);
-    	}
-    }
-    delete_sem(lock->Lock);
-    return APR_SUCCESS;
-}    
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_create(apr_proc_mutex_t **mutex,
-                                                const char *fname,
-                                                apr_lockmech_e mech,
-                                                apr_pool_t *pool)
-{
-    apr_proc_mutex_t *new;
-    apr_status_t stat = APR_SUCCESS;
-  
-    if (mech != APR_LOCK_DEFAULT) {
-        return APR_ENOTIMPL;
-    }
-
-    new = (apr_proc_mutex_t *)apr_pcalloc(pool, sizeof(apr_proc_mutex_t));
-    if (new == NULL){
-        return APR_ENOMEM;
-    }
-    
-    if ((stat = create_sem(0, "APR_Lock")) < B_NO_ERROR) {
-        _proc_mutex_cleanup(new);
-        return stat;
-    }
-    new->LockCount = 0;
-    new->Lock = stat;  
-    new->pool  = pool;
-
-    apr_pool_cleanup_register(new->pool, (void *)new, _proc_mutex_cleanup,
-                              apr_pool_cleanup_null);
-
-    (*mutex) = new;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_child_init(apr_proc_mutex_t **mutex,
-                                                    const char *fname,
-                                                    apr_pool_t *pool)
-{
-    return APR_SUCCESS;
-}
-    
-APR_DECLARE(apr_status_t) apr_proc_mutex_lock(apr_proc_mutex_t *mutex)
-{
-    int32 stat;
-    
-	if (atomic_add(&mutex->LockCount, 1) > 0) {
-		if ((stat = acquire_sem(mutex->Lock)) < B_NO_ERROR) {
-		    atomic_add(&mutex->LockCount, -1);
-		    return stat;
-		}
-	}
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_trylock(apr_proc_mutex_t *mutex)
-{
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_unlock(apr_proc_mutex_t *mutex)
-{
-    int32 stat;
-    
-	if (atomic_add(&mutex->LockCount, -1) > 1) {
-        if ((stat = release_sem(mutex->Lock)) < B_NO_ERROR) {
-            atomic_add(&mutex->LockCount, 1);
-            return stat;
-        }
-    }
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_destroy(apr_proc_mutex_t *mutex)
-{
-    apr_status_t stat;
-    if ((stat = _proc_mutex_cleanup(mutex)) == APR_SUCCESS) {
-        apr_pool_cleanup_kill(mutex->pool, mutex, _proc_mutex_cleanup);
-        return APR_SUCCESS;
-    }
-    return stat;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_cleanup(void *mutex)
-{
-    return _proc_mutex_cleanup(mutex);
-}
-
-APR_DECLARE(const char *) apr_proc_mutex_lockfile(apr_proc_mutex_t *mutex)
-{
-    return NULL;
-}
-
-APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex)
-{
-    return "beossem";
-}
-
-APR_DECLARE(const char *) apr_proc_mutex_defname(void)
-{
-    return "beossem";
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(proc_mutex)
-
-/* Implement OS-specific accessors defined in apr_portable.h */
-
-APR_DECLARE(apr_status_t) apr_os_proc_mutex_get(apr_os_proc_mutex_t *ospmutex,
-                                                apr_proc_mutex_t *pmutex)
-{
-    ospmutex->sem = pmutex->Lock;
-    ospmutex->ben = pmutex->LockCount;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex,
-                                                apr_os_proc_mutex_t *ospmutex,
-                                                apr_pool_t *pool)
-{
-    if (pool == NULL) {
-        return APR_ENOPOOL;
-    }
-    if ((*pmutex) == NULL) {
-        (*pmutex) = (apr_proc_mutex_t *)apr_pcalloc(pool, sizeof(apr_proc_mutex_t));
-        (*pmutex)->pool = pool;
-    }
-    (*pmutex)->Lock = ospmutex->sem;
-    (*pmutex)->LockCount = ospmutex->ben;
-    return APR_SUCCESS;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/beos/thread_cond.c b/rubbos/app/httpd-2.0.64/srclib/apr/locks/beos/thread_cond.c
deleted file mode 100644
index 3729bf38..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/beos/thread_cond.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "beos/apr_arch_thread_mutex.h"
-#include "beos/apr_arch_thread_cond.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-
-static apr_status_t thread_cond_cleanup(void *data)
-{
-    struct waiter *w;
-    apr_thread_cond_t *cond = (apr_thread_cond_t *)data;
-
-    acquire_sem(cond->lock);
-/*
-    APR_RING_FOREACH(w, &cond->alist, waiter_t, link) {
-        delete_sem(w->sem);
-    }
-*/
-    delete_sem(cond->lock);
-
-    return APR_SUCCESS;
-}
-
-static struct waiter_t *make_waiter(apr_pool_t *pool)
-{
-    struct waiter_t *w = (struct waiter_t*)
-                       apr_palloc(pool, sizeof(struct waiter_t));
-    if (w == NULL)
-        return NULL;
-      
-    w->sem  = create_sem(0, "apr conditional waiter");
-    if (w->sem < 0)
-        return NULL;
-
-    APR_RING_ELEM_INIT(w, link);
-    
-    return w;
-}
-  
-APR_DECLARE(apr_status_t) apr_thread_cond_create(apr_thread_cond_t **cond,
-                                                 apr_pool_t *pool)
-{
-    apr_thread_cond_t *new_cond;
-    sem_id rv;
-    int i;
-
-    new_cond = (apr_thread_cond_t *)apr_palloc(pool, sizeof(apr_thread_cond_t));
-
-    if (new_cond == NULL)
-        return APR_ENOMEM;
-
-    if ((rv = create_sem(1, "apr conditional lock")) < B_OK)
-        return rv;
-    
-    new_cond->lock = rv;
-    new_cond->pool = pool;
-    APR_RING_INIT(&new_cond->alist, waiter_t, link);
-    APR_RING_INIT(&new_cond->flist, waiter_t, link);
-        
-    for (i=0;i < 10 ;i++) {
-        struct waiter_t *nw = make_waiter(pool);
-        APR_RING_INSERT_TAIL(&new_cond->flist, nw, waiter_t, link);
-    }
-
-    apr_pool_cleanup_register(new_cond->pool,
-                              (void *)new_cond, thread_cond_cleanup,
-                              apr_pool_cleanup_null);
-
-    *cond = new_cond;
-    return APR_SUCCESS;
-}
-
-
-static apr_status_t do_wait(apr_thread_cond_t *cond, apr_thread_mutex_t *mutex,
-                            int timeout)
-{
-    struct waiter_t *wait;
-    thread_id cth = find_thread(NULL);
-    apr_status_t rv;
-    int flags = B_RELATIVE_TIMEOUT;
-    
-    /* We must be the owner of the mutex or we can't do this... */    
-    if (mutex->owner != cth) {
-        /* What should we return??? */
-        return APR_EINVAL;
-    }
-
-    acquire_sem(cond->lock);
-    wait = APR_RING_FIRST(&cond->flist);
-    if (wait)
-        APR_RING_REMOVE(wait, link);
-    else
-        wait = make_waiter(cond->pool);   
-    APR_RING_INSERT_TAIL(&cond->alist, wait, waiter_t, link);
-    cond->condlock = mutex;
-    release_sem(cond->lock);
-       
-    apr_thread_mutex_unlock(cond->condlock);
-
-    if (timeout == 0)
-        flags = 0;
-        
-    rv = acquire_sem_etc(wait->sem, 1, flags, timeout);
-
-    apr_thread_mutex_lock(cond->condlock);
-    
-    if (rv != B_OK)
-        if (rv == B_TIMED_OUT)
-            return APR_TIMEUP;
-        return rv;       
-
-    acquire_sem(cond->lock);
-    APR_RING_REMOVE(wait, link);
-    APR_RING_INSERT_TAIL(&cond->flist, wait, waiter_t, link);
-    release_sem(cond->lock);
-    
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_wait(apr_thread_cond_t *cond,
-                                               apr_thread_mutex_t *mutex)
-{
-    return do_wait(cond, mutex, 0);
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_timedwait(apr_thread_cond_t *cond,
-                                                    apr_thread_mutex_t *mutex,
-                                                    apr_interval_time_t timeout)
-{
-    return do_wait(cond, mutex, timeout);
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_signal(apr_thread_cond_t *cond)
-{
-    struct waiter_t *wake;
-
-    acquire_sem(cond->lock);    
-    if (!APR_RING_EMPTY(&cond->alist, waiter_t, link)) {
-        wake = APR_RING_FIRST(&cond->alist);
-        APR_RING_REMOVE(wake, link);
-        release_sem(wake->sem);
-        APR_RING_INSERT_TAIL(&cond->flist, wake, waiter_t, link);
-    }
-    release_sem(cond->lock);
-    
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_broadcast(apr_thread_cond_t *cond)
-{
-    struct waiter_t *wake;
-    
-    acquire_sem(cond->lock);
-    while (! APR_RING_EMPTY(&cond->alist, waiter_t, link)) {
-        wake = APR_RING_FIRST(&cond->alist);
-        APR_RING_REMOVE(wake, link);
-        release_sem(wake->sem);
-        APR_RING_INSERT_TAIL(&cond->flist, wake, waiter_t, link);
-    }
-    release_sem(cond->lock);
-    
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_destroy(apr_thread_cond_t *cond)
-{
-    apr_status_t stat;
-    if ((stat = thread_cond_cleanup(cond)) == APR_SUCCESS) {
-        apr_pool_cleanup_kill(cond->pool, cond, thread_cond_cleanup);
-        return APR_SUCCESS;
-    }
-    return stat;
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(thread_cond)
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/beos/thread_mutex.c b/rubbos/app/httpd-2.0.64/srclib/apr/locks/beos/thread_mutex.c
deleted file mode 100644
index 1d23d3cf..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/beos/thread_mutex.c
+++ /dev/null
@@ -1,147 +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.
- */
-
-/*Read/Write locking implementation based on the MultiLock code from
- * Stephen Beaulieu <hippo@be.com>
- */
- 
-#include "beos/apr_arch_thread_mutex.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-
-static apr_status_t _thread_mutex_cleanup(void * data)
-{
-    apr_thread_mutex_t *lock = (apr_thread_mutex_t*)data;
-    if (lock->LockCount != 0) {
-        /* we're still locked... */
-    	while (atomic_add(&lock->LockCount , -1) > 1){
-    	    /* OK we had more than one person waiting on the lock so 
-    	     * the sem is also locked. Release it until we have no more
-    	     * locks left.
-    	     */
-            release_sem (lock->Lock);
-    	}
-    }
-    delete_sem(lock->Lock);
-    return APR_SUCCESS;
-}    
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_create(apr_thread_mutex_t **mutex,
-                                                  unsigned int flags,
-                                                  apr_pool_t *pool)
-{
-    apr_thread_mutex_t *new_m;
-    apr_status_t stat = APR_SUCCESS;
-  
-    new_m = (apr_thread_mutex_t *)apr_pcalloc(pool, sizeof(apr_thread_mutex_t));
-    if (new_m == NULL){
-        return APR_ENOMEM;
-    }
-    
-    if ((stat = create_sem(0, "APR_Lock")) < B_NO_ERROR) {
-        _thread_mutex_cleanup(new_m);
-        return stat;
-    }
-    new_m->LockCount = 0;
-    new_m->Lock = stat;  
-    new_m->pool  = pool;
-
-    /* Optimal default is APR_THREAD_MUTEX_UNNESTED, 
-     * no additional checks required for either flag.
-     */
-    new_m->nested = flags & APR_THREAD_MUTEX_NESTED;
-
-    apr_pool_cleanup_register(new_m->pool, (void *)new_m, _thread_mutex_cleanup,
-                              apr_pool_cleanup_null);
-
-    (*mutex) = new_m;
-    return APR_SUCCESS;
-}
-
-#if APR_HAS_CREATE_LOCKS_NP
-APR_DECLARE(apr_status_t) apr_thread_mutex_create_np(apr_thread_mutex_t **mutex,
-                                                   const char *fname,
-                                                   apr_lockmech_e_np mech,
-                                                   apr_pool_t *pool)
-{
-    return APR_ENOTIMPL;
-}       
-#endif
-  
-APR_DECLARE(apr_status_t) apr_thread_mutex_lock(apr_thread_mutex_t *mutex)
-{
-    int32 stat;
-    thread_id me = find_thread(NULL);
-    
-    if (mutex->nested && mutex->owner == me) {
-        mutex->owner_ref++;
-        return APR_SUCCESS;
-    }
-    
-	if (atomic_add(&mutex->LockCount, 1) > 0) {
-		if ((stat = acquire_sem(mutex->Lock)) < B_NO_ERROR) {
-            /* Oh dear, acquire_sem failed!!  */
-		    atomic_add(&mutex->LockCount, -1);
-		    return stat;
-		}
-	}
-
-    mutex->owner = me;
-    mutex->owner_ref = 1;
-    
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_trylock(apr_thread_mutex_t *mutex)
-{
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_unlock(apr_thread_mutex_t *mutex)
-{
-    int32 stat;
-        
-    if (mutex->nested && mutex->owner == find_thread(NULL)) {
-        mutex->owner_ref--;
-        if (mutex->owner_ref > 0)
-            return APR_SUCCESS;
-    }
-    
-	if (atomic_add(&mutex->LockCount, -1) > 1) {
-        if ((stat = release_sem(mutex->Lock)) < B_NO_ERROR) {
-            atomic_add(&mutex->LockCount, 1);
-            return stat;
-        }
-    }
-
-    mutex->owner = -1;
-    mutex->owner_ref = 0;
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_destroy(apr_thread_mutex_t *mutex)
-{
-    apr_status_t stat;
-    if ((stat = _thread_mutex_cleanup(mutex)) == APR_SUCCESS) {
-        apr_pool_cleanup_kill(mutex->pool, mutex, _thread_mutex_cleanup);
-        return APR_SUCCESS;
-    }
-    return stat;
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(thread_mutex)
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/beos/thread_rwlock.c b/rubbos/app/httpd-2.0.64/srclib/apr/locks/beos/thread_rwlock.c
deleted file mode 100644
index 915b919c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/beos/thread_rwlock.c
+++ /dev/null
@@ -1,190 +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.
- */
-
-/*Read/Write locking implementation based on the MultiLock code from
- * Stephen Beaulieu <hippo@be.com>
- */
- 
-#include "beos/apr_arch_thread_rwlock.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-
-#define BIG_NUM 100000
-
-static apr_status_t _thread_rw_cleanup(void * data)
-{
-    apr_thread_rwlock_t *mutex = (apr_thread_rwlock_t*)data;
-
-    if (mutex->ReadCount != 0) {
-    	while (atomic_add(&mutex->ReadCount , -1) > 1){
-            release_sem (mutex->Read);
-    	}
-    }
-    if (mutex->WriteCount != 0) {
-    	while (atomic_add(&mutex->WriteCount , -1) > 1){
-            release_sem (mutex->Write);
-    	}
-    }
-    if (mutex->LockCount != 0) {
-    	while (atomic_add(&mutex->LockCount , -1) > 1){
-            release_sem (mutex->Lock);
-    	}
-    }
-    
-    delete_sem(mutex->Read);
-    delete_sem(mutex->Write);
-    delete_sem(mutex->Lock);
-    return APR_SUCCESS;
-}    
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_create(apr_thread_rwlock_t **rwlock,
-                                                   apr_pool_t *pool)
-{
-    apr_thread_rwlock_t *new;
-  
-    new = (apr_thread_rwlock_t *)apr_pcalloc(pool, sizeof(apr_thread_rwlock_t));
-    if (new == NULL){
-        return APR_ENOMEM;
-    }
-    
-    new->pool  = pool;
-    /* we need to make 3 locks... */
-    new->ReadCount = 0;
-    new->WriteCount = 0;
-    new->LockCount = 0;
-    new->Read  = create_sem(0, "APR_ReadLock");
-    new->Write = create_sem(0, "APR_WriteLock");
-    new->Lock  = create_sem(0, "APR_Lock");
-    
-    if (new->Lock < 0 || new->Read < 0 || new->Write < 0) {
-        _thread_rw_cleanup(new);
-        return -1;
-    }
-
-    apr_pool_cleanup_register(new->pool, (void *)new, _thread_rw_cleanup,
-                              apr_pool_cleanup_null);
-    (*rwlock) = new;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_rdlock(apr_thread_rwlock_t *rwlock)
-{
-    int32 rv = APR_SUCCESS;
-
-    if (find_thread(NULL) == rwlock->writer) {
-        /* we're the writer - no problem */
-        rwlock->Nested++;
-    } else {
-        /* we're not the writer */
-        int32 r = atomic_add(&rwlock->ReadCount, 1);
-        if (r < 0) {
-            /* Oh dear, writer holds lock, wait for sem */
-            rv = acquire_sem_etc(rwlock->Read, 1, B_DO_NOT_RESCHEDULE,
-                                 B_INFINITE_TIMEOUT);
-        }
-    }
-
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_tryrdlock(apr_thread_rwlock_t *rwlock)
-{
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_wrlock(apr_thread_rwlock_t *rwlock)
-{
-    int rv = APR_SUCCESS;
-
-    if (find_thread(NULL) == rwlock->writer) {
-        rwlock->Nested++;
-    } else {
-        /* we're not the writer... */
-        if (atomic_add(&rwlock->LockCount, 1) >= 1) {
-            /* we're locked - acquire the sem */
-            rv = acquire_sem_etc(rwlock->Lock, 1, B_DO_NOT_RESCHEDULE,
-                                 B_INFINITE_TIMEOUT);
-        }
-        if (rv == APR_SUCCESS) {
-            /* decrement the ReadCount to a large -ve number so that
-             * we block on new readers...
-             */
-            int32 readers = atomic_add(&rwlock->ReadCount, -BIG_NUM);
-            if (readers > 0) {
-                /* readers are holding the lock */
-                rv = acquire_sem_etc(rwlock->Write, readers, B_DO_NOT_RESCHEDULE,
-                                     B_INFINITE_TIMEOUT);
-            }
-            if (rv == APR_SUCCESS)
-                rwlock->writer = find_thread(NULL);
-        }
-    }
-    
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_trywrlock(apr_thread_rwlock_t *rwlock)
-{
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_unlock(apr_thread_rwlock_t *rwlock)
-{
-    apr_status_t rv = APR_SUCCESS;
-    int32 readers;
-
-    /* we know we hold the lock, so don't check it :) */
-    if (find_thread(NULL) == rwlock->writer) {
-    /* we know we hold the lock, so don't check it :) */
-        if (rwlock->Nested > 1) {
-            /* we're recursively locked */
-            rwlock->Nested--;
-            return APR_SUCCESS;
-        }
-        /* OK so we need to release the sem if we have it :) */
-        readers = atomic_add(&rwlock->ReadCount, BIG_NUM) + BIG_NUM;
-        if (readers > 0) {
-            rv = release_sem_etc(rwlock->Read, readers, B_DO_NOT_RESCHEDULE);
-        }
-        if (rv == APR_SUCCESS) {
-            rwlock->writer = -1;
-            if (atomic_add(&rwlock->LockCount, -1) > 1) {
-                rv = release_sem_etc(rwlock->Lock, 1, B_DO_NOT_RESCHEDULE);
-            }
-        }
-    } else {
-       /* We weren't the Writer, so just release the ReadCount... */
-       if (atomic_add(&rwlock->ReadCount, -1) < 0) {
-            /* we have a writer waiting for the lock, so release it */
-            rv = release_sem_etc(rwlock->Write, 1, B_DO_NOT_RESCHEDULE);
-        }
-    }
-
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_destroy(apr_thread_rwlock_t *rwlock)
-{
-    apr_status_t stat;
-    if ((stat = _thread_rw_cleanup(rwlock)) == APR_SUCCESS) {
-        apr_pool_cleanup_kill(rwlock->pool, rwlock, _thread_rw_cleanup);
-        return APR_SUCCESS;
-    }
-    return stat;
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(thread_rwlock)
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/netware/proc_mutex.c b/rubbos/app/httpd-2.0.64/srclib/apr/locks/netware/proc_mutex.c
deleted file mode 100644
index 77411d0b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/netware/proc_mutex.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_portable.h"
-#include "apr_arch_proc_mutex.h"
-#include "apr_arch_thread_mutex.h"
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_create(apr_proc_mutex_t **mutex,
-                                                const char *fname,
-                                                apr_lockmech_e mech,
-                                                apr_pool_t *pool)
-{
-    apr_status_t ret;
-    apr_proc_mutex_t *new_mutex = NULL;
-    new_mutex = (apr_proc_mutex_t *)apr_pcalloc(pool, sizeof(apr_proc_mutex_t));
-	
-	if(new_mutex ==NULL) {
-        return APR_ENOMEM;
-    }     
-    
-    new_mutex->pool = pool;
-    ret = apr_thread_mutex_create(&(new_mutex->mutex), APR_THREAD_MUTEX_DEFAULT, pool);
-
-    if (ret == APR_SUCCESS)
-        *mutex = new_mutex;
-
-    return ret;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_child_init(apr_proc_mutex_t **mutex,
-                                                    const char *fname,
-                                                    apr_pool_t *pool)
-{
-    return APR_SUCCESS;
-}
-    
-APR_DECLARE(apr_status_t) apr_proc_mutex_lock(apr_proc_mutex_t *mutex)
-{
-    if (mutex)
-        return apr_thread_mutex_lock(mutex->mutex);
-    return APR_ENOLOCK;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_trylock(apr_proc_mutex_t *mutex)
-{
-    if (mutex)
-        return apr_thread_mutex_trylock(mutex->mutex);
-    return APR_ENOLOCK;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_unlock(apr_proc_mutex_t *mutex)
-{
-    if (mutex)
-        return apr_thread_mutex_unlock(mutex->mutex);
-    return APR_ENOLOCK;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_cleanup(void *mutex)
-{
-    return apr_proc_mutex_destroy(mutex);
-}
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_destroy(apr_proc_mutex_t *mutex)
-{
-    if (mutex)
-        return apr_thread_mutex_destroy(mutex->mutex);
-    return APR_ENOLOCK;
-}
-
-APR_DECLARE(const char *) apr_proc_mutex_lockfile(apr_proc_mutex_t *mutex)
-{
-    return NULL;
-}
-
-APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex)
-{
-    return "netwarethread";
-}
-
-APR_DECLARE(const char *) apr_proc_mutex_defname(void)
-{
-    return "netwarethread";
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(proc_mutex)
-
-/* Implement OS-specific accessors defined in apr_portable.h */
-
-apr_status_t apr_os_proc_mutex_get(apr_os_proc_mutex_t *ospmutex,
-                                   apr_proc_mutex_t *pmutex)
-{
-    if (pmutex)
-        ospmutex = pmutex->mutex->mutex;
-    return APR_ENOLOCK;
-}
-
-apr_status_t apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex,
-                                   apr_os_proc_mutex_t *ospmutex,
-                                   apr_pool_t *pool)
-{
-    return APR_ENOTIMPL;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/netware/thread_cond.c b/rubbos/app/httpd-2.0.64/srclib/apr/locks/netware/thread_cond.c
deleted file mode 100644
index dcb21edc..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/netware/thread_cond.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <nks/errno.h>
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_strings.h"
-#include "apr_arch_thread_mutex.h"
-#include "apr_arch_thread_cond.h"
-#include "apr_portable.h"
-
-static apr_status_t thread_cond_cleanup(void *data)
-{
-    apr_thread_cond_t *cond = (apr_thread_cond_t *)data;
-
-    NXCondFree(cond->cond);        
-    return APR_SUCCESS;
-} 
-
-APR_DECLARE(apr_status_t) apr_thread_cond_create(apr_thread_cond_t **cond,
-                                                 apr_pool_t *pool)
-{
-    apr_thread_cond_t *new_cond = NULL;
-
-    new_cond = (apr_thread_cond_t *)apr_pcalloc(pool, sizeof(apr_thread_cond_t));
-	
-	if(new_cond ==NULL) {
-        return APR_ENOMEM;
-    }     
-    new_cond->pool = pool;
-
-    new_cond->cond = NXCondAlloc(NULL);
-    
-    if(new_cond->cond == NULL)
-        return APR_ENOMEM;
-
-    apr_pool_cleanup_register(new_cond->pool, new_cond, 
-                                (void*)thread_cond_cleanup,
-                                apr_pool_cleanup_null);
-   *cond = new_cond;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_wait(apr_thread_cond_t *cond,
-                                               apr_thread_mutex_t *mutex)
-{
-    if (NXCondWait(cond->cond, mutex->mutex) != 0)
-        return APR_EINTR;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_timedwait(apr_thread_cond_t *cond,
-                                                    apr_thread_mutex_t *mutex,
-                                                    apr_interval_time_t timeout){
-    if (NXCondTimedWait(cond->cond, mutex->mutex, 
-        (timeout*1000)/NXGetSystemTick()) == NX_ETIMEDOUT) {
-        return APR_TIMEUP;
-    }
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_signal(apr_thread_cond_t *cond)
-{
-    NXCondSignal(cond->cond);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_broadcast(apr_thread_cond_t *cond)
-{
-    NXCondBroadcast(cond->cond);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_destroy(apr_thread_cond_t *cond)
-{
-    apr_status_t stat;
-    if ((stat = thread_cond_cleanup(cond)) == APR_SUCCESS) {
-        apr_pool_cleanup_kill(cond->pool, cond, thread_cond_cleanup);
-        return APR_SUCCESS;
-    }
-    return stat;
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(thread_cond)
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/netware/thread_mutex.c b/rubbos/app/httpd-2.0.64/srclib/apr/locks/netware/thread_mutex.c
deleted file mode 100644
index 98bf33bd..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/netware/thread_mutex.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_strings.h"
-#include "apr_arch_thread_mutex.h"
-#include "apr_portable.h"
-
-static apr_status_t thread_mutex_cleanup(void *data)
-{
-    apr_thread_mutex_t *mutex = (apr_thread_mutex_t *)data;
-
-    NXMutexFree(mutex->mutex);        
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_create(apr_thread_mutex_t **mutex,
-                                                  unsigned int flags,
-                                                  apr_pool_t *pool)
-{
-    apr_thread_mutex_t *new_mutex = NULL;
-
-    /* XXX: Implement _UNNESTED flavor and favor _DEFAULT for performance
-     */
-    if (flags & APR_THREAD_MUTEX_UNNESTED) {
-        return APR_ENOTIMPL;
-    }
-    new_mutex = (apr_thread_mutex_t *)apr_pcalloc(pool, sizeof(apr_thread_mutex_t));
-	
-	if(new_mutex ==NULL) {
-        return APR_ENOMEM;
-    }     
-    new_mutex->pool = pool;
-
-    new_mutex->mutex = NXMutexAlloc(NX_MUTEX_RECURSIVE, 0, NULL);
-    
-    if(new_mutex->mutex == NULL)
-        return APR_ENOMEM;
-
-    apr_pool_cleanup_register(new_mutex->pool, new_mutex, 
-                                (void*)thread_mutex_cleanup,
-                                apr_pool_cleanup_null);
-   *mutex = new_mutex;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_lock(apr_thread_mutex_t *mutex)
-{
-    NXLock(mutex->mutex);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_trylock(apr_thread_mutex_t *mutex)
-{
-    if (!NXTryLock(mutex->mutex))
-        return APR_EBUSY;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_unlock(apr_thread_mutex_t *mutex)
-{
-    NXUnlock(mutex->mutex);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_destroy(apr_thread_mutex_t *mutex)
-{
-    apr_status_t stat;
-    if ((stat = thread_mutex_cleanup(mutex)) == APR_SUCCESS) {
-        apr_pool_cleanup_kill(mutex->pool, mutex, thread_mutex_cleanup);
-        return APR_SUCCESS;
-    }
-    return stat;
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(thread_mutex)
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/netware/thread_rwlock.c b/rubbos/app/httpd-2.0.64/srclib/apr/locks/netware/thread_rwlock.c
deleted file mode 100644
index d0bf3ddf..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/netware/thread_rwlock.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_strings.h"
-#include "apr_arch_thread_rwlock.h"
-#include "apr_portable.h"
-
-static apr_status_t thread_rwlock_cleanup(void *data)
-{
-    apr_thread_rwlock_t *rwlock = (apr_thread_rwlock_t *)data;
-
-    NXRwLockFree (rwlock->rwlock);
-    return APR_SUCCESS;
-} 
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_create(apr_thread_rwlock_t **rwlock,
-                                                   apr_pool_t *pool)
-{
-    apr_thread_rwlock_t *new_rwlock = NULL;
-   
-	NXHierarchy_t hierarchy = 1;   //for libc NKS NXRwLockAlloc
-	NXLockInfo_t *info;			   //for libc NKS NXRwLockAlloc
-
-    new_rwlock = (apr_thread_rwlock_t *)apr_pcalloc(pool, sizeof(apr_thread_rwlock_t));
-	
-	if(new_rwlock ==NULL) {
-        return APR_ENOMEM;
-    }     
-    new_rwlock->pool = pool;
-    
-    info = (NXLockInfo_t *)apr_pcalloc(pool, sizeof(NXLockInfo_t));
-    new_rwlock->rwlock = NXRwLockAlloc(hierarchy, info);
-    if(new_rwlock->rwlock == NULL)
-        return APR_ENOMEM;
-
-    apr_pool_cleanup_register(new_rwlock->pool, new_rwlock, thread_rwlock_cleanup,
-                              apr_pool_cleanup_null);
-    *rwlock = new_rwlock;
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_rdlock(apr_thread_rwlock_t *rwlock)
-{
-    NXRdLock(rwlock->rwlock);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_tryrdlock(apr_thread_rwlock_t *rwlock)
-{
-    if (!NXTryRdLock(rwlock->rwlock))
-        return APR_EBUSY;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_wrlock(apr_thread_rwlock_t *rwlock)
-{
-    NXWrLock(rwlock->rwlock);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_trywrlock(apr_thread_rwlock_t *rwlock)
-{
-    if (!NXTryWrLock(rwlock->rwlock))
-        return APR_EBUSY;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_unlock(apr_thread_rwlock_t *rwlock)
-{
-    NXRwUnlock(rwlock->rwlock);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_destroy(apr_thread_rwlock_t *rwlock)
-{
-    apr_status_t stat;
-    if ((stat = thread_rwlock_cleanup(rwlock)) == APR_SUCCESS) {
-        apr_pool_cleanup_kill(rwlock->pool, rwlock, thread_rwlock_cleanup);
-        return APR_SUCCESS;
-    }
-    return stat;
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(thread_rwlock)
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/os2/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/locks/os2/Makefile.in
deleted file mode 100644
index e22f85c9..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/os2/Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = \
-	thread_mutex.lo \
-	thread_rwlock.lo \
-	thread_cond.lo \
-	proc_mutex.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/@OSDIR@
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/os2/proc_mutex.c b/rubbos/app/httpd-2.0.64/srclib/apr/locks/os2/proc_mutex.c
deleted file mode 100644
index 5a493563..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/os2/proc_mutex.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include "apr_arch_proc_mutex.h"
-#include "apr_arch_file_io.h"
-#include <string.h>
-#include <stddef.h>
-
-#define CurrentTid (*_threadid)
-
-static char *fixed_name(const char *fname, apr_pool_t *pool)
-{
-    char *semname;
-
-    if (fname == NULL)
-        semname = NULL;
-    else {
-        // Semaphores don't live in the file system, fix up the name
-        while (*fname == '/' || *fname == '\\') {
-            fname++;
-        }
-
-        semname = apr_pstrcat(pool, "/SEM32/", fname, NULL);
-
-        if (semname[8] == ':') {
-            semname[8] = '$';
-        }
-    }
-
-    return semname;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_cleanup(void *vmutex)
-{
-    apr_proc_mutex_t *mutex = vmutex;
-    return apr_proc_mutex_destroy(mutex);
-}
-
-APR_DECLARE(const char *) apr_proc_mutex_lockfile(apr_proc_mutex_t *mutex)
-{
-    return NULL;
-}
-
-APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex)
-{
-    return "os2sem";
-}
-
-APR_DECLARE(const char *) apr_proc_mutex_defname(void)
-{
-    return "os2sem";
-}
-
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_create(apr_proc_mutex_t **mutex,
-                                                const char *fname,
-                                                apr_lockmech_e mech,
-                                                apr_pool_t *pool)
-{
-    apr_proc_mutex_t *new;
-    ULONG rc;
-    char *semname;
-
-    if (mech != APR_LOCK_DEFAULT) {
-        return APR_ENOTIMPL;
-    }
-
-    new = (apr_proc_mutex_t *)apr_palloc(pool, sizeof(apr_proc_mutex_t));
-    new->pool       = pool;
-    new->owner      = 0;
-    new->lock_count = 0;
-    *mutex = new;
-
-    semname = fixed_name(fname, pool);
-    rc = DosCreateMutexSem(semname, &(new->hMutex), DC_SEM_SHARED, FALSE);
-
-    if (!rc) {
-        apr_pool_cleanup_register(pool, new, apr_proc_mutex_cleanup, apr_pool_cleanup_null);
-    }
-
-    return APR_FROM_OS_ERROR(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_child_init(apr_proc_mutex_t **mutex,
-                                                    const char *fname,
-                                                    apr_pool_t *pool)
-{
-    apr_proc_mutex_t *new;
-    ULONG rc;
-    char *semname;
-
-    new = (apr_proc_mutex_t *)apr_palloc(pool, sizeof(apr_proc_mutex_t));
-    new->pool       = pool;
-    new->owner      = 0;
-    new->lock_count = 0;
-
-    semname = fixed_name(fname, pool);
-    rc = DosOpenMutexSem(semname, &(new->hMutex));
-    *mutex = new;
-
-    if (!rc) {
-        apr_pool_cleanup_register(pool, new, apr_proc_mutex_cleanup, apr_pool_cleanup_null);
-    }
-
-    return APR_FROM_OS_ERROR(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_lock(apr_proc_mutex_t *mutex)
-{
-    ULONG rc = DosRequestMutexSem(mutex->hMutex, SEM_INDEFINITE_WAIT);
-
-    if (rc == 0) {
-        mutex->owner = CurrentTid;
-        mutex->lock_count++;
-    }
-
-    return APR_FROM_OS_ERROR(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_trylock(apr_proc_mutex_t *mutex)
-{
-    ULONG rc = DosRequestMutexSem(mutex->hMutex, SEM_IMMEDIATE_RETURN);
-
-    if (rc == 0) {
-        mutex->owner = CurrentTid;
-        mutex->lock_count++;
-    }
-
-    return APR_FROM_OS_ERROR(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_unlock(apr_proc_mutex_t *mutex)
-{
-    ULONG rc;
-
-    if (mutex->owner == CurrentTid && mutex->lock_count > 0) {
-        mutex->lock_count--;
-        rc = DosReleaseMutexSem(mutex->hMutex);
-        return APR_FROM_OS_ERROR(rc);
-    }
-
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_destroy(apr_proc_mutex_t *mutex)
-{
-    ULONG rc;
-    apr_status_t status = APR_SUCCESS;
-
-    if (mutex->owner == CurrentTid) {
-        while (mutex->lock_count > 0 && status == APR_SUCCESS) {
-            status = apr_proc_mutex_unlock(mutex);
-        }
-    }
-
-    if (status != APR_SUCCESS) {
-        return status;
-    }
-
-    if (mutex->hMutex == 0) {
-        return APR_SUCCESS;
-    }
-
-    rc = DosCloseMutexSem(mutex->hMutex);
-
-    if (!rc) {
-        mutex->hMutex = 0;
-    }
-
-    return APR_FROM_OS_ERROR(rc);
-}
-
-
-
-APR_POOL_IMPLEMENT_ACCESSOR(proc_mutex)
-
-
-
-/* Implement OS-specific accessors defined in apr_portable.h */
-
-APR_DECLARE(apr_status_t) apr_os_proc_mutex_get(apr_os_proc_mutex_t *ospmutex,
-                                                apr_proc_mutex_t *pmutex)
-{
-    *ospmutex = pmutex->hMutex;
-    return APR_ENOTIMPL;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex,
-                                                apr_os_proc_mutex_t *ospmutex,
-                                                apr_pool_t *pool)
-{
-    apr_proc_mutex_t *new;
-
-    new = (apr_proc_mutex_t *)apr_palloc(pool, sizeof(apr_proc_mutex_t));
-    new->pool       = pool;
-    new->owner      = 0;
-    new->lock_count = 0;
-    new->hMutex     = *ospmutex;
-    *pmutex = new;
-
-    return APR_SUCCESS;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/os2/thread_cond.c b/rubbos/app/httpd-2.0.64/srclib/apr/locks/os2/thread_cond.c
deleted file mode 100644
index ec6034f5..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/os2/thread_cond.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include "apr_arch_thread_mutex.h"
-#include "apr_arch_thread_cond.h"
-#include "apr_arch_file_io.h"
-#include <string.h>
-
-APR_DECLARE(apr_status_t) apr_thread_cond_create(apr_thread_cond_t **cond,
-                                                 apr_pool_t *pool)
-{
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_wait(apr_thread_cond_t *cond,
-                                               apr_thread_mutex_t *mutex)
-{
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_timedwait(apr_thread_cond_t *cond,
-                                                    apr_thread_mutex_t *mutex,
-                                                    apr_interval_time_t timeout){
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_signal(apr_thread_cond_t *cond)
-{
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_broadcast(apr_thread_cond_t *cond)
-{
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_destroy(apr_thread_cond_t *cond)
-{
-    return APR_ENOTIMPL;
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(thread_cond)
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/os2/thread_mutex.c b/rubbos/app/httpd-2.0.64/srclib/apr/locks/os2/thread_mutex.c
deleted file mode 100644
index 5d8436be..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/os2/thread_mutex.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include "apr_arch_thread_mutex.h"
-#include "apr_arch_file_io.h"
-#include <string.h>
-#include <stddef.h>
-
-static apr_status_t thread_mutex_cleanup(void *themutex)
-{
-    apr_thread_mutex_t *mutex = themutex;
-    return apr_thread_mutex_destroy(mutex);
-}
-
-
-
-/* XXX: Need to respect APR_THREAD_MUTEX_[UN]NESTED flags argument
- *      or return APR_ENOTIMPL!!!
- */
-APR_DECLARE(apr_status_t) apr_thread_mutex_create(apr_thread_mutex_t **mutex,
-                                                  unsigned int flags,
-                                                  apr_pool_t *pool)
-{
-    apr_thread_mutex_t *new_mutex;
-    ULONG rc;
-
-    new_mutex = (apr_thread_mutex_t *)apr_palloc(pool, sizeof(apr_thread_mutex_t));
-    new_mutex->pool = pool;
-
-    rc = DosCreateMutexSem(NULL, &(new_mutex->hMutex), 0, FALSE);
-    *mutex = new_mutex;
-
-    if (!rc)
-        apr_pool_cleanup_register(pool, new_mutex, thread_mutex_cleanup, apr_pool_cleanup_null);
-
-    return APR_OS2_STATUS(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_lock(apr_thread_mutex_t *mutex)
-{
-    ULONG rc = DosRequestMutexSem(mutex->hMutex, SEM_INDEFINITE_WAIT);
-    return APR_OS2_STATUS(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_trylock(apr_thread_mutex_t *mutex)
-{
-    ULONG rc = DosRequestMutexSem(mutex->hMutex, SEM_IMMEDIATE_RETURN);
-    return APR_OS2_STATUS(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_unlock(apr_thread_mutex_t *mutex)
-{
-    ULONG rc = DosReleaseMutexSem(mutex->hMutex);
-    return APR_OS2_STATUS(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_destroy(apr_thread_mutex_t *mutex)
-{
-    ULONG rc;
-
-    if (mutex->hMutex == 0)
-        return APR_SUCCESS;
-
-    while (DosReleaseMutexSem(mutex->hMutex) == 0);
-
-    rc = DosCloseMutexSem(mutex->hMutex);
-
-    if (!rc) {
-        mutex->hMutex = 0;
-        return APR_SUCCESS;
-    }
-
-    return APR_FROM_OS_ERROR(rc);
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(thread_mutex)
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/os2/thread_rwlock.c b/rubbos/app/httpd-2.0.64/srclib/apr/locks/os2/thread_rwlock.c
deleted file mode 100644
index 195a56bd..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/os2/thread_rwlock.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include "apr_arch_thread_rwlock.h"
-#include "apr_arch_file_io.h"
-#include <string.h>
-
-static apr_status_t thread_rwlock_cleanup(void *therwlock)
-{
-    apr_thread_rwlock_t *rwlock = therwlock;
-    return apr_thread_rwlock_destroy(rwlock);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_create(apr_thread_rwlock_t **rwlock,
-                                                   apr_pool_t *pool)
-{
-    apr_thread_rwlock_t *new_rwlock;
-    ULONG rc;
-
-    new_rwlock = (apr_thread_rwlock_t *)apr_palloc(pool, sizeof(apr_thread_rwlock_t));
-    new_rwlock->pool = pool;
-    new_rwlock->readers = 0;
-
-    rc = DosCreateMutexSem(NULL, &(new_rwlock->write_lock), 0, FALSE);
-
-    if (rc)
-        return APR_FROM_OS_ERROR(rc);
-
-    rc = DosCreateEventSem(NULL, &(new_rwlock->read_done), 0, FALSE);
-
-    if (rc)
-        return APR_FROM_OS_ERROR(rc);
-
-    *rwlock = new_rwlock;
-
-    if (!rc)
-        apr_pool_cleanup_register(pool, new_rwlock, thread_rwlock_cleanup,
-                                  apr_pool_cleanup_null);
-
-    return APR_FROM_OS_ERROR(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_rdlock(apr_thread_rwlock_t *rwlock)
-{
-    ULONG rc, posts;
-
-    rc = DosRequestMutexSem(rwlock->write_lock, SEM_INDEFINITE_WAIT);
-
-    if (rc)
-        return APR_FROM_OS_ERROR(rc);
-
-    /* We've successfully acquired the writer mutex so we can't be locked
-     * for write which means it's ok to add a reader lock. The writer mutex
-     * doubles as race condition protection for the readers counter.
-     */
-    rwlock->readers++;
-    DosResetEventSem(rwlock->read_done, &posts);
-    rc = DosReleaseMutexSem(rwlock->write_lock);
-    return APR_FROM_OS_ERROR(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_tryrdlock(apr_thread_rwlock_t *rwlock)
-{
-    /* As above but with different wait time */
-    ULONG rc, posts;
-
-    rc = DosRequestMutexSem(rwlock->write_lock, SEM_IMMEDIATE_RETURN);
-
-    if (rc)
-        return APR_FROM_OS_ERROR(rc);
-
-    rwlock->readers++;
-    DosResetEventSem(rwlock->read_done, &posts);
-    rc = DosReleaseMutexSem(rwlock->write_lock);
-    return APR_FROM_OS_ERROR(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_wrlock(apr_thread_rwlock_t *rwlock)
-{
-    ULONG rc;
-
-    rc = DosRequestMutexSem(rwlock->write_lock, SEM_INDEFINITE_WAIT);
-
-    if (rc)
-        return APR_FROM_OS_ERROR(rc);
-
-    /* We've got the writer lock but we have to wait for all readers to
-     * unlock before it's ok to use it
-     */
-
-    if (rwlock->readers) {
-        rc = DosWaitEventSem(rwlock->read_done, SEM_INDEFINITE_WAIT);
-
-        if (rc)
-            DosReleaseMutexSem(rwlock->write_lock);
-    }
-
-    return APR_FROM_OS_ERROR(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_trywrlock(apr_thread_rwlock_t *rwlock)
-{
-    ULONG rc;
-
-    rc = DosRequestMutexSem(rwlock->write_lock, SEM_IMMEDIATE_RETURN);
-
-    if (rc)
-        return APR_FROM_OS_ERROR(rc);
-
-    /* We've got the writer lock but we have to wait for all readers to
-     * unlock before it's ok to use it
-     */
-
-    if (rwlock->readers) {
-        /* There are readers active, give up */
-        DosReleaseMutexSem(rwlock->write_lock);
-        rc = ERROR_TIMEOUT;
-    }
-
-    return APR_FROM_OS_ERROR(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_unlock(apr_thread_rwlock_t *rwlock)
-{
-    ULONG rc;
-
-    /* First, guess that we're unlocking a writer */
-    rc = DosReleaseMutexSem(rwlock->write_lock);
-
-    if (rc == ERROR_NOT_OWNER) {
-        /* Nope, we must have a read lock */
-        if (rwlock->readers) {
-            DosEnterCritSec();
-            rwlock->readers--;
-
-            if (rwlock->readers == 0) {
-                DosPostEventSem(rwlock->read_done);
-            }
-
-            DosExitCritSec();
-            rc = 0;
-        }
-    }
-
-    return APR_FROM_OS_ERROR(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_destroy(apr_thread_rwlock_t *rwlock)
-{
-    ULONG rc;
-
-    if (rwlock->write_lock == 0)
-        return APR_SUCCESS;
-
-    while (DosReleaseMutexSem(rwlock->write_lock) == 0);
-
-    rc = DosCloseMutexSem(rwlock->write_lock);
-
-    if (!rc) {
-        rwlock->write_lock = 0;
-        DosCloseEventSem(rwlock->read_done);
-        return APR_SUCCESS;
-    }
-
-    return APR_FROM_OS_ERROR(rc);
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(thread_rwlock)
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/.libs/global_mutex.o b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/.libs/global_mutex.o
deleted file mode 100644
index 3eebee5d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/.libs/global_mutex.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/.libs/proc_mutex.o b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/.libs/proc_mutex.o
deleted file mode 100644
index 400b58df..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/.libs/proc_mutex.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/.libs/thread_cond.o b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/.libs/thread_cond.o
deleted file mode 100644
index bd2f15fe..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/.libs/thread_cond.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/.libs/thread_mutex.o b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/.libs/thread_mutex.o
deleted file mode 100644
index 68df9b5e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/.libs/thread_mutex.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/.libs/thread_rwlock.o b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/.libs/thread_rwlock.o
deleted file mode 100644
index 3b39fdc5..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/.libs/thread_rwlock.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/Makefile
deleted file mode 100644
index 7e08a35e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-srcdir = .
-
-
-TARGETS = \
-	thread_mutex.lo \
-	thread_rwlock.lo \
-	thread_cond.lo \
-	proc_mutex.lo \
-	global_mutex.lo
-
-# bring in rules.mk for standard functionality
-include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
-
-INCDIR=../../include
-INCDIR2=$(INCDIR)/arch
-INCDIR3=$(INCDIR)/arch/unix
-INCLUDES=-I$(INCDIR) -I$(INCDIR2) -I$(INCDIR3)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/Makefile.in
deleted file mode 100644
index 618b0eb1..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = \
-	thread_mutex.lo \
-	thread_rwlock.lo \
-	thread_cond.lo \
-	proc_mutex.lo \
-	global_mutex.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-INCDIR2=$(INCDIR)/arch
-INCDIR3=$(INCDIR)/arch/unix
-INCLUDES=-I$(INCDIR) -I$(INCDIR2) -I$(INCDIR3)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/global_mutex.c b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/global_mutex.c
deleted file mode 100644
index bfe360aa..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/global_mutex.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_strings.h"
-#include "apr_arch_global_mutex.h"
-#include "apr_proc_mutex.h"
-#include "apr_thread_mutex.h"
-#include "apr_portable.h"
-
-static apr_status_t global_mutex_cleanup(void *data)
-{
-    apr_global_mutex_t *m = (apr_global_mutex_t *)data;
-    apr_status_t rv;
-
-    rv = apr_proc_mutex_destroy(m->proc_mutex);
-
-#if APR_HAS_THREADS
-    if (m->thread_mutex) {
-        if (rv != APR_SUCCESS) {
-            (void)apr_thread_mutex_destroy(m->thread_mutex);
-        }
-        else {
-            rv = apr_thread_mutex_destroy(m->thread_mutex);
-        }
-    }
-#endif /* APR_HAS_THREADS */
-
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_global_mutex_create(apr_global_mutex_t **mutex,
-                                                  const char *fname,
-                                                  apr_lockmech_e mech,
-                                                  apr_pool_t *pool)
-{
-    apr_status_t rv;
-    apr_global_mutex_t *m;
-
-    m = (apr_global_mutex_t *)apr_palloc(pool, sizeof(*m));
-    m->pool = pool;
-
-    rv = apr_proc_mutex_create(&m->proc_mutex, fname, mech, m->pool);
-    if (rv != APR_SUCCESS) {
-        return rv;
-    }
-
-#if APR_HAS_THREADS
-    if (m->proc_mutex->inter_meth->flags & APR_PROCESS_LOCK_MECH_IS_GLOBAL) {
-        m->thread_mutex = NULL; /* We don't need a thread lock. */
-    }
-    else {
-        rv = apr_thread_mutex_create(&m->thread_mutex,
-                                     APR_THREAD_MUTEX_DEFAULT, m->pool);
-        if (rv != APR_SUCCESS) {
-            rv = apr_proc_mutex_destroy(m->proc_mutex);
-            return rv;
-        }
-    }
-#endif /* APR_HAS_THREADS */
-
-    apr_pool_cleanup_register(m->pool, (void *)m,
-                              global_mutex_cleanup, apr_pool_cleanup_null);
-    *mutex = m;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_global_mutex_child_init(
-                              apr_global_mutex_t **mutex,
-                              const char *fname,
-                              apr_pool_t *pool)
-{
-    apr_status_t rv;
-
-    rv = apr_proc_mutex_child_init(&((*mutex)->proc_mutex), fname, pool);
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_global_mutex_lock(apr_global_mutex_t *mutex)
-{
-    apr_status_t rv;
-
-#if APR_HAS_THREADS
-    if (mutex->thread_mutex) {
-        rv = apr_thread_mutex_lock(mutex->thread_mutex);
-        if (rv != APR_SUCCESS) {
-            return rv;
-        }
-    }
-#endif /* APR_HAS_THREADS */
-
-    rv = apr_proc_mutex_lock(mutex->proc_mutex);
-
-#if APR_HAS_THREADS
-    if (rv != APR_SUCCESS) {
-        if (mutex->thread_mutex) {
-            (void)apr_thread_mutex_unlock(mutex->thread_mutex);
-        }
-    }
-#endif /* APR_HAS_THREADS */
-
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_global_mutex_trylock(apr_global_mutex_t *mutex)
-{
-    apr_status_t rv;
-
-#if APR_HAS_THREADS
-    if (mutex->thread_mutex) {
-        rv = apr_thread_mutex_trylock(mutex->thread_mutex);
-        if (rv != APR_SUCCESS) {
-            return rv;
-        }
-    }
-#endif /* APR_HAS_THREADS */
-
-    rv = apr_proc_mutex_trylock(mutex->proc_mutex);
-
-#if APR_HAS_THREADS
-    if (rv != APR_SUCCESS) {
-        if (mutex->thread_mutex) {
-            (void)apr_thread_mutex_unlock(mutex->thread_mutex);
-        }
-    }
-#endif /* APR_HAS_THREADS */
-
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_global_mutex_unlock(apr_global_mutex_t *mutex)
-{
-    apr_status_t rv;
-
-    rv = apr_proc_mutex_unlock(mutex->proc_mutex);
-#if APR_HAS_THREADS
-    if (mutex->thread_mutex) {
-        if (rv != APR_SUCCESS) {
-            (void)apr_thread_mutex_unlock(mutex->thread_mutex);
-        }
-        else {
-            rv = apr_thread_mutex_unlock(mutex->thread_mutex);
-        }
-    }
-#endif /* APR_HAS_THREADS */
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_os_global_mutex_get(apr_os_global_mutex_t *ospmutex,
-                                                apr_global_mutex_t *pmutex)
-{
-    ospmutex->pool = pmutex->pool;
-    ospmutex->proc_mutex = pmutex->proc_mutex;
-#if APR_HAS_THREADS
-    ospmutex->thread_mutex = pmutex->thread_mutex;
-#endif
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_global_mutex_destroy(apr_global_mutex_t *mutex)
-{
-    return apr_pool_cleanup_run(mutex->pool, mutex, global_mutex_cleanup);
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(global_mutex)
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/global_mutex.lo b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/global_mutex.lo
deleted file mode 100644
index d0fa5457..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/global_mutex.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# global_mutex.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/global_mutex.o'
-
-# Name of the non-PIC object.
-non_pic_object='global_mutex.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/global_mutex.o b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/global_mutex.o
deleted file mode 100644
index 7e44179b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/global_mutex.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/proc_mutex.c b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/proc_mutex.c
deleted file mode 100644
index eb7b8de4..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/proc_mutex.c
+++ /dev/null
@@ -1,894 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_strings.h"
-#include "apr_arch_proc_mutex.h"
-#include "apr_arch_file_io.h" /* for apr_mkstemp() */
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_destroy(apr_proc_mutex_t *mutex)
-{
-    return apr_pool_cleanup_run(mutex->pool, mutex, apr_proc_mutex_cleanup);
-}
-
-static apr_status_t proc_mutex_no_tryacquire(apr_proc_mutex_t *new_mutex)
-{
-    return APR_ENOTIMPL;
-}
-
-#if APR_HAS_POSIXSEM_SERIALIZE
-
-#ifndef SEM_FAILED
-#define SEM_FAILED (-1)
-#endif
-
-static void proc_mutex_posix_setup(void)
-{
-}
-
-static apr_status_t proc_mutex_posix_cleanup(void *mutex_)
-{
-    apr_proc_mutex_t *mutex=mutex_;
-    apr_status_t stat = APR_SUCCESS;
-    
-    if (mutex->interproc->filedes != -1) {
-        if (sem_close((sem_t *)mutex->interproc->filedes) < 0) {
-            stat = errno;
-        }
-    }
-    return stat;
-}    
-
-static apr_status_t proc_mutex_posix_create(apr_proc_mutex_t *new_mutex,
-                                            const char *fname)
-{
-    sem_t *psem;
-    apr_status_t stat;
-    char semname[31];
-    apr_time_t now;
-    unsigned long sec;
-    unsigned long usec;
-    
-    new_mutex->interproc = apr_palloc(new_mutex->pool,
-                                      sizeof(*new_mutex->interproc));
-    new_mutex->interproc->filedes = -1;
-    /*
-     * This bogusness is to follow what appears to be the
-     * lowest common denominator in Posix semaphore naming:
-     *   - start with '/'
-     *   - be at most 14 chars
-     *   - be unique and not match anything on the filesystem
-     *
-     * Because of this, we ignore fname, and try our
-     * own naming system. We tuck the name away, since it might
-     * be useful for debugging. to  make this as robust as possible,
-     * we initially try something larger (and hopefully more unique)
-     * and gracefully fail down to the LCD above.
-     *
-     * NOTE: Darwin (Mac OS X) seems to be the most restrictive
-     * implementation. Versions previous to Darwin 6.2 had the 14
-     * char limit, but later rev's allow up to 31 characters.
-     *
-     * FIXME: There is a small window of opportunity where
-     * instead of getting a new semaphore descriptor, we get
-     * a previously obtained one. This can happen if the requests
-     * are made at the "same time" and in the small span of time between
-     * the sem_open and the sem_unlink. Use of O_EXCL does not
-     * help here however...
-     *
-     */
-    now = apr_time_now();
-    sec = apr_time_sec(now);
-    usec = apr_time_usec(now);
-    apr_snprintf(semname, sizeof(semname), "/ApR.%lxZ%lx", sec, usec);
-    psem = sem_open((const char *) semname, O_CREAT, 0644, 1);
-    if ((psem == (sem_t *)SEM_FAILED) && (errno == ENAMETOOLONG)) {
-        /* Oh well, good try */
-        semname[13] = '\0';
-        psem = sem_open((const char *) semname, O_CREAT, 0644, 1);
-    }
-
-    if (psem == (sem_t *)SEM_FAILED) {
-        stat = errno;
-        proc_mutex_posix_cleanup(new_mutex);
-        return stat;
-    }
-    /* Ahhh. The joys of Posix sems. Predelete it... */
-    sem_unlink((const char *) semname);
-    new_mutex->interproc->filedes = (int)psem;	/* Ugg */
-    new_mutex->fname = apr_pstrdup(new_mutex->pool, semname);
-    apr_pool_cleanup_register(new_mutex->pool, (void *)new_mutex,
-                              apr_proc_mutex_cleanup, 
-                              apr_pool_cleanup_null);
-    return APR_SUCCESS;
-}
-
-static apr_status_t proc_mutex_posix_acquire(apr_proc_mutex_t *mutex)
-{
-    int rc;
-
-    if ((rc = sem_wait((sem_t *)mutex->interproc->filedes)) < 0) {
-        return errno;
-    }
-    mutex->curr_locked = 1;
-    return APR_SUCCESS;
-}
-
-static apr_status_t proc_mutex_posix_release(apr_proc_mutex_t *mutex)
-{
-    int rc;
-
-    mutex->curr_locked = 0;
-    if ((rc = sem_post((sem_t *)mutex->interproc->filedes)) < 0) {
-        return errno;
-    }
-    return APR_SUCCESS;
-}
-
-static apr_status_t proc_mutex_posix_child_init(apr_proc_mutex_t **mutex,
-                                                apr_pool_t *cont,
-                                                const char *fname)
-{
-    return APR_SUCCESS;
-}
-
-const apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_posix_methods =
-{
-#if APR_PROCESS_LOCK_IS_GLOBAL || !APR_HAS_THREADS || defined(POSIXSEM_IS_GLOBAL)
-    APR_PROCESS_LOCK_MECH_IS_GLOBAL,
-#else
-    0,
-#endif
-    proc_mutex_posix_create,
-    proc_mutex_posix_acquire,
-    proc_mutex_no_tryacquire,
-    proc_mutex_posix_release,
-    proc_mutex_posix_cleanup,
-    proc_mutex_posix_child_init,
-    "posixsem"
-};
-
-#endif /* Posix sem implementation */
-
-#if APR_HAS_SYSVSEM_SERIALIZE
-
-static struct sembuf proc_mutex_op_on;
-static struct sembuf proc_mutex_op_off;
-
-static void proc_mutex_sysv_setup(void)
-{
-    proc_mutex_op_on.sem_num = 0;
-    proc_mutex_op_on.sem_op = -1;
-    proc_mutex_op_on.sem_flg = SEM_UNDO;
-    proc_mutex_op_off.sem_num = 0;
-    proc_mutex_op_off.sem_op = 1;
-    proc_mutex_op_off.sem_flg = SEM_UNDO;
-}
-
-static apr_status_t proc_mutex_sysv_cleanup(void *mutex_)
-{
-    apr_proc_mutex_t *mutex=mutex_;
-    union semun ick;
-    
-    if (mutex->interproc->filedes != -1) {
-        ick.val = 0;
-        semctl(mutex->interproc->filedes, 0, IPC_RMID, ick);
-    }
-    return APR_SUCCESS;
-}    
-
-static apr_status_t proc_mutex_sysv_create(apr_proc_mutex_t *new_mutex,
-                                           const char *fname)
-{
-    union semun ick;
-    apr_status_t rv;
-    
-    new_mutex->interproc = apr_palloc(new_mutex->pool, sizeof(*new_mutex->interproc));
-    new_mutex->interproc->filedes = semget(IPC_PRIVATE, 1, IPC_CREAT | 0600);
-
-    if (new_mutex->interproc->filedes < 0) {
-        rv = errno;
-        proc_mutex_sysv_cleanup(new_mutex);
-        return rv;
-    }
-    ick.val = 1;
-    if (semctl(new_mutex->interproc->filedes, 0, SETVAL, ick) < 0) {
-        rv = errno;
-        proc_mutex_sysv_cleanup(new_mutex);
-        return rv;
-    }
-    new_mutex->curr_locked = 0;
-    apr_pool_cleanup_register(new_mutex->pool,
-                              (void *)new_mutex, apr_proc_mutex_cleanup, 
-                              apr_pool_cleanup_null);
-    return APR_SUCCESS;
-}
-
-static apr_status_t proc_mutex_sysv_acquire(apr_proc_mutex_t *mutex)
-{
-    int rc;
-
-    do {
-        rc = semop(mutex->interproc->filedes, &proc_mutex_op_on, 1);
-    } while (rc < 0 && errno == EINTR);
-    if (rc < 0) {
-        return errno;
-    }
-    mutex->curr_locked = 1;
-    return APR_SUCCESS;
-}
-
-static apr_status_t proc_mutex_sysv_release(apr_proc_mutex_t *mutex)
-{
-    int rc;
-
-    mutex->curr_locked = 0;
-    do {
-        rc = semop(mutex->interproc->filedes, &proc_mutex_op_off, 1);
-    } while (rc < 0 && errno == EINTR);
-    if (rc < 0) {
-        return errno;
-    }
-    return APR_SUCCESS;
-}
-
-static apr_status_t proc_mutex_sysv_child_init(apr_proc_mutex_t **mutex, apr_pool_t *cont, const char *fname)
-{
-    return APR_SUCCESS;
-}
-
-const apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_sysv_methods =
-{
-#if APR_PROCESS_LOCK_IS_GLOBAL || !APR_HAS_THREADS || defined(SYSVSEM_IS_GLOBAL)
-    APR_PROCESS_LOCK_MECH_IS_GLOBAL,
-#else
-    0,
-#endif
-    proc_mutex_sysv_create,
-    proc_mutex_sysv_acquire,
-    proc_mutex_no_tryacquire,
-    proc_mutex_sysv_release,
-    proc_mutex_sysv_cleanup,
-    proc_mutex_sysv_child_init,
-    "sysvsem"
-};
-
-#endif /* SysV sem implementation */
-
-#if APR_HAS_PROC_PTHREAD_SERIALIZE
-
-static void proc_mutex_proc_pthread_setup(void)
-{
-}
-
-static apr_status_t proc_mutex_proc_pthread_cleanup(void *mutex_)
-{
-    apr_proc_mutex_t *mutex=mutex_;
-    apr_status_t rv;
-
-    if (mutex->curr_locked == 1) {
-        if ((rv = pthread_mutex_unlock(mutex->pthread_interproc))) {
-#ifdef PTHREAD_SETS_ERRNO
-            rv = errno;
-#endif
-            return rv;
-        } 
-        if (munmap((caddr_t)mutex->pthread_interproc, sizeof(pthread_mutex_t))){
-            return errno;
-        }
-    }
-    return APR_SUCCESS;
-}    
-
-static apr_status_t proc_mutex_proc_pthread_create(apr_proc_mutex_t *new_mutex,
-                                                   const char *fname)
-{
-    apr_status_t rv;
-    int fd;
-    pthread_mutexattr_t mattr;
-
-    fd = open("/dev/zero", O_RDWR);
-    if (fd < 0) {
-        return errno;
-    }
-
-    new_mutex->pthread_interproc = (pthread_mutex_t *)mmap(
-                                       (caddr_t) 0, 
-                                       sizeof(pthread_mutex_t), 
-                                       PROT_READ | PROT_WRITE, MAP_SHARED,
-                                       fd, 0); 
-    if (new_mutex->pthread_interproc == (pthread_mutex_t *) (caddr_t) -1) {
-        return errno;
-    }
-    close(fd);
-    if ((rv = pthread_mutexattr_init(&mattr))) {
-#ifdef PTHREAD_SETS_ERRNO
-        rv = errno;
-#endif
-        proc_mutex_proc_pthread_cleanup(new_mutex);
-        return rv;
-    }
-    if ((rv = pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED))) {
-#ifdef PTHREAD_SETS_ERRNO
-        rv = errno;
-#endif
-        proc_mutex_proc_pthread_cleanup(new_mutex);
-        return rv;
-    }
-
-#ifdef HAVE_PTHREAD_MUTEX_ROBUST
-    if ((rv = pthread_mutexattr_setrobust_np(&mattr, 
-                                               PTHREAD_MUTEX_ROBUST_NP))) {
-#ifdef PTHREAD_SETS_ERRNO
-        rv = errno;
-#endif
-        proc_mutex_proc_pthread_cleanup(new_mutex);
-        return rv;
-    }
-    if ((rv = pthread_mutexattr_setprotocol(&mattr, PTHREAD_PRIO_INHERIT))) {
-#ifdef PTHREAD_SETS_ERRNO
-        rv = errno;
-#endif
-        proc_mutex_proc_pthread_cleanup(new_mutex);
-        return rv;
-    }
-#endif /* HAVE_PTHREAD_MUTEX_ROBUST */
-
-    if ((rv = pthread_mutex_init(new_mutex->pthread_interproc, &mattr))) {
-#ifdef PTHREAD_SETS_ERRNO
-        rv = errno;
-#endif
-        proc_mutex_proc_pthread_cleanup(new_mutex);
-        return rv;
-    }
-
-    if ((rv = pthread_mutexattr_destroy(&mattr))) {
-#ifdef PTHREAD_SETS_ERRNO
-        rv = errno;
-#endif
-        proc_mutex_proc_pthread_cleanup(new_mutex);
-        return rv;
-    }
-
-    new_mutex->curr_locked = 0;
-    apr_pool_cleanup_register(new_mutex->pool,
-                              (void *)new_mutex,
-                              apr_proc_mutex_cleanup, 
-                              apr_pool_cleanup_null);
-    return APR_SUCCESS;
-}
-
-static apr_status_t proc_mutex_proc_pthread_acquire(apr_proc_mutex_t *mutex)
-{
-    apr_status_t rv;
-
-    if ((rv = pthread_mutex_lock(mutex->pthread_interproc))) {
-#ifdef PTHREAD_SETS_ERRNO
-        rv = errno;
-#endif
-#ifdef HAVE_PTHREAD_MUTEX_ROBUST
-        /* Okay, our owner died.  Let's try to make it consistent again. */
-        if (rv == EOWNERDEAD) {
-            pthread_mutex_consistent_np(mutex->pthread_interproc);
-        }
-        else
-            return rv;
-#else
-        return rv;
-#endif
-    }
-    mutex->curr_locked = 1;
-    return APR_SUCCESS;
-}
-
-/* TODO: Add proc_mutex_proc_pthread_tryacquire(apr_proc_mutex_t *mutex) */
-
-static apr_status_t proc_mutex_proc_pthread_release(apr_proc_mutex_t *mutex)
-{
-    apr_status_t rv;
-
-    mutex->curr_locked = 0;
-    if ((rv = pthread_mutex_unlock(mutex->pthread_interproc))) {
-#ifdef PTHREAD_SETS_ERRNO
-        rv = errno;
-#endif
-        return rv;
-    }
-    return APR_SUCCESS;
-}
-
-static apr_status_t proc_mutex_proc_pthread_child_init(apr_proc_mutex_t **mutex,
-                                            apr_pool_t *cont, 
-                                            const char *fname)
-{
-    return APR_SUCCESS;
-}
-
-const apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_proc_pthread_methods =
-{
-    APR_PROCESS_LOCK_MECH_IS_GLOBAL,
-    proc_mutex_proc_pthread_create,
-    proc_mutex_proc_pthread_acquire,
-    proc_mutex_no_tryacquire,
-    proc_mutex_proc_pthread_release,
-    proc_mutex_proc_pthread_cleanup,
-    proc_mutex_proc_pthread_child_init,
-    "pthread"
-};
-
-#endif
-
-#if APR_HAS_FCNTL_SERIALIZE
-
-static struct flock proc_mutex_lock_it;
-static struct flock proc_mutex_unlock_it;
-
-static apr_status_t proc_mutex_fcntl_release(apr_proc_mutex_t *);
-
-static void proc_mutex_fcntl_setup(void)
-{
-    proc_mutex_lock_it.l_whence = SEEK_SET;   /* from current point */
-    proc_mutex_lock_it.l_start = 0;           /* -"- */
-    proc_mutex_lock_it.l_len = 0;             /* until end of file */
-    proc_mutex_lock_it.l_type = F_WRLCK;      /* set exclusive/write lock */
-    proc_mutex_lock_it.l_pid = 0;             /* pid not actually interesting */
-    proc_mutex_unlock_it.l_whence = SEEK_SET; /* from current point */
-    proc_mutex_unlock_it.l_start = 0;         /* -"- */
-    proc_mutex_unlock_it.l_len = 0;           /* until end of file */
-    proc_mutex_unlock_it.l_type = F_UNLCK;    /* set exclusive/write lock */
-    proc_mutex_unlock_it.l_pid = 0;           /* pid not actually interesting */
-}
-
-static apr_status_t proc_mutex_fcntl_cleanup(void *mutex_)
-{
-    apr_status_t status;
-    apr_proc_mutex_t *mutex=mutex_;
-
-    if (mutex->curr_locked == 1) {
-        status = proc_mutex_fcntl_release(mutex);
-        if (status != APR_SUCCESS)
-            return status;
-    }
-    if (mutex->interproc) { /* if it was opened successfully */
-        apr_file_close(mutex->interproc);
-    }
-    return APR_SUCCESS;
-}    
-
-static apr_status_t proc_mutex_fcntl_create(apr_proc_mutex_t *new_mutex,
-                                            const char *fname)
-{
-    int rv;
- 
-    if (fname) {
-        new_mutex->fname = apr_pstrdup(new_mutex->pool, fname);
-        rv = apr_file_open(&new_mutex->interproc, new_mutex->fname,
-                           APR_CREATE | APR_WRITE | APR_EXCL, 
-                           APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD,
-                           new_mutex->pool);
-    }
-    else {
-        new_mutex->fname = apr_pstrdup(new_mutex->pool, "/tmp/aprXXXXXX");
-        rv = apr_file_mktemp(&new_mutex->interproc, new_mutex->fname,
-                             APR_CREATE | APR_WRITE | APR_EXCL,
-                             new_mutex->pool);
-    }
- 
-    if (rv != APR_SUCCESS) {
-        proc_mutex_fcntl_cleanup(new_mutex);
-        return rv;
-    }
-
-    new_mutex->curr_locked = 0;
-    unlink(new_mutex->fname);
-    apr_pool_cleanup_register(new_mutex->pool,
-                              (void*)new_mutex,
-                              apr_proc_mutex_cleanup, 
-                              apr_pool_cleanup_null);
-    return APR_SUCCESS; 
-}
-
-static apr_status_t proc_mutex_fcntl_acquire(apr_proc_mutex_t *mutex)
-{
-    int rc;
-
-    do {
-        rc = fcntl(mutex->interproc->filedes, F_SETLKW, &proc_mutex_lock_it);
-    } while (rc < 0 && errno == EINTR);
-    if (rc < 0) {
-        return errno;
-    }
-    mutex->curr_locked=1;
-    return APR_SUCCESS;
-}
-
-static apr_status_t proc_mutex_fcntl_release(apr_proc_mutex_t *mutex)
-{
-    int rc;
-
-    mutex->curr_locked=0;
-    do {
-        rc = fcntl(mutex->interproc->filedes, F_SETLKW, &proc_mutex_unlock_it);
-    } while (rc < 0 && errno == EINTR);
-    if (rc < 0) {
-        return errno;
-    }
-    return APR_SUCCESS;
-}
-
-static apr_status_t proc_mutex_fcntl_child_init(apr_proc_mutex_t **mutex,
-                                                apr_pool_t *pool, 
-                                                const char *fname)
-{
-    return APR_SUCCESS;
-}
-
-const apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_fcntl_methods =
-{
-#if APR_PROCESS_LOCK_IS_GLOBAL || !APR_HAS_THREADS || defined(FCNTL_IS_GLOBAL)
-    APR_PROCESS_LOCK_MECH_IS_GLOBAL,
-#else
-    0,
-#endif
-    proc_mutex_fcntl_create,
-    proc_mutex_fcntl_acquire,
-    proc_mutex_no_tryacquire,
-    proc_mutex_fcntl_release,
-    proc_mutex_fcntl_cleanup,
-    proc_mutex_fcntl_child_init,
-    "fcntl"
-};
-
-#endif /* fcntl implementation */
-
-#if APR_HAS_FLOCK_SERIALIZE
-
-static apr_status_t proc_mutex_flock_release(apr_proc_mutex_t *);
-
-static void proc_mutex_flock_setup(void)
-{
-}
-
-static apr_status_t proc_mutex_flock_cleanup(void *mutex_)
-{
-    apr_status_t status;
-    apr_proc_mutex_t *mutex=mutex_;
-
-    if (mutex->curr_locked == 1) {
-        status = proc_mutex_flock_release(mutex);
-        if (status != APR_SUCCESS)
-            return status;
-    }
-    if (mutex->interproc) { /* if it was opened properly */
-        apr_file_close(mutex->interproc);
-    }
-    unlink(mutex->fname);
-    return APR_SUCCESS;
-}    
-
-static apr_status_t proc_mutex_flock_create(apr_proc_mutex_t *new_mutex,
-                                            const char *fname)
-{
-    int rv;
- 
-    if (fname) {
-        new_mutex->fname = apr_pstrdup(new_mutex->pool, fname);
-        rv = apr_file_open(&new_mutex->interproc, new_mutex->fname,
-                           APR_CREATE | APR_WRITE | APR_EXCL, 
-                           APR_UREAD | APR_UWRITE,
-                           new_mutex->pool);
-    }
-    else {
-        new_mutex->fname = apr_pstrdup(new_mutex->pool, "/tmp/aprXXXXXX");
-        rv = apr_file_mktemp(&new_mutex->interproc, new_mutex->fname,
-                             APR_CREATE | APR_WRITE | APR_EXCL,
-                             new_mutex->pool);
-    }
- 
-    if (rv != APR_SUCCESS) {
-        proc_mutex_flock_cleanup(new_mutex);
-        return errno;
-    }
-    new_mutex->curr_locked = 0;
-    apr_pool_cleanup_register(new_mutex->pool, (void *)new_mutex,
-                              apr_proc_mutex_cleanup,
-                              apr_pool_cleanup_null);
-    return APR_SUCCESS;
-}
-
-static apr_status_t proc_mutex_flock_acquire(apr_proc_mutex_t *mutex)
-{
-    int rc;
-
-    do {
-        rc = flock(mutex->interproc->filedes, LOCK_EX);
-    } while (rc < 0 && errno == EINTR);
-    if (rc < 0) {
-        return errno;
-    }
-    mutex->curr_locked = 1;
-    return APR_SUCCESS;
-}
-
-static apr_status_t proc_mutex_flock_release(apr_proc_mutex_t *mutex)
-{
-    int rc;
-
-    mutex->curr_locked = 0;
-    do {
-        rc = flock(mutex->interproc->filedes, LOCK_UN);
-    } while (rc < 0 && errno == EINTR);
-    if (rc < 0) {
-        return errno;
-    }
-    return APR_SUCCESS;
-}
-
-static apr_status_t proc_mutex_flock_child_init(apr_proc_mutex_t **mutex,
-                                                apr_pool_t *pool, 
-                                                const char *fname)
-{
-    apr_proc_mutex_t *new_mutex;
-    int rv;
-
-    new_mutex = (apr_proc_mutex_t *)apr_palloc(pool, sizeof(apr_proc_mutex_t));
-
-    memcpy(new_mutex, *mutex, sizeof *new_mutex);
-    new_mutex->pool = pool;
-    if (!fname) {
-        fname = (*mutex)->fname;
-    }
-    new_mutex->fname = apr_pstrdup(pool, fname);
-    rv = apr_file_open(&new_mutex->interproc, new_mutex->fname,
-                       APR_WRITE, 0, new_mutex->pool);
-    if (rv != APR_SUCCESS) {
-        proc_mutex_flock_cleanup(new_mutex);
-        return rv;
-    }
-    *mutex = new_mutex;
-    return APR_SUCCESS;
-}
-
-const apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_flock_methods =
-{
-#if APR_PROCESS_LOCK_IS_GLOBAL || !APR_HAS_THREADS || defined(FLOCK_IS_GLOBAL)
-    APR_PROCESS_LOCK_MECH_IS_GLOBAL,
-#else
-    0,
-#endif
-    proc_mutex_flock_create,
-    proc_mutex_flock_acquire,
-    proc_mutex_no_tryacquire,
-    proc_mutex_flock_release,
-    proc_mutex_flock_cleanup,
-    proc_mutex_flock_child_init,
-    "flock"
-};
-
-#endif /* flock implementation */
-
-void apr_proc_mutex_unix_setup_lock(void)
-{
-#if APR_HAS_POSIXSEM_SERIALIZE
-    proc_mutex_posix_setup();
-#endif
-#if APR_HAS_SYSVSEM_SERIALIZE
-    proc_mutex_sysv_setup();
-#endif
-#if APR_HAS_PROC_PTHREAD_SERIALIZE
-    proc_mutex_proc_pthread_setup();
-#endif
-#if APR_HAS_FCNTL_SERIALIZE
-    proc_mutex_fcntl_setup();
-#endif
-#if APR_HAS_FLOCK_SERIALIZE
-    proc_mutex_flock_setup();
-#endif
-}
-
-static apr_status_t proc_mutex_choose_method(apr_proc_mutex_t *new_mutex, apr_lockmech_e mech)
-{
-    switch (mech) {
-    case APR_LOCK_FCNTL:
-#if APR_HAS_FCNTL_SERIALIZE
-        new_mutex->inter_meth = &apr_proc_mutex_unix_fcntl_methods;
-#else
-        return APR_ENOTIMPL;
-#endif
-        break;
-    case APR_LOCK_FLOCK:
-#if APR_HAS_FLOCK_SERIALIZE
-        new_mutex->inter_meth = &apr_proc_mutex_unix_flock_methods;
-#else
-        return APR_ENOTIMPL;
-#endif
-        break;
-    case APR_LOCK_SYSVSEM:
-#if APR_HAS_SYSVSEM_SERIALIZE
-        new_mutex->inter_meth = &apr_proc_mutex_unix_sysv_methods;
-#else
-        return APR_ENOTIMPL;
-#endif
-        break;
-    case APR_LOCK_POSIXSEM:
-#if APR_HAS_POSIXSEM_SERIALIZE
-        new_mutex->inter_meth = &apr_proc_mutex_unix_posix_methods;
-#else
-        return APR_ENOTIMPL;
-#endif
-        break;
-    case APR_LOCK_PROC_PTHREAD:
-#if APR_HAS_PROC_PTHREAD_SERIALIZE
-        new_mutex->inter_meth = &apr_proc_mutex_unix_proc_pthread_methods;
-#else
-        return APR_ENOTIMPL;
-#endif
-        break;
-    case APR_LOCK_DEFAULT:
-#if APR_USE_FLOCK_SERIALIZE
-        new_mutex->inter_meth = &apr_proc_mutex_unix_flock_methods;
-#elif APR_USE_SYSVSEM_SERIALIZE
-        new_mutex->inter_meth = &apr_proc_mutex_unix_sysv_methods;
-#elif APR_USE_FCNTL_SERIALIZE
-        new_mutex->inter_meth = &apr_proc_mutex_unix_fcntl_methods;
-#elif APR_USE_PROC_PTHREAD_SERIALIZE
-        new_mutex->inter_meth = &apr_proc_mutex_unix_proc_pthread_methods;
-#elif APR_USE_POSIXSEM_SERIALIZE
-        new_mutex->inter_meth = &apr_proc_mutex_unix_posix_methods;
-#else
-        return APR_ENOTIMPL;
-#endif
-        break;
-    default:
-        return APR_ENOTIMPL;
-    }
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(const char *) apr_proc_mutex_defname(void)
-{
-    apr_status_t rv;
-    apr_proc_mutex_t mutex;
-
-    if ((rv = proc_mutex_choose_method(&mutex, APR_LOCK_DEFAULT)) != APR_SUCCESS) {
-        return "unknown";
-    }
-    mutex.meth = mutex.inter_meth;
-
-    return apr_proc_mutex_name(&mutex);
-}
-   
-static apr_status_t proc_mutex_create(apr_proc_mutex_t *new_mutex, apr_lockmech_e mech, const char *fname)
-{
-    apr_status_t rv;
-
-    if ((rv = proc_mutex_choose_method(new_mutex, mech)) != APR_SUCCESS) {
-        return rv;
-    }
-
-    new_mutex->meth = new_mutex->inter_meth;
-
-    if ((rv = new_mutex->meth->create(new_mutex, fname)) != APR_SUCCESS) {
-        return rv;
-    }
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_create(apr_proc_mutex_t **mutex,
-                                                const char *fname,
-                                                apr_lockmech_e mech,
-                                                apr_pool_t *pool)
-{
-    apr_proc_mutex_t *new_mutex;
-    apr_status_t rv;
-
-    new_mutex = (apr_proc_mutex_t *)apr_pcalloc(pool,
-                                                sizeof(apr_proc_mutex_t));
-
-    new_mutex->pool  = pool;
-#if APR_HAS_SYSVSEM_SERIALIZE || APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE || APR_HAS_POSIXSEM_SERIALIZE
-    new_mutex->interproc = NULL;
-#endif
-
-    if ((rv = proc_mutex_create(new_mutex, mech, fname)) != APR_SUCCESS)
-        return rv;
-
-    *mutex = new_mutex;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_child_init(apr_proc_mutex_t **mutex,
-                                                    const char *fname,
-                                                    apr_pool_t *pool)
-{
-    return (*mutex)->meth->child_init(mutex, pool, fname);
-}
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_lock(apr_proc_mutex_t *mutex)
-{
-    return mutex->meth->acquire(mutex);
-}
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_trylock(apr_proc_mutex_t *mutex)
-{
-    return mutex->meth->tryacquire(mutex);
-}
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_unlock(apr_proc_mutex_t *mutex)
-{
-    return mutex->meth->release(mutex);
-}
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_cleanup(void *mutex)
-{
-    return ((apr_proc_mutex_t *)mutex)->meth->cleanup(mutex);
-}
-
-APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex)
-{
-    return mutex->meth->name;
-}
-
-APR_DECLARE(const char *) apr_proc_mutex_lockfile(apr_proc_mutex_t *mutex)
-{
-    /* posix sems use the fname field but don't use a file,
-     * so be careful 
-     */
-    if (!strcmp(mutex->meth->name, "flock") ||
-        !strcmp(mutex->meth->name, "fcntl")) {
-        return mutex->fname;
-    }
-    return NULL;
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(proc_mutex)
-
-/* Implement OS-specific accessors defined in apr_portable.h */
-
-APR_DECLARE(apr_status_t) apr_os_proc_mutex_get(apr_os_proc_mutex_t *ospmutex,
-                                                apr_proc_mutex_t *pmutex)
-{
-#if APR_HAS_SYSVSEM_SERIALIZE || APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE || APR_HAS_POSIXSEM_SERIALIZE
-    ospmutex->crossproc = pmutex->interproc->filedes;
-#endif
-#if APR_HAS_PROC_PTHREAD_SERIALIZE
-    ospmutex->pthread_interproc = pmutex->pthread_interproc;
-#endif
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex,
-                                                apr_os_proc_mutex_t *ospmutex,
-                                                apr_pool_t *pool)
-{
-    if (pool == NULL) {
-        return APR_ENOPOOL;
-    }
-    if ((*pmutex) == NULL) {
-        (*pmutex) = (apr_proc_mutex_t *)apr_pcalloc(pool,
-                                                    sizeof(apr_proc_mutex_t));
-        (*pmutex)->pool = pool;
-    }
-#if APR_HAS_SYSVSEM_SERIALIZE || APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE || APR_HAS_POSIXSEM_SERIALIZE
-    apr_os_file_put(&(*pmutex)->interproc, &ospmutex->crossproc, 0, pool);
-#endif
-#if APR_HAS_PROC_PTHREAD_SERIALIZE
-    (*pmutex)->pthread_interproc = ospmutex->pthread_interproc;
-#endif
-    return APR_SUCCESS;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/proc_mutex.lo b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/proc_mutex.lo
deleted file mode 100644
index 2359a0ee..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/proc_mutex.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# proc_mutex.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/proc_mutex.o'
-
-# Name of the non-PIC object.
-non_pic_object='proc_mutex.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/proc_mutex.o b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/proc_mutex.o
deleted file mode 100644
index bee8bb3b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/proc_mutex.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_cond.c b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_cond.c
deleted file mode 100644
index 46d770f1..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_cond.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-
-#if APR_HAS_THREADS
-
-#include "apr_arch_thread_mutex.h"
-#include "apr_arch_thread_cond.h"
-
-static apr_status_t thread_cond_cleanup(void *data)
-{
-    apr_thread_cond_t *cond = (apr_thread_cond_t *)data;
-    apr_status_t rv;
-
-    rv = pthread_cond_destroy(cond->cond);
-#ifdef PTHREAD_SETS_ERRNO
-    if (rv) {
-        rv = errno;
-    }
-#endif
-    return rv;
-} 
-
-APR_DECLARE(apr_status_t) apr_thread_cond_create(apr_thread_cond_t **cond,
-                                                 apr_pool_t *pool)
-{
-    apr_thread_cond_t *new_cond;
-    apr_status_t rv;
-
-    new_cond = (apr_thread_cond_t *)apr_pcalloc(pool,
-                                                sizeof(apr_thread_cond_t));
-
-    if (new_cond == NULL) {
-        return APR_ENOMEM;
-    }
-
-    new_cond->pool = pool;
-    new_cond->cond = (pthread_cond_t *)apr_palloc(pool, 
-                                                  sizeof(pthread_cond_t));
-
-    if (new_cond->cond == NULL) {
-        return APR_ENOMEM;
-    }
-
-    if ((rv = pthread_cond_init(new_cond->cond, NULL))) {
-#ifdef PTHREAD_SETS_ERRNO
-        rv = errno;
-#endif
-        thread_cond_cleanup(new_cond);
-        return rv;
-    }
-
-    apr_pool_cleanup_register(new_cond->pool,
-                              (void *)new_cond, thread_cond_cleanup,
-                              apr_pool_cleanup_null);
-
-    *cond = new_cond;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_wait(apr_thread_cond_t *cond,
-                                               apr_thread_mutex_t *mutex)
-{
-    apr_status_t rv;
-
-    rv = pthread_cond_wait(cond->cond, &mutex->mutex);
-#ifdef PTHREAD_SETS_ERRNO
-    if (rv) {
-        rv = errno;
-    }
-#endif
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_timedwait(apr_thread_cond_t *cond,
-                                                    apr_thread_mutex_t *mutex,
-                                                    apr_interval_time_t timeout)
-{
-    apr_status_t rv;
-    apr_time_t then;
-    struct timespec abstime;
-
-    then = apr_time_now() + timeout;
-    abstime.tv_sec = apr_time_sec(then);
-    abstime.tv_nsec = apr_time_usec(then) * 1000; /* nanoseconds */
-
-    rv = pthread_cond_timedwait(cond->cond, &mutex->mutex, &abstime);
-#ifdef PTHREAD_SETS_ERRNO
-    if (rv) {
-        rv = errno;
-    }
-#endif
-    if (ETIMEDOUT == rv) {
-        return APR_TIMEUP;
-    }
-    return rv;
-}
-
-
-APR_DECLARE(apr_status_t) apr_thread_cond_signal(apr_thread_cond_t *cond)
-{
-    apr_status_t rv;
-
-    rv = pthread_cond_signal(cond->cond);
-#ifdef PTHREAD_SETS_ERRNO
-    if (rv) {
-        rv = errno;
-    }
-#endif
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_broadcast(apr_thread_cond_t *cond)
-{
-    apr_status_t rv;
-
-    rv = pthread_cond_broadcast(cond->cond);
-#ifdef PTHREAD_SETS_ERRNO
-    if (rv) {
-        rv = errno;
-    }
-#endif
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_destroy(apr_thread_cond_t *cond)
-{
-    apr_status_t rv;
-    if ((rv = thread_cond_cleanup(cond)) == APR_SUCCESS) {
-        apr_pool_cleanup_kill(cond->pool, cond, thread_cond_cleanup);
-        return APR_SUCCESS;
-    }
-    return rv;
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(thread_cond)
-
-#endif /* APR_HAS_THREADS */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_cond.lo b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_cond.lo
deleted file mode 100644
index aa4051e8..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_cond.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# thread_cond.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/thread_cond.o'
-
-# Name of the non-PIC object.
-non_pic_object='thread_cond.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_cond.o b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_cond.o
deleted file mode 100644
index b453da92..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_cond.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_mutex.c b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_mutex.c
deleted file mode 100644
index e146a28f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_mutex.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_thread_mutex.h"
-#define APR_WANT_MEMFUNC
-#include "apr_want.h"
-
-#if APR_HAS_THREADS
-
-static apr_status_t thread_mutex_cleanup(void *data)
-{
-    apr_thread_mutex_t *mutex = data;
-    apr_status_t rv;
-
-    rv = pthread_mutex_destroy(&mutex->mutex);
-#ifdef PTHREAD_SETS_ERRNO
-    if (rv) {
-        rv = errno;
-    }
-#endif
-    return rv;
-} 
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_create(apr_thread_mutex_t **mutex,
-                                                  unsigned int flags,
-                                                  apr_pool_t *pool)
-{
-    apr_thread_mutex_t *new_mutex;
-    apr_status_t rv;
-    
-#ifndef HAVE_PTHREAD_MUTEX_RECURSIVE
-    if (flags & APR_THREAD_MUTEX_NESTED) {
-        return APR_ENOTIMPL;
-    }
-#endif
-
-    new_mutex = apr_pcalloc(pool, sizeof(apr_thread_mutex_t));
-    new_mutex->pool = pool;
-
-#ifdef HAVE_PTHREAD_MUTEX_RECURSIVE
-    if (flags & APR_THREAD_MUTEX_NESTED) {
-        pthread_mutexattr_t mattr;
-        
-        rv = pthread_mutexattr_init(&mattr);
-        if (rv) return rv;
-        
-        rv = pthread_mutexattr_settype(&mattr, PTHREAD_MUTEX_RECURSIVE);
-        if (rv) {
-            pthread_mutexattr_destroy(&mattr);
-            return rv;
-        }
-         
-        rv = pthread_mutex_init(&new_mutex->mutex, &mattr);
-        
-        pthread_mutexattr_destroy(&mattr);
-    } else
-#endif
-        rv = pthread_mutex_init(&new_mutex->mutex, NULL);
-
-    if (rv) {
-#ifdef PTHREAD_SETS_ERRNO
-        rv = errno;
-#endif
-        return rv;
-    }
-
-    apr_pool_cleanup_register(new_mutex->pool,
-                              new_mutex, thread_mutex_cleanup,
-                              apr_pool_cleanup_null);
-
-    *mutex = new_mutex;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_lock(apr_thread_mutex_t *mutex)
-{
-    apr_status_t rv;
-
-    rv = pthread_mutex_lock(&mutex->mutex);
-#ifdef PTHREAD_SETS_ERRNO
-    if (rv) {
-        rv = errno;
-    }
-#endif
-    
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_trylock(apr_thread_mutex_t *mutex)
-{
-    apr_status_t rv;
-
-    rv = pthread_mutex_trylock(&mutex->mutex);
-    if (rv) {
-#ifdef PTHREAD_SETS_ERRNO
-        rv = errno;
-#endif
-        return (rv == EBUSY) ? APR_EBUSY : rv;
-    }
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_unlock(apr_thread_mutex_t *mutex)
-{
-    apr_status_t status;
-
-    status = pthread_mutex_unlock(&mutex->mutex);
-#ifdef PTHREAD_SETS_ERRNO
-    if (status) {
-        status = errno;
-    }
-#endif
-
-    return status;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_destroy(apr_thread_mutex_t *mutex)
-{
-    return apr_pool_cleanup_run(mutex->pool, mutex, thread_mutex_cleanup);
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(thread_mutex)
-
-#endif /* APR_HAS_THREADS */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_mutex.lo b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_mutex.lo
deleted file mode 100644
index 9f6d1033..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_mutex.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# thread_mutex.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/thread_mutex.o'
-
-# Name of the non-PIC object.
-non_pic_object='thread_mutex.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_mutex.o b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_mutex.o
deleted file mode 100644
index 87f97293..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_mutex.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_rwlock.c b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_rwlock.c
deleted file mode 100644
index c322b455..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_rwlock.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_thread_rwlock.h"
-#include "apr_private.h"
-
-#if APR_HAS_THREADS
-
-#ifdef HAVE_PTHREAD_RWLOCKS
-
-static apr_status_t thread_rwlock_cleanup(void *data)
-{
-    apr_thread_rwlock_t *rwlock = (apr_thread_rwlock_t *)data;
-    apr_status_t stat;
-
-    pthread_rwlock_unlock(rwlock->rwlock);
-    stat = pthread_rwlock_destroy(rwlock->rwlock);
-#ifdef PTHREAD_SETS_ERRNO
-    if (stat) {
-        stat = errno;
-    }
-#endif
-    return stat;
-} 
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_create(apr_thread_rwlock_t **rwlock,
-                                                   apr_pool_t *pool)
-{
-    apr_thread_rwlock_t *new_rwlock;
-    apr_status_t stat;
-
-    new_rwlock = (apr_thread_rwlock_t *)apr_pcalloc(pool,
-                                                  sizeof(apr_thread_rwlock_t));
-
-    if (new_rwlock == NULL) {
-        return APR_ENOMEM;
-    }
-
-    new_rwlock->pool = pool;
-    new_rwlock->rwlock = (pthread_rwlock_t *)apr_palloc(pool, 
-                                                     sizeof(pthread_rwlock_t));
-
-    if (new_rwlock->rwlock == NULL) {
-        return APR_ENOMEM;
-    }
-
-    if ((stat = pthread_rwlock_init(new_rwlock->rwlock, NULL))) {
-#ifdef PTHREAD_SETS_ERRNO
-        stat = errno;
-#endif
-        thread_rwlock_cleanup(new_rwlock);
-        return stat;
-    }
-
-    apr_pool_cleanup_register(new_rwlock->pool,
-                              (void *)new_rwlock, thread_rwlock_cleanup,
-                              apr_pool_cleanup_null);
-
-    *rwlock = new_rwlock;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_rdlock(apr_thread_rwlock_t *rwlock)
-{
-    apr_status_t stat;
-
-    stat = pthread_rwlock_rdlock(rwlock->rwlock);
-#ifdef PTHREAD_SETS_ERRNO
-    if (stat) {
-        stat = errno;
-    }
-#endif
-    return stat;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_tryrdlock(apr_thread_rwlock_t *rwlock)
-{
-    apr_status_t stat;
-
-    stat = pthread_rwlock_tryrdlock(rwlock->rwlock);
-#ifdef PTHREAD_SETS_ERRNO
-    if (stat) {
-        stat = errno;
-    }
-#endif
-    /* Normalize the return code. */
-    if (stat == EBUSY)
-        stat = APR_EBUSY;
-    return stat;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_wrlock(apr_thread_rwlock_t *rwlock)
-{
-    apr_status_t stat;
-
-    stat = pthread_rwlock_wrlock(rwlock->rwlock);
-#ifdef PTHREAD_SETS_ERRNO
-    if (stat) {
-        stat = errno;
-    }
-#endif
-    return stat;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_trywrlock(apr_thread_rwlock_t *rwlock)
-{
-    apr_status_t stat;
-
-    stat = pthread_rwlock_trywrlock(rwlock->rwlock);
-#ifdef PTHREAD_SETS_ERRNO
-    if (stat) {
-        stat = errno;
-    }
-#endif
-    /* Normalize the return code. */
-    if (stat == EBUSY)
-        stat = APR_EBUSY;
-    return stat;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_unlock(apr_thread_rwlock_t *rwlock)
-{
-    apr_status_t stat;
-
-    stat = pthread_rwlock_unlock(rwlock->rwlock);
-#ifdef PTHREAD_SETS_ERRNO
-    if (stat) {
-        stat = errno;
-    }
-#endif
-    return stat;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_destroy(apr_thread_rwlock_t *rwlock)
-{
-    apr_status_t stat;
-    if ((stat = thread_rwlock_cleanup(rwlock)) == APR_SUCCESS) {
-        apr_pool_cleanup_kill(rwlock->pool, rwlock, thread_rwlock_cleanup);
-        return APR_SUCCESS;
-    }
-    return stat;
-}
-
-#else  /* HAVE_PTHREAD_RWLOCKS */
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_create(apr_thread_rwlock_t **rwlock,
-                                                   apr_pool_t *pool)
-{
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_rdlock(apr_thread_rwlock_t *rwlock)
-{
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_tryrdlock(apr_thread_rwlock_t *rwlock)
-{
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_wrlock(apr_thread_rwlock_t *rwlock)
-{
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_trywrlock(apr_thread_rwlock_t *rwlock)
-{
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_unlock(apr_thread_rwlock_t *rwlock)
-{
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_destroy(apr_thread_rwlock_t *rwlock)
-{
-    return APR_ENOTIMPL;
-}
-
-#endif /* HAVE_PTHREAD_RWLOCKS */
-APR_POOL_IMPLEMENT_ACCESSOR(thread_rwlock)
-
-#endif /* APR_HAS_THREADS */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_rwlock.lo b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_rwlock.lo
deleted file mode 100644
index e5ed346e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_rwlock.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# thread_rwlock.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/thread_rwlock.o'
-
-# Name of the non-PIC object.
-non_pic_object='thread_rwlock.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_rwlock.o b/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_rwlock.o
deleted file mode 100644
index 42f33daf..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/unix/thread_rwlock.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/win32/proc_mutex.c b/rubbos/app/httpd-2.0.64/srclib/apr/locks/win32/proc_mutex.c
deleted file mode 100644
index 3b249045..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/win32/proc_mutex.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include "apr_arch_file_io.h"
-#include "apr_arch_proc_mutex.h"
-#include "apr_arch_misc.h"
-
-static apr_status_t proc_mutex_cleanup(void *mutex_)
-{
-    apr_proc_mutex_t *mutex = mutex_;
-
-    if (mutex->handle) {
-        if (CloseHandle(mutex->handle) == 0) {
-            return apr_get_os_error();
-        }
-    }
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_create(apr_proc_mutex_t **mutex,
-                                                const char *fname,
-                                                apr_lockmech_e mech,
-                                                apr_pool_t *pool)
-{
-    HANDLE hMutex;
-    void *mutexkey;
-
-    /* res_name_from_filename turns fname into a pseduo-name
-     * without slashes or backslashes, and prepends the \global
-     * prefix on Win2K and later
-     */
-    if (fname) {
-        mutexkey = res_name_from_filename(fname, 1, pool);
-    }
-    else {
-        mutexkey = NULL;
-    }
-
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        hMutex = CreateMutexW(NULL, FALSE, mutexkey);
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-    {
-        hMutex = CreateMutexA(NULL, FALSE, mutexkey);
-    }
-#endif
-
-    if (!hMutex) {
-	return apr_get_os_error();
-    }
-
-    *mutex = (apr_proc_mutex_t *)apr_palloc(pool, sizeof(apr_proc_mutex_t));
-    (*mutex)->pool = pool;
-    (*mutex)->handle = hMutex;
-    (*mutex)->fname = fname;
-    apr_pool_cleanup_register((*mutex)->pool, *mutex, 
-                              proc_mutex_cleanup, apr_pool_cleanup_null);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_child_init(apr_proc_mutex_t **mutex,
-                                                    const char *fname,
-                                                    apr_pool_t *pool)
-{
-    HANDLE hMutex;
-    void *mutexkey;
-
-    if (!fname) {
-        /* Reinitializing unnamed mutexes is a noop in the Unix code. */
-        return APR_SUCCESS;
-    }
-
-    /* res_name_from_filename turns file into a pseudo-name
-     * without slashes or backslashes, and prepends the \global
-     * prefix on Win2K and later
-     */
-    mutexkey = res_name_from_filename(fname, 1, pool);
-
-#if defined(_WIN32_WCE)
-    hMutex = CreateMutex(NULL, FALSE, mutexkey);
-    if (hMutex && ERROR_ALREADY_EXISTS != GetLastError()) {
-        CloseHandle(hMutex);
-        hMutex = NULL;
-        SetLastError(ERROR_FILE_NOT_FOUND);
-    }
-#else
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        hMutex = OpenMutexW(MUTEX_ALL_ACCESS, FALSE, mutexkey);
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-    {
-        hMutex = OpenMutexA(MUTEX_ALL_ACCESS, FALSE, mutexkey);
-    }
-#endif
-#endif
-
-    if (!hMutex) {
-	return apr_get_os_error();
-    }
-
-    *mutex = (apr_proc_mutex_t *)apr_palloc(pool, sizeof(apr_proc_mutex_t));
-    (*mutex)->pool = pool;
-    (*mutex)->handle = hMutex;
-    (*mutex)->fname = fname;
-    apr_pool_cleanup_register((*mutex)->pool, *mutex, 
-                              proc_mutex_cleanup, apr_pool_cleanup_null);
-    return APR_SUCCESS;
-}
-    
-APR_DECLARE(apr_status_t) apr_proc_mutex_lock(apr_proc_mutex_t *mutex)
-{
-    DWORD rv;
-
-    rv = WaitForSingleObject(mutex->handle, INFINITE);
-
-    if (rv == WAIT_OBJECT_0 || rv == WAIT_ABANDONED) {
-        return APR_SUCCESS;
-    }
-    return apr_get_os_error();
-}
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_trylock(apr_proc_mutex_t *mutex)
-{
-    DWORD rv;
-
-    rv = WaitForSingleObject(mutex->handle, 0);
-
-    if (rv == WAIT_OBJECT_0 || rv == WAIT_ABANDONED) {
-        return APR_SUCCESS;
-    } 
-    else if (rv == WAIT_TIMEOUT) {
-        return APR_EBUSY;
-    }
-    return apr_get_os_error();
-}
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_unlock(apr_proc_mutex_t *mutex)
-{
-    if (ReleaseMutex(mutex->handle) == 0) {
-        return apr_get_os_error();
-    }
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_mutex_destroy(apr_proc_mutex_t *mutex)
-{
-    apr_status_t stat;
-
-    stat = proc_mutex_cleanup(mutex);
-    if (stat == APR_SUCCESS) {
-        apr_pool_cleanup_kill(mutex->pool, mutex, proc_mutex_cleanup);
-    }
-    return stat;
-}
-
-APR_DECLARE(const char *) apr_proc_mutex_lockfile(apr_proc_mutex_t *mutex)
-{
-    return NULL;
-}
-
-APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex)
-{
-    return mutex->fname;
-}
-
-APR_DECLARE(const char *) apr_proc_mutex_defname(void)
-{
-    return "win32mutex";
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(proc_mutex)
-
-/* Implement OS-specific accessors defined in apr_portable.h */
-
-APR_DECLARE(apr_status_t) apr_os_proc_mutex_get(apr_os_proc_mutex_t *ospmutex,
-                                                apr_proc_mutex_t *mutex)
-{
-    *ospmutex = mutex->handle;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex,
-                                                apr_os_proc_mutex_t *ospmutex,
-                                                apr_pool_t *pool)
-{
-    if (pool == NULL) {
-        return APR_ENOPOOL;
-    }
-    if ((*pmutex) == NULL) {
-        (*pmutex) = (apr_proc_mutex_t *)apr_palloc(pool,
-                                                   sizeof(apr_proc_mutex_t));
-        (*pmutex)->pool = pool;
-    }
-    (*pmutex)->handle = *ospmutex;
-    return APR_SUCCESS;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/win32/thread_cond.c b/rubbos/app/httpd-2.0.64/srclib/apr/locks/win32/thread_cond.c
deleted file mode 100644
index ac71a419..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/win32/thread_cond.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_strings.h"
-#include "win32/apr_arch_thread_mutex.h"
-#include "win32/apr_arch_thread_cond.h"
-#include "apr_portable.h"
-
-static apr_status_t thread_cond_cleanup(void *data)
-{
-    apr_thread_cond_t *cond = data;
-    CloseHandle(cond->event);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_create(apr_thread_cond_t **cond,
-                                                 apr_pool_t *pool)
-{
-    *cond = apr_palloc(pool, sizeof(**cond));
-    (*cond)->pool = pool;
-    (*cond)->event = CreateEvent(NULL, TRUE, FALSE, NULL);
-    (*cond)->signal_all = 0;
-    (*cond)->num_waiting = 0;
-    return APR_SUCCESS;
-}
-
-static APR_INLINE apr_status_t _thread_cond_timedwait(apr_thread_cond_t *cond,
-                                                      apr_thread_mutex_t *mutex,
-                                                      DWORD timeout_ms )
-{
-    DWORD res;
-
-    while (1) {
-        cond->num_waiting++;
-
-        apr_thread_mutex_unlock(mutex);
-        res = WaitForSingleObject(cond->event, timeout_ms);
-        apr_thread_mutex_lock(mutex);
-        cond->num_waiting--;
-        if (res != WAIT_OBJECT_0) {
-            apr_status_t rv = apr_get_os_error();
-            if (res == WAIT_TIMEOUT) {
-                return APR_TIMEUP;
-            }
-            return apr_get_os_error();
-        }
-        if (cond->signal_all) {
-            if (cond->num_waiting == 0) {
-                cond->signal_all = 0;
-                cond->signalled = 0;
-                ResetEvent(cond->event);
-            }
-            break;
-        }
-        else if (cond->signalled) {
-            cond->signalled = 0;
-            ResetEvent(cond->event);
-            break;
-        }
-    }
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_wait(apr_thread_cond_t *cond,
-                                               apr_thread_mutex_t *mutex)
-{
-    return _thread_cond_timedwait(cond, mutex, INFINITE);
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_timedwait(apr_thread_cond_t *cond,
-                                                    apr_thread_mutex_t *mutex,
-                                                    apr_interval_time_t timeout)
-{
-    DWORD timeout_ms = (DWORD) apr_time_as_msec(timeout);
-
-    return _thread_cond_timedwait(cond, mutex, timeout_ms);
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_signal(apr_thread_cond_t *cond)
-{
-    apr_status_t rv = APR_SUCCESS;
-    DWORD res;
-
-    cond->signalled = 1;
-    res = SetEvent(cond->event);
-    if (res == 0) {
-        rv = apr_get_os_error();
-    }
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_broadcast(apr_thread_cond_t *cond)
-{
-    apr_status_t rv = APR_SUCCESS;
-    DWORD res;
-
-    cond->signalled = 1;
-    cond->signal_all = 1;
-    res = SetEvent(cond->event);
-    if (res == 0) {
-        rv = apr_get_os_error();
-    }
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_cond_destroy(apr_thread_cond_t *cond)
-{
-    return apr_pool_cleanup_run(cond->pool, cond, thread_cond_cleanup);
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(thread_cond)
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/win32/thread_mutex.c b/rubbos/app/httpd-2.0.64/srclib/apr/locks/win32/thread_mutex.c
deleted file mode 100644
index 9b10d727..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/win32/thread_mutex.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_strings.h"
-#include "apr_arch_thread_mutex.h"
-#include "apr_thread_mutex.h"
-#include "apr_portable.h"
-#include "apr_arch_misc.h"
-
-static apr_status_t thread_mutex_cleanup(void *data)
-{
-    apr_thread_mutex_t *lock = data;
-
-    if (lock->type == thread_mutex_critical_section) {
-        lock->type = -1;
-        DeleteCriticalSection(&lock->section);
-    }
-    else {
-        if (!CloseHandle(lock->handle)) {
-            return apr_get_os_error();
-        }
-    }
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_create(apr_thread_mutex_t **mutex,
-                                                  unsigned int flags,
-                                                  apr_pool_t *pool)
-{
-    (*mutex) = (apr_thread_mutex_t *)apr_palloc(pool, sizeof(**mutex));
-
-    (*mutex)->pool = pool;
-
-    if (flags & APR_THREAD_MUTEX_UNNESTED) {
-        /* Use an auto-reset signaled event, ready to accept one
-         * waiting thread.
-         */
-        (*mutex)->type = thread_mutex_unnested_event;
-        (*mutex)->handle = CreateEvent(NULL, FALSE, TRUE, NULL);
-    }
-    else {
-#if APR_HAS_UNICODE_FS
-        /* Critical Sections are terrific, performance-wise, on NT.
-         * On Win9x, we cannot 'try' on a critical section, so we 
-         * use a [slower] mutex object, instead.
-         */
-        IF_WIN_OS_IS_UNICODE {
-            InitializeCriticalSection(&(*mutex)->section);
-            (*mutex)->type = thread_mutex_critical_section;
-        }
-#endif
-#if APR_HAS_ANSI_FS
-        ELSE_WIN_OS_IS_ANSI {
-            (*mutex)->type = thread_mutex_nested_mutex;
-            (*mutex)->handle = CreateMutex(NULL, FALSE, NULL);
-
-        }
-#endif
-    }
-
-    apr_pool_cleanup_register((*mutex)->pool, (*mutex), thread_mutex_cleanup,
-                              apr_pool_cleanup_null);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_lock(apr_thread_mutex_t *mutex)
-{
-    if (mutex->type == thread_mutex_critical_section) {
-        EnterCriticalSection(&mutex->section);
-    }
-    else {
-        DWORD rv = WaitForSingleObject(mutex->handle, INFINITE);
-	if ((rv != WAIT_OBJECT_0) && (rv != WAIT_ABANDONED)) {
-            return (rv == WAIT_TIMEOUT) ? APR_EBUSY : apr_get_os_error();
-	}
-    }        
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_trylock(apr_thread_mutex_t *mutex)
-{
-    if (mutex->type == thread_mutex_critical_section) {
-        if (!TryEnterCriticalSection(&mutex->section)) {
-            return APR_EBUSY;
-        }
-    }
-    else {
-        DWORD rv = WaitForSingleObject(mutex->handle, 0);
-	if ((rv != WAIT_OBJECT_0) && (rv != WAIT_ABANDONED)) {
-            return (rv == WAIT_TIMEOUT) ? APR_EBUSY : apr_get_os_error();
-	}
-    }        
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_unlock(apr_thread_mutex_t *mutex)
-{
-    if (mutex->type == thread_mutex_critical_section) {
-        LeaveCriticalSection(&mutex->section);
-    }
-    else if (mutex->type == thread_mutex_unnested_event) {
-        if (!SetEvent(mutex->handle)) {
-            return apr_get_os_error();
-        }
-    }
-    else if (mutex->type == thread_mutex_nested_mutex) {
-        if (!ReleaseMutex(mutex->handle)) {
-            return apr_get_os_error();
-        }
-    }
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_mutex_destroy(apr_thread_mutex_t *mutex)
-{
-    return apr_pool_cleanup_run(mutex->pool, mutex, thread_mutex_cleanup);
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(thread_mutex)
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/locks/win32/thread_rwlock.c b/rubbos/app/httpd-2.0.64/srclib/apr/locks/win32/thread_rwlock.c
deleted file mode 100644
index 7099509f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/locks/win32/thread_rwlock.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_strings.h"
-#include "win32/apr_arch_thread_rwlock.h"
-#include "apr_portable.h"
-
-static apr_status_t thread_rwlock_cleanup(void *data)
-{
-    apr_thread_rwlock_t *rwlock = data;
-    
-    if (! CloseHandle(rwlock->read_event))
-        return apr_get_os_error();
-
-    if (! CloseHandle(rwlock->write_mutex))
-        return apr_get_os_error();
-    
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t)apr_thread_rwlock_create(apr_thread_rwlock_t **rwlock,
-                                                  apr_pool_t *pool)
-{
-    *rwlock = apr_palloc(pool, sizeof(**rwlock));
-
-    (*rwlock)->pool        = pool;
-    (*rwlock)->readers     = 0;
-
-    if (! ((*rwlock)->read_event = CreateEvent(NULL, TRUE, FALSE, NULL))) {
-        *rwlock = NULL;
-        return apr_get_os_error();
-    }
-
-    if (! ((*rwlock)->write_mutex = CreateMutex(NULL, FALSE, NULL))) {
-        CloseHandle((*rwlock)->read_event);
-        *rwlock = NULL;
-        return apr_get_os_error();
-    }
-
-    apr_pool_cleanup_register(pool, *rwlock, thread_rwlock_cleanup,
-                              apr_pool_cleanup_null);
-
-    return APR_SUCCESS;
-}
-
-static apr_status_t apr_thread_rwlock_rdlock_core(apr_thread_rwlock_t *rwlock,
-                                                  DWORD  milliseconds)
-{
-    DWORD   code = WaitForSingleObject(rwlock->write_mutex, milliseconds);
-
-    if (code == WAIT_FAILED || code == WAIT_TIMEOUT)
-        return APR_FROM_OS_ERROR(code);
-
-    /* We've successfully acquired the writer mutex, we can't be locked
-     * for write, so it's OK to add the reader lock.  The writer mutex
-     * doubles as race condition protection for the readers counter.   
-     */
-    InterlockedIncrement(&rwlock->readers);
-    
-    if (! ResetEvent(rwlock->read_event))
-        return apr_get_os_error();
-    
-    if (! ReleaseMutex(rwlock->write_mutex))
-        return apr_get_os_error();
-    
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_rdlock(apr_thread_rwlock_t *rwlock)
-{
-    return apr_thread_rwlock_rdlock_core(rwlock, INFINITE);
-}
-
-APR_DECLARE(apr_status_t) 
-apr_thread_rwlock_tryrdlock(apr_thread_rwlock_t *rwlock)
-{
-    return apr_thread_rwlock_rdlock_core(rwlock, 0);
-}
-
-static apr_status_t 
-apr_thread_rwlock_wrlock_core(apr_thread_rwlock_t *rwlock, DWORD milliseconds)
-{
-    DWORD   code = WaitForSingleObject(rwlock->write_mutex, milliseconds);
-
-    if (code == WAIT_FAILED || code == WAIT_TIMEOUT)
-        return APR_FROM_OS_ERROR(code);
-
-    /* We've got the writer lock but we have to wait for all readers to
-     * unlock before it's ok to use it.
-     */
-    if (rwlock->readers) {
-        /* Must wait for readers to finish before returning, unless this
-         * is an trywrlock (milliseconds == 0):
-         */
-        code = milliseconds
-          ? WaitForSingleObject(rwlock->read_event, milliseconds)
-          : WAIT_TIMEOUT;
-        
-        if (code == WAIT_FAILED || code == WAIT_TIMEOUT) {
-            /* Unable to wait for readers to finish, release write lock: */
-            if (! ReleaseMutex(rwlock->write_mutex))
-                return apr_get_os_error();
-            
-            return APR_FROM_OS_ERROR(code);
-        }
-    }
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_wrlock(apr_thread_rwlock_t *rwlock)
-{
-    return apr_thread_rwlock_wrlock_core(rwlock, INFINITE);
-}
-
-APR_DECLARE(apr_status_t)apr_thread_rwlock_trywrlock(apr_thread_rwlock_t *rwlock)
-{
-    return apr_thread_rwlock_wrlock_core(rwlock, 0);
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_unlock(apr_thread_rwlock_t *rwlock)
-{
-    apr_status_t rv = 0;
-
-    /* First, guess that we're unlocking a writer */
-    if (! ReleaseMutex(rwlock->write_mutex))
-        rv = apr_get_os_error();
-    
-    if (rv == APR_FROM_OS_ERROR(ERROR_NOT_OWNER)) {
-        /* Nope, we must have a read lock */
-        if (rwlock->readers &&
-            ! InterlockedDecrement(&rwlock->readers) &&
-            ! SetEvent(rwlock->read_event)) {
-            rv = apr_get_os_error();
-        }
-        else {
-            rv = 0;
-        }
-    }
-
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_rwlock_destroy(apr_thread_rwlock_t *rwlock)
-{
-    return apr_pool_cleanup_run(rwlock->pool, rwlock, thread_rwlock_cleanup);
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(thread_rwlock)
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/memory/unix/.libs/apr_pools.o b/rubbos/app/httpd-2.0.64/srclib/apr/memory/unix/.libs/apr_pools.o
deleted file mode 100644
index 13799b42..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/memory/unix/.libs/apr_pools.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/memory/unix/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/memory/unix/Makefile
deleted file mode 100644
index e796db65..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/memory/unix/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-srcdir = .
-
-
-TARGETS = apr_pools.lo
-
-# bring in rules.mk for standard functionality
-include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
-
-DEFOSDIR=$(INCDIR)/arch/unix
-INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/memory/unix/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/memory/unix/Makefile.in
deleted file mode 100644
index 2be5dd96..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/memory/unix/Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = apr_pools.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/memory/unix/apr_pools.c b/rubbos/app/httpd-2.0.64/srclib/apr/memory/unix/apr_pools.c
deleted file mode 100644
index be371ad7..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/memory/unix/apr_pools.c
+++ /dev/null
@@ -1,2305 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_private.h"
-
-#include "apr_atomic.h"
-#include "apr_portable.h" /* for get_os_proc */
-#include "apr_strings.h"
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_allocator.h"
-#include "apr_lib.h"
-#include "apr_thread_mutex.h"
-#include "apr_hash.h"
-#include "apr_time.h"
-#define APR_WANT_MEMFUNC
-#include "apr_want.h"
-
-#if APR_HAVE_STDLIB_H
-#include <stdlib.h>     /* for malloc, free and abort */
-#endif
-
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>     /* for getpid */
-#endif
-
-
-/*
- * Magic numbers
- */
-
-#define MIN_ALLOC 8192
-#define MAX_INDEX   20
-
-#define BOUNDARY_INDEX 12
-#define BOUNDARY_SIZE (1 << BOUNDARY_INDEX)
-
-/* 
- * Timing constants for killing subprocesses
- * There is a total 3-second delay between sending a SIGINT 
- * and sending of the final SIGKILL.
- * TIMEOUT_INTERVAL should be set to TIMEOUT_USECS / 64
- * for the exponetial timeout alogrithm.
- */
-#define TIMEOUT_USECS    3000000
-#define TIMEOUT_INTERVAL   46875
-
-/*
- * Allocator
- *
- * @note The max_free_index and current_free_index fields are not really
- * indices, but quantities of BOUNDARY_SIZE big memory blocks.
- */
-
-struct apr_allocator_t {
-    /** largest used index into free[], always < MAX_INDEX */
-    apr_uint32_t        max_index;
-    /** Total size (in BOUNDARY_SIZE multiples) of unused memory before
-     * blocks are given back. @see apr_allocator_max_free_set().
-     * @note Initialized to APR_ALLOCATOR_MAX_FREE_UNLIMITED,
-     * which means to never give back blocks.
-     */
-    apr_uint32_t        max_free_index;
-    /**
-     * Memory size (in BOUNDARY_SIZE multiples) that currently must be freed
-     * before blocks are given back. Range: 0..max_free_index
-     */
-    apr_uint32_t        current_free_index;
-#if APR_HAS_THREADS
-    apr_thread_mutex_t *mutex;
-#endif /* APR_HAS_THREADS */
-    apr_pool_t         *owner;
-    /**
-     * Lists of free nodes. Slot 0 is used for oversized nodes,
-     * and the slots 1..MAX_INDEX-1 contain nodes of sizes
-     * (i+1) * BOUNDARY_SIZE. Example for BOUNDARY_INDEX == 12:
-     * slot  0: nodes larger than 81920
-     * slot  1: size  8192
-     * slot  2: size 12288
-     * ...
-     * slot 19: size 81920
-     */
-    apr_memnode_t      *free[MAX_INDEX];
-};
-
-#define SIZEOF_ALLOCATOR_T  APR_ALIGN_DEFAULT(sizeof(apr_allocator_t))
-
-
-/*
- * Allocator
- */
-
-APR_DECLARE(apr_status_t) apr_allocator_create(apr_allocator_t **allocator)
-{
-    apr_allocator_t *new_allocator;
-
-    *allocator = NULL;
-
-    if ((new_allocator = malloc(SIZEOF_ALLOCATOR_T)) == NULL)
-        return APR_ENOMEM;
-
-    memset(new_allocator, 0, SIZEOF_ALLOCATOR_T);
-    new_allocator->max_free_index = APR_ALLOCATOR_MAX_FREE_UNLIMITED;
-
-    *allocator = new_allocator;
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(void) apr_allocator_destroy(apr_allocator_t *allocator)
-{
-    apr_uint32_t index;
-    apr_memnode_t *node, **ref;
-
-    for (index = 0; index < MAX_INDEX; index++) {
-        ref = &allocator->free[index];
-        while ((node = *ref) != NULL) {
-            *ref = node->next;
-            free(node);
-        }
-    }
-
-    free(allocator);
-}
-
-#if APR_HAS_THREADS
-APR_DECLARE(void) apr_allocator_mutex_set(apr_allocator_t *allocator,
-                                          apr_thread_mutex_t *mutex)
-{
-    allocator->mutex = mutex;
-}
-
-APR_DECLARE(apr_thread_mutex_t *) apr_allocator_mutex_get(
-                                      apr_allocator_t *allocator)
-{
-    return allocator->mutex;
-}
-#endif /* APR_HAS_THREADS */
-
-APR_DECLARE(void) apr_allocator_owner_set(apr_allocator_t *allocator,
-                                          apr_pool_t *pool)
-{
-    allocator->owner = pool;
-}
-
-APR_DECLARE(apr_pool_t *) apr_allocator_owner_get(apr_allocator_t *allocator)
-{
-    return allocator->owner;
-}
-
-APR_DECLARE(void) apr_allocator_max_free_set(apr_allocator_t *allocator,
-                                             apr_size_t size)
-{
-    apr_uint32_t max_free_index;
-
-#if APR_HAS_THREADS
-    apr_thread_mutex_t *mutex;
-
-    mutex = apr_allocator_mutex_get(allocator);
-    if (mutex != NULL)
-        apr_thread_mutex_lock(mutex);
-#endif /* APR_HAS_THREADS */
-
-    max_free_index = APR_ALIGN(size, BOUNDARY_SIZE) >> BOUNDARY_INDEX;
-    allocator->current_free_index += max_free_index;
-    allocator->current_free_index -= allocator->max_free_index;
-    allocator->max_free_index = max_free_index;
-    if (allocator->current_free_index > max_free_index)
-        allocator->current_free_index = max_free_index;
-
-#if APR_HAS_THREADS
-    if (mutex != NULL)
-        apr_thread_mutex_unlock(mutex);
-#endif
-}
-
-static APR_INLINE
-apr_memnode_t *allocator_alloc(apr_allocator_t *allocator, apr_size_t in_size)
-{
-    apr_memnode_t *node, **ref;
-    apr_uint32_t i, index, max_index;
-    apr_size_t size;
-
-    /* Round up the block size to the next boundary, but always
-     * allocate at least a certain size (MIN_ALLOC).
-     */
-    size = APR_ALIGN(in_size + APR_MEMNODE_T_SIZE, BOUNDARY_SIZE);
-    if (size < in_size) {
-        return NULL;
-    }
-    if (size < MIN_ALLOC)
-        size = MIN_ALLOC;
-
-    /* Find the index for this node size by
-     * dividing its size by the boundary size
-     */
-    index = (size >> BOUNDARY_INDEX) - 1;
-
-    /* First see if there are any nodes in the area we know
-     * our node will fit into.
-     */
-    if (index <= allocator->max_index) {
-#if APR_HAS_THREADS
-        if (allocator->mutex)
-            apr_thread_mutex_lock(allocator->mutex);
-#endif /* APR_HAS_THREADS */
-
-        /* Walk the free list to see if there are
-         * any nodes on it of the requested size
-         *
-         * NOTE: an optimization would be to check
-         * allocator->free[index] first and if no
-         * node is present, directly use
-         * allocator->free[max_index].  This seems
-         * like overkill though and could cause
-         * memory waste.
-         */
-        max_index = allocator->max_index;
-        ref = &allocator->free[index];
-        i = index;
-        while (*ref == NULL && i < max_index) {
-           ref++;
-           i++;
-        }
-
-        if ((node = *ref) != NULL) {
-            /* If we have found a node and it doesn't have any
-             * nodes waiting in line behind it _and_ we are on
-             * the highest available index, find the new highest
-             * available index
-             */
-            if ((*ref = node->next) == NULL && i >= max_index) {
-                do {
-                    ref--;
-                    max_index--;
-                }
-                while (*ref == NULL && max_index > 0);
-
-                allocator->max_index = max_index;
-            }
-
-            allocator->current_free_index += node->index;
-            if (allocator->current_free_index > allocator->max_free_index)
-                allocator->current_free_index = allocator->max_free_index;
-
-#if APR_HAS_THREADS
-            if (allocator->mutex)
-                apr_thread_mutex_unlock(allocator->mutex);
-#endif /* APR_HAS_THREADS */
-
-            node->next = NULL;
-            node->first_avail = (char *)node + APR_MEMNODE_T_SIZE;
-
-            return node;
-        }
-
-#if APR_HAS_THREADS
-        if (allocator->mutex)
-            apr_thread_mutex_unlock(allocator->mutex);
-#endif /* APR_HAS_THREADS */
-    }
-
-    /* If we found nothing, seek the sink (at index 0), if
-     * it is not empty.
-     */
-    else if (allocator->free[0]) {
-#if APR_HAS_THREADS
-        if (allocator->mutex)
-            apr_thread_mutex_lock(allocator->mutex);
-#endif /* APR_HAS_THREADS */
-
-        /* Walk the free list to see if there are
-         * any nodes on it of the requested size
-         */
-        ref = &allocator->free[0];
-        while ((node = *ref) != NULL && index > node->index)
-            ref = &node->next;
-
-        if (node) {
-            *ref = node->next;
-
-            allocator->current_free_index += node->index;
-            if (allocator->current_free_index > allocator->max_free_index)
-                allocator->current_free_index = allocator->max_free_index;
-
-#if APR_HAS_THREADS
-            if (allocator->mutex)
-                apr_thread_mutex_unlock(allocator->mutex);
-#endif /* APR_HAS_THREADS */
-
-            node->next = NULL;
-            node->first_avail = (char *)node + APR_MEMNODE_T_SIZE;
-
-            return node;
-        }
-
-#if APR_HAS_THREADS
-        if (allocator->mutex)
-            apr_thread_mutex_unlock(allocator->mutex);
-#endif /* APR_HAS_THREADS */
-    }
-
-    /* If we haven't got a suitable node, malloc a new one
-     * and initialize it.
-     */
-    if ((node = malloc(size)) == NULL)
-        return NULL;
-
-    node->next = NULL;
-    node->index = index;
-    node->first_avail = (char *)node + APR_MEMNODE_T_SIZE;
-    node->endp = (char *)node + size;
-
-    return node;
-}
-
-static APR_INLINE
-void allocator_free(apr_allocator_t *allocator, apr_memnode_t *node)
-{
-    apr_memnode_t *next, *freelist = NULL;
-    apr_uint32_t index, max_index;
-    apr_uint32_t max_free_index, current_free_index;
-
-#if APR_HAS_THREADS
-    if (allocator->mutex)
-        apr_thread_mutex_lock(allocator->mutex);
-#endif /* APR_HAS_THREADS */
-
-    max_index = allocator->max_index;
-    max_free_index = allocator->max_free_index;
-    current_free_index = allocator->current_free_index;
-
-    /* Walk the list of submitted nodes and free them one by one,
-     * shoving them in the right 'size' buckets as we go.
-     */
-    do {
-        next = node->next;
-        index = node->index;
-
-        if (max_free_index != APR_ALLOCATOR_MAX_FREE_UNLIMITED
-            && index > current_free_index) {
-            node->next = freelist;
-            freelist = node;
-        }
-        else if (index < MAX_INDEX) {
-            /* Add the node to the appropiate 'size' bucket.  Adjust
-             * the max_index when appropiate.
-             */
-            if ((node->next = allocator->free[index]) == NULL
-                && index > max_index) {
-                max_index = index;
-            }
-            allocator->free[index] = node;
-            if (current_free_index >= index)
-                current_free_index -= index;
-            else
-                current_free_index = 0;
-        }
-        else {
-            /* This node is too large to keep in a specific size bucket,
-             * just add it to the sink (at index 0).
-             */
-            node->next = allocator->free[0];
-            allocator->free[0] = node;
-            if (current_free_index >= index)
-                current_free_index -= index;
-            else
-                current_free_index = 0;
-        }
-    } while ((node = next) != NULL);
-
-    allocator->max_index = max_index;
-    allocator->current_free_index = current_free_index;
-
-#if APR_HAS_THREADS
-    if (allocator->mutex)
-        apr_thread_mutex_unlock(allocator->mutex);
-#endif /* APR_HAS_THREADS */
-
-    while (freelist != NULL) {
-        node = freelist;
-        freelist = node->next;
-        free(node);
-    }
-}
-
-APR_DECLARE(apr_memnode_t *) apr_allocator_alloc(apr_allocator_t *allocator,
-                                                 apr_size_t size)
-{
-    return allocator_alloc(allocator, size);
-}
-
-APR_DECLARE(void) apr_allocator_free(apr_allocator_t *allocator,
-                                     apr_memnode_t *node)
-{
-    allocator_free(allocator, node);
-}
-
-
-
-/*
- * Debug level
- */
-
-#define APR_POOL_DEBUG_GENERAL  0x01
-#define APR_POOL_DEBUG_VERBOSE  0x02
-#define APR_POOL_DEBUG_LIFETIME 0x04
-#define APR_POOL_DEBUG_OWNER    0x08
-#define APR_POOL_DEBUG_VERBOSE_ALLOC 0x10
-
-#define APR_POOL_DEBUG_VERBOSE_ALL (APR_POOL_DEBUG_VERBOSE \
-                                    | APR_POOL_DEBUG_VERBOSE_ALLOC)
-
-
-/*
- * Structures
- */
-
-typedef struct cleanup_t cleanup_t;
-
-/** A list of processes */
-struct process_chain {
-    /** The process ID */
-    apr_proc_t *proc;
-    apr_kill_conditions_e kill_how;
-    /** The next process in the list */
-    struct process_chain *next;
-};
-
-
-#if APR_POOL_DEBUG
-
-typedef struct debug_node_t debug_node_t;
-
-struct debug_node_t {
-    debug_node_t *next;
-    apr_uint32_t  index;
-    void         *beginp[64];
-    void         *endp[64];
-};
-
-#define SIZEOF_DEBUG_NODE_T APR_ALIGN_DEFAULT(sizeof(debug_node_t))
-
-#endif /* APR_POOL_DEBUG */
-
-/* The ref field in the apr_pool_t struct holds a
- * pointer to the pointer referencing this pool.
- * It is used for parent, child, sibling management.
- * Look at apr_pool_create_ex() and apr_pool_destroy()
- * to see how it is used.
- */
-struct apr_pool_t {
-    apr_pool_t           *parent;
-    apr_pool_t           *child;
-    apr_pool_t           *sibling;
-    apr_pool_t          **ref;
-    cleanup_t            *cleanups;
-    apr_allocator_t      *allocator;
-    struct process_chain *subprocesses;
-    apr_abortfunc_t       abort_fn;
-    apr_hash_t           *user_data;
-    const char           *tag;
-
-#if !APR_POOL_DEBUG
-    apr_memnode_t        *active;
-    apr_memnode_t        *self; /* The node containing the pool itself */
-    char                 *self_first_avail;
-
-#else /* APR_POOL_DEBUG */
-    debug_node_t         *nodes;
-    const char           *file_line;
-    apr_uint32_t          creation_flags;
-    unsigned int          stat_alloc;
-    unsigned int          stat_total_alloc;
-    unsigned int          stat_clear;
-#if APR_HAS_THREADS
-    apr_os_thread_t       owner;
-    apr_thread_mutex_t   *mutex;
-#endif /* APR_HAS_THREADS */
-#endif /* APR_POOL_DEBUG */
-#ifdef NETWARE
-    apr_os_proc_t         owner_proc;
-#endif /* defined(NETWARE) */
-};
-
-#define SIZEOF_POOL_T       APR_ALIGN_DEFAULT(sizeof(apr_pool_t))
-
-
-/*
- * Variables
- */
-
-static apr_byte_t   apr_pools_initialized = 0;
-static apr_pool_t  *global_pool = NULL;
-
-#if !APR_POOL_DEBUG
-static apr_allocator_t *global_allocator = NULL;
-#endif /* !APR_POOL_DEBUG */
-
-#if (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL)
-static apr_file_t *file_stderr = NULL;
-#endif /* (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL) */
-
-/*
- * Local functions
- */
-
-static void run_cleanups(cleanup_t **c);
-static void run_child_cleanups(cleanup_t **c);
-static void free_proc_chain(struct process_chain *procs);
-
-
-#if !APR_POOL_DEBUG
-/*
- * Initialization
- */
-
-APR_DECLARE(apr_status_t) apr_pool_initialize(void)
-{
-    apr_status_t rv;
-
-    if (apr_pools_initialized++)
-        return APR_SUCCESS;
-
-    if ((rv = apr_allocator_create(&global_allocator)) != APR_SUCCESS) {
-        apr_pools_initialized = 0;
-        return rv;
-    }
-
-    if ((rv = apr_pool_create_ex(&global_pool, NULL, NULL,
-                                 global_allocator)) != APR_SUCCESS) {
-        apr_allocator_destroy(global_allocator);
-        global_allocator = NULL;
-        apr_pools_initialized = 0;
-        return rv;
-    }
-
-    apr_pool_tag(global_pool, "apr_global_pool");
-
-    /* This has to happen here because mutexes might be backed by
-     * atomics.  It used to be snug and safe in apr_initialize().
-     */
-    if ((rv = apr_atomic_init(global_pool)) != APR_SUCCESS) {
-        return rv;
-    }
-
-#if APR_HAS_THREADS
-    {
-        apr_thread_mutex_t *mutex;
-
-        if ((rv = apr_thread_mutex_create(&mutex,
-                                          APR_THREAD_MUTEX_DEFAULT,
-                                          global_pool)) != APR_SUCCESS) {
-            return rv;
-        }
-
-        apr_allocator_mutex_set(global_allocator, mutex);
-    }
-#endif /* APR_HAS_THREADS */
-
-    apr_allocator_owner_set(global_allocator, global_pool);
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(void) apr_pool_terminate(void)
-{
-    if (!apr_pools_initialized)
-        return;
-
-    if (--apr_pools_initialized)
-        return;
-
-    apr_pool_destroy(global_pool); /* This will also destroy the mutex */
-    global_pool = NULL;
-
-    global_allocator = NULL;
-}
-
-#ifdef NETWARE
-void netware_pool_proc_cleanup ()
-{
-    apr_pool_t *pool = global_pool->child;
-    apr_os_proc_t owner_proc = (apr_os_proc_t)getnlmhandle();
-
-    while (pool) {
-        if (pool->owner_proc == owner_proc) {
-            apr_pool_destroy (pool);
-            pool = global_pool->child;
-        }
-        else {
-            pool = pool->sibling;
-        }
-    }
-    return;
-}
-#endif /* defined(NETWARE) */
-
-/* Node list management helper macros; list_insert() inserts 'node'
- * before 'point'. */
-#define list_insert(node, point) do {           \
-    node->ref = point->ref;                     \
-    *node->ref = node;                          \
-    node->next = point;                         \
-    point->ref = &node->next;                   \
-} while (0)
-
-/* list_remove() removes 'node' from its list. */
-#define list_remove(node) do {                  \
-    *node->ref = node->next;                    \
-    node->next->ref = node->ref;                \
-} while (0)
-
-/*
- * Memory allocation
- */
-
-APR_DECLARE(void *) apr_palloc(apr_pool_t *pool, apr_size_t in_size)
-{
-    apr_memnode_t *active, *node;
-    void *mem;
-    apr_uint32_t free_index;
-    apr_size_t size;
-
-    size = APR_ALIGN_DEFAULT(in_size);
-    if (size < in_size) {
-        if (pool->abort_fn)
-            pool->abort_fn(APR_ENOMEM);
-        return NULL;
-    }
-    active = pool->active;
-
-    /* If the active node has enough bytes left, use it. */
-    if (size < (apr_size_t)(active->endp - active->first_avail)) {
-        mem = active->first_avail;
-        active->first_avail += size;
-
-        return mem;
-    }
-
-    node = active->next;
-    if (size < (apr_size_t)(node->endp - node->first_avail)) {
-        list_remove(node);
-    }
-    else {
-        if ((node = allocator_alloc(pool->allocator, size)) == NULL) {
-            if (pool->abort_fn)
-                pool->abort_fn(APR_ENOMEM);
-
-            return NULL;
-        }
-    }
-
-    node->free_index = 0;
-
-    mem = node->first_avail;
-    node->first_avail += size;
-
-    list_insert(node, active);
-
-    pool->active = node;
-
-    free_index = (APR_ALIGN(active->endp - active->first_avail + 1,
-                            BOUNDARY_SIZE) - BOUNDARY_SIZE) >> BOUNDARY_INDEX;
-
-    active->free_index = free_index;
-    node = active->next;
-    if (free_index >= node->free_index)
-        return mem;
-
-    do {
-        node = node->next;
-    }
-    while (free_index < node->free_index);
-
-    list_remove(active);
-    list_insert(active, node);
-
-    return mem;
-}
-
-/* Provide an implementation of apr_pcalloc for backward compatibility
- * with code built before apr_pcalloc was a macro
- */
-
-#ifdef apr_pcalloc
-#undef apr_pcalloc
-#endif
-
-APR_DECLARE(void *) apr_pcalloc(apr_pool_t *pool, apr_size_t size);
-APR_DECLARE(void *) apr_pcalloc(apr_pool_t *pool, apr_size_t size)
-{
-    void *mem;
-
-    if ((mem = apr_palloc(pool, size)) != NULL) {
-        memset(mem, 0, size);
-    }
-
-    return mem;
-}
-
-
-/*
- * Pool creation/destruction
- */
-
-APR_DECLARE(void) apr_pool_clear(apr_pool_t *pool)
-{
-    apr_memnode_t *active;
-
-    /* Destroy the subpools.  The subpools will detach themselves from
-     * this pool thus this loop is safe and easy.
-     */
-    while (pool->child)
-        apr_pool_destroy(pool->child);
-
-    /* Run cleanups */
-    run_cleanups(&pool->cleanups);
-    pool->cleanups = NULL;
-
-    /* Free subprocesses */
-    free_proc_chain(pool->subprocesses);
-    pool->subprocesses = NULL;
-
-    /* Clear the user data. */
-    pool->user_data = NULL;
-
-    /* Find the node attached to the pool structure, reset it, make
-     * it the active node and free the rest of the nodes.
-     */
-    active = pool->active = pool->self;
-    active->first_avail = pool->self_first_avail;
-
-    if (active->next == active)
-        return;
-
-    *active->ref = NULL;
-    allocator_free(pool->allocator, active->next);
-    active->next = active;
-    active->ref = &active->next;
-}
-
-APR_DECLARE(void) apr_pool_destroy(apr_pool_t *pool)
-{
-    apr_memnode_t *active;
-    apr_allocator_t *allocator;
-
-    /* Destroy the subpools.  The subpools will detach themselve from
-     * this pool thus this loop is safe and easy.
-     */
-    while (pool->child)
-        apr_pool_destroy(pool->child);
-
-    /* Run cleanups */
-    run_cleanups(&pool->cleanups);
-
-    /* Free subprocesses */
-    free_proc_chain(pool->subprocesses);
-
-    /* Remove the pool from the parents child list */
-    if (pool->parent) {
-#if APR_HAS_THREADS
-        apr_thread_mutex_t *mutex;
-
-        if ((mutex = apr_allocator_mutex_get(pool->parent->allocator)) != NULL)
-            apr_thread_mutex_lock(mutex);
-#endif /* APR_HAS_THREADS */
-
-        if ((*pool->ref = pool->sibling) != NULL)
-            pool->sibling->ref = pool->ref;
-
-#if APR_HAS_THREADS
-        if (mutex)
-            apr_thread_mutex_unlock(mutex);
-#endif /* APR_HAS_THREADS */
-    }
-
-    /* Find the block attached to the pool structure.  Save a copy of the
-     * allocator pointer, because the pool struct soon will be no more.
-     */
-    allocator = pool->allocator;
-    active = pool->self;
-    *active->ref = NULL;
-
-#if APR_HAS_THREADS
-    if (apr_allocator_owner_get(allocator) == pool) {
-        /* Make sure to remove the lock, since it is highly likely to
-         * be invalid now.
-         */
-        apr_allocator_mutex_set(allocator, NULL);
-    }
-#endif /* APR_HAS_THREADS */
-
-    /* Free all the nodes in the pool (including the node holding the
-     * pool struct), by giving them back to the allocator.
-     */
-    allocator_free(allocator, active);
-
-    /* If this pool happens to be the owner of the allocator, free
-     * everything in the allocator (that includes the pool struct
-     * and the allocator).  Don't worry about destroying the optional mutex
-     * in the allocator, it will have been destroyed by the cleanup function.
-     */
-    if (apr_allocator_owner_get(allocator) == pool) {
-        apr_allocator_destroy(allocator);
-    }
-}
-
-APR_DECLARE(apr_status_t) apr_pool_create_ex(apr_pool_t **newpool,
-                                             apr_pool_t *parent,
-                                             apr_abortfunc_t abort_fn,
-                                             apr_allocator_t *allocator)
-{
-    apr_pool_t *pool;
-    apr_memnode_t *node;
-
-    *newpool = NULL;
-
-    if (!parent)
-        parent = global_pool;
-
-    if (!abort_fn && parent)
-        abort_fn = parent->abort_fn;
-
-    if (allocator == NULL)
-        allocator = parent->allocator;
-
-    if ((node = allocator_alloc(allocator,
-                                MIN_ALLOC - APR_MEMNODE_T_SIZE)) == NULL) {
-        if (abort_fn)
-            abort_fn(APR_ENOMEM);
-
-        return APR_ENOMEM;
-    }
-
-    node->next = node;
-    node->ref = &node->next;
-
-    pool = (apr_pool_t *)node->first_avail;
-    node->first_avail = pool->self_first_avail = (char *)pool + SIZEOF_POOL_T;
-
-    pool->allocator = allocator;
-    pool->active = pool->self = node;
-    pool->abort_fn = abort_fn;
-    pool->child = NULL;
-    pool->cleanups = NULL;
-    pool->subprocesses = NULL;
-    pool->user_data = NULL;
-    pool->tag = NULL;
-
-#ifdef NETWARE
-    pool->owner_proc = (apr_os_proc_t)getnlmhandle();
-#endif /* defined(NETWARE) */
-
-    if ((pool->parent = parent) != NULL) {
-#if APR_HAS_THREADS
-        apr_thread_mutex_t *mutex;
-
-        if ((mutex = apr_allocator_mutex_get(parent->allocator)) != NULL)
-            apr_thread_mutex_lock(mutex);
-#endif /* APR_HAS_THREADS */
-
-        if ((pool->sibling = parent->child) != NULL)
-            pool->sibling->ref = &pool->sibling;
-
-        parent->child = pool;
-        pool->ref = &parent->child;
-
-#if APR_HAS_THREADS
-        if (mutex)
-            apr_thread_mutex_unlock(mutex);
-#endif /* APR_HAS_THREADS */
-    }
-    else {
-        pool->sibling = NULL;
-        pool->ref = NULL;
-    }
-
-    *newpool = pool;
-
-    return APR_SUCCESS;
-}
-
-
-/*
- * "Print" functions
- */
-
-/*
- * apr_psprintf is implemented by writing directly into the current
- * block of the pool, starting right at first_avail.  If there's
- * insufficient room, then a new block is allocated and the earlier
- * output is copied over.  The new block isn't linked into the pool
- * until all the output is done.
- *
- * Note that this is completely safe because nothing else can
- * allocate in this apr_pool_t while apr_psprintf is running.  alarms are
- * blocked, and the only thing outside of apr_pools.c that's invoked
- * is apr_vformatter -- which was purposefully written to be
- * self-contained with no callouts.
- */
-
-struct psprintf_data {
-    apr_vformatter_buff_t vbuff;
-    apr_memnode_t   *node;
-    apr_pool_t      *pool;
-    apr_byte_t       got_a_new_node;
-    apr_memnode_t   *free;
-};
-
-#define APR_PSPRINTF_MIN_STRINGSIZE 32
-
-static int psprintf_flush(apr_vformatter_buff_t *vbuff)
-{
-    struct psprintf_data *ps = (struct psprintf_data *)vbuff;
-    apr_memnode_t *node, *active;
-    apr_size_t cur_len, size;
-    char *strp;
-    apr_pool_t *pool;
-    apr_uint32_t free_index;
-
-    pool = ps->pool;
-    active = ps->node;
-    strp = ps->vbuff.curpos;
-    cur_len = strp - active->first_avail;
-    size = cur_len << 1;
-
-    /* Make sure that we don't try to use a block that has less
-     * than APR_PSPRINTF_MIN_STRINGSIZE bytes left in it.  This
-     * also catches the case where size == 0, which would result
-     * in reusing a block that can't even hold the NUL byte.
-     */
-    if (size < APR_PSPRINTF_MIN_STRINGSIZE)
-        size = APR_PSPRINTF_MIN_STRINGSIZE;
-
-    node = active->next;
-    if (!ps->got_a_new_node
-        && size < (apr_size_t)(node->endp - node->first_avail)) {
-
-        list_remove(node);
-        list_insert(node, active);
-
-        node->free_index = 0;
-
-        pool->active = node;
-
-        free_index = (APR_ALIGN(active->endp - active->first_avail + 1,
-                                BOUNDARY_SIZE) - BOUNDARY_SIZE) >> BOUNDARY_INDEX;
-
-        active->free_index = free_index;
-        node = active->next;
-        if (free_index < node->free_index) {
-            do {
-                node = node->next;
-            }
-            while (free_index < node->free_index);
-
-            list_remove(active);
-            list_insert(active, node);
-        }
-
-        node = pool->active;
-    }
-    else {
-        if ((node = allocator_alloc(pool->allocator, size)) == NULL)
-            return -1;
-
-        if (ps->got_a_new_node) {
-            active->next = ps->free;
-            ps->free = active;
-        }
-
-        ps->got_a_new_node = 1;
-    }
-
-    memcpy(node->first_avail, active->first_avail, cur_len);
-
-    ps->node = node;
-    ps->vbuff.curpos = node->first_avail + cur_len;
-    ps->vbuff.endpos = node->endp - 1; /* Save a byte for NUL terminator */
-
-    return 0;
-}
-
-APR_DECLARE(char *) apr_pvsprintf(apr_pool_t *pool, const char *fmt, va_list ap)
-{
-    struct psprintf_data ps;
-    char *strp;
-    apr_size_t size;
-    apr_memnode_t *active, *node;
-    apr_uint32_t free_index;
-
-    ps.node = active = pool->active;
-    ps.pool = pool;
-    ps.vbuff.curpos  = ps.node->first_avail;
-
-    /* Save a byte for the NUL terminator */
-    ps.vbuff.endpos = ps.node->endp - 1;
-    ps.got_a_new_node = 0;
-    ps.free = NULL;
-
-    /* Make sure that the first node passed to apr_vformatter has at least
-     * room to hold the NUL terminator.
-     */
-    if (ps.node->first_avail == ps.node->endp) {
-        if (psprintf_flush(&ps.vbuff) == -1) {
-            if (pool->abort_fn) {
-                pool->abort_fn(APR_ENOMEM);
-            }
-
-            return NULL;
-        }
-    }
-
-    if (apr_vformatter(psprintf_flush, &ps.vbuff, fmt, ap) == -1) {
-        if (pool->abort_fn)
-            pool->abort_fn(APR_ENOMEM);
-
-        return NULL;
-    }
-
-    strp = ps.vbuff.curpos;
-    *strp++ = '\0';
-
-    size = strp - ps.node->first_avail;
-    size = APR_ALIGN_DEFAULT(size);
-    strp = ps.node->first_avail;
-    ps.node->first_avail += size;
-
-    if (ps.free)
-        allocator_free(pool->allocator, ps.free);
-
-    /*
-     * Link the node in if it's a new one
-     */
-    if (!ps.got_a_new_node)
-        return strp;
-
-    active = pool->active;
-    node = ps.node;
-
-    node->free_index = 0;
-
-    list_insert(node, active);
-
-    pool->active = node;
-
-    free_index = (APR_ALIGN(active->endp - active->first_avail + 1,
-                            BOUNDARY_SIZE) - BOUNDARY_SIZE) >> BOUNDARY_INDEX;
-
-    active->free_index = free_index;
-    node = active->next;
-
-    if (free_index >= node->free_index)
-        return strp;
-
-    do {
-        node = node->next;
-    }
-    while (free_index < node->free_index);
-
-    list_remove(active);
-    list_insert(active, node);
-
-    return strp;
-}
-
-
-#else /* APR_POOL_DEBUG */
-/*
- * Debug helper functions
- */
-
-
-/*
- * Walk the pool tree rooted at pool, depth first.  When fn returns
- * anything other than 0, abort the traversal and return the value
- * returned by fn.
- */
-static int apr_pool_walk_tree(apr_pool_t *pool,
-                              int (*fn)(apr_pool_t *pool, void *data),
-                              void *data)
-{
-    int rv;
-    apr_pool_t *child;
-
-    rv = fn(pool, data);
-    if (rv)
-        return rv;
-
-#if APR_HAS_THREADS
-    if (pool->mutex) {
-        apr_thread_mutex_lock(pool->mutex);
-                        }
-#endif /* APR_HAS_THREADS */
-
-    child = pool->child;
-    while (child) {
-        rv = apr_pool_walk_tree(child, fn, data);
-        if (rv)
-            break;
-
-        child = child->sibling;
-    }
-
-#if APR_HAS_THREADS
-    if (pool->mutex) {
-        apr_thread_mutex_unlock(pool->mutex);
-    }
-#endif /* APR_HAS_THREADS */
-
-    return rv;
-}
-
-#if (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL)
-static void apr_pool_log_event(apr_pool_t *pool, const char *event,
-                               const char *file_line, int deref)
-{
-    if (file_stderr) {
-        if (deref) {
-            apr_file_printf(file_stderr,
-                "POOL DEBUG: "
-                "[%lu"
-#if APR_HAS_THREADS
-                "/%lu"
-#endif /* APR_HAS_THREADS */
-                "] "
-                "%7s "
-                "(%10lu/%10lu/%10lu) "
-                "0x%08X \"%s\" "
-                "<%s> "
-                "(%u/%u/%u) "
-                "\n",
-                (unsigned long)getpid(),
-#if APR_HAS_THREADS
-                (unsigned long)apr_os_thread_current(),
-#endif /* APR_HAS_THREADS */
-                event,
-                (unsigned long)apr_pool_num_bytes(pool, 0),
-                (unsigned long)apr_pool_num_bytes(pool, 1),
-                (unsigned long)apr_pool_num_bytes(global_pool, 1),
-                (unsigned int)pool, pool->tag,
-                file_line,
-                pool->stat_alloc, pool->stat_total_alloc, pool->stat_clear);
-        }
-        else {
-            apr_file_printf(file_stderr,
-                "POOL DEBUG: "
-                "[%lu"
-#if APR_HAS_THREADS
-                "/%lu"
-#endif /* APR_HAS_THREADS */
-                "] "
-                "%7s "
-                "                                   "
-                "0x%08X "
-                "<%s> "
-                "\n",
-                (unsigned long)getpid(),
-#if APR_HAS_THREADS
-                (unsigned long)apr_os_thread_current(),
-#endif /* APR_HAS_THREADS */
-                event,
-                (unsigned int)pool,
-                file_line);
-        }
-    }
-}
-#endif /* (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL) */
-
-#if (APR_POOL_DEBUG & APR_POOL_DEBUG_LIFETIME)
-static int pool_is_child_of(apr_pool_t *parent, void *data)
-{
-    apr_pool_t *pool = (apr_pool_t *)data;
-
-    return (pool == parent);
-}
-
-static int apr_pool_is_child_of(apr_pool_t *pool, apr_pool_t *parent)
-{
-    if (parent == NULL)
-        return 0;
-
-    return apr_pool_walk_tree(parent, pool_is_child_of, pool);
-}
-#endif /* (APR_POOL_DEBUG & APR_POOL_DEBUG_LIFETIME) */
-
-static void apr_pool_check_integrity(apr_pool_t *pool)
-{
-    /* Rule of thumb: use of the global pool is always
-     * ok, since the only user is apr_pools.c.  Unless
-     * people have searched for the top level parent and
-     * started to use that...
-     */
-    if (pool == global_pool || global_pool == NULL)
-        return;
-
-    /* Lifetime
-     * This basically checks to see if the pool being used is still
-     * a relative to the global pool.  If not it was previously
-     * destroyed, in which case we abort().
-     */
-#if (APR_POOL_DEBUG & APR_POOL_DEBUG_LIFETIME)
-    if (!apr_pool_is_child_of(pool, global_pool)) {
-#if (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL)
-        apr_pool_log_event(pool, "LIFE",
-                           __FILE__ ":apr_pool_integrity check", 0);
-#endif /* (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL) */
-        abort();
-    }
-#endif /* (APR_POOL_DEBUG & APR_POOL_DEBUG_LIFETIME) */
-
-#if (APR_POOL_DEBUG & APR_POOL_DEBUG_OWNER)
-#if APR_HAS_THREADS
-    if (!apr_os_thread_equal(pool->owner, apr_os_thread_current())) {
-#if (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL)
-        apr_pool_log_event(pool, "THREAD",
-                           __FILE__ ":apr_pool_integrity check", 0);
-#endif /* (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL) */
-        abort();
-    }
-#endif /* APR_HAS_THREADS */
-#endif /* (APR_POOL_DEBUG & APR_POOL_DEBUG_OWNER) */
-}
-
-
-/*
- * Initialization (debug)
- */
-
-APR_DECLARE(apr_status_t) apr_pool_initialize(void)
-{
-    apr_status_t rv;
-
-    if (apr_pools_initialized++)
-        return APR_SUCCESS;
-
-    /* Since the debug code works a bit differently then the
-     * regular pools code, we ask for a lock here.  The regular
-     * pools code has got this lock embedded in the global
-     * allocator, a concept unknown to debug mode.
-     */
-    if ((rv = apr_pool_create_ex(&global_pool, NULL, NULL,
-                                 NULL)) != APR_SUCCESS) {
-        return rv;
-    }
-
-    apr_pool_tag(global_pool, "APR global pool");
-
-    apr_pools_initialized = 1;
-
-    /* This has to happen here because mutexes might be backed by
-     * atomics.  It used to be snug and safe in apr_initialize().
-     */
-    if ((rv = apr_atomic_init(global_pool)) != APR_SUCCESS) {
-        return rv;
-    }
-
-#if (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL)
-    apr_file_open_stderr(&file_stderr, global_pool);
-    if (file_stderr) {
-        apr_file_printf(file_stderr,
-            "POOL DEBUG: [PID"
-#if APR_HAS_THREADS
-            "/TID"
-#endif /* APR_HAS_THREADS */
-            "] ACTION  (SIZE      /POOL SIZE /TOTAL SIZE) "
-            "POOL       \"TAG\" <__FILE__:__LINE__> (ALLOCS/TOTAL ALLOCS/CLEARS)\n");
-
-        apr_pool_log_event(global_pool, "GLOBAL", __FILE__ ":apr_pool_initialize", 0);
-    }
-#endif /* (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL) */
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(void) apr_pool_terminate(void)
-{
-    if (!apr_pools_initialized)
-        return;
-
-    apr_pools_initialized = 0;
-
-    apr_pool_destroy(global_pool); /* This will also destroy the mutex */
-    global_pool = NULL;
-
-#if (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL)
-    file_stderr = NULL;
-#endif /* (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL) */
-}
-
-
-/*
- * Memory allocation (debug)
- */
-
-static void *pool_alloc(apr_pool_t *pool, apr_size_t size)
-{
-    debug_node_t *node;
-    void *mem;
-
-    if ((mem = malloc(size)) == NULL) {
-        if (pool->abort_fn)
-            pool->abort_fn(APR_ENOMEM);
-
-        return NULL;
-    }
-
-    node = pool->nodes;
-    if (node == NULL || node->index == 64) {
-        if ((node = malloc(SIZEOF_DEBUG_NODE_T)) == NULL) {
-            if (pool->abort_fn)
-                pool->abort_fn(APR_ENOMEM);
-
-            return NULL;
-        }
-
-        memset(node, 0, SIZEOF_DEBUG_NODE_T);
-
-        node->next = pool->nodes;
-        pool->nodes = node;
-        node->index = 0;
-    }
-
-    node->beginp[node->index] = mem;
-    node->endp[node->index] = (char *)mem + size;
-    node->index++;
-
-    pool->stat_alloc++;
-    pool->stat_total_alloc++;
-
-    return mem;
-}
-
-APR_DECLARE(void *) apr_palloc_debug(apr_pool_t *pool, apr_size_t size,
-                                     const char *file_line)
-{
-    void *mem;
-
-    apr_pool_check_integrity(pool);
-
-    mem = pool_alloc(pool, size);
-
-#if (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALLOC)
-    apr_pool_log_event(pool, "PALLOC", file_line, 1);
-#endif /* (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALLOC) */
-
-    return mem;
-}
-
-APR_DECLARE(void *) apr_pcalloc_debug(apr_pool_t *pool, apr_size_t size,
-                                      const char *file_line)
-{
-    void *mem;
-
-    apr_pool_check_integrity(pool);
-
-    mem = pool_alloc(pool, size);
-    memset(mem, 0, size);
-
-#if (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALLOC)
-    apr_pool_log_event(pool, "PCALLOC", file_line, 1);
-#endif /* (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALLOC) */
-
-    return mem;
-}
-
-
-/*
- * Pool creation/destruction (debug)
- */
-
-#define POOL_POISON_BYTE 'A'
-
-static void pool_clear_debug(apr_pool_t *pool, const char *file_line)
-{
-    debug_node_t *node;
-    apr_uint32_t index;
-
-    /* Destroy the subpools.  The subpools will detach themselves from
-     * this pool thus this loop is safe and easy.
-     */
-    while (pool->child)
-        apr_pool_destroy_debug(pool->child, file_line);
-
-    /* Run cleanups */
-    run_cleanups(&pool->cleanups);
-    pool->cleanups = NULL;
-
-    /* Free subprocesses */
-    free_proc_chain(pool->subprocesses);
-    pool->subprocesses = NULL;
-
-    /* Clear the user data. */
-    pool->user_data = NULL;
-
-    /* Free the blocks, scribbling over them first to help highlight
-     * use-after-free issues. */
-    while ((node = pool->nodes) != NULL) {
-        pool->nodes = node->next;
-
-        for (index = 0; index < node->index; index++) {
-            memset(node->beginp[index], POOL_POISON_BYTE,
-                   node->endp[index] - node->beginp[index]);
-            free(node->beginp[index]);
-        }
-
-        memset(node, POOL_POISON_BYTE, SIZEOF_DEBUG_NODE_T);
-        free(node);
-    }
-
-    pool->stat_alloc = 0;
-    pool->stat_clear++;
-}
-
-APR_DECLARE(void) apr_pool_clear_debug(apr_pool_t *pool,
-                                       const char *file_line)
-{
-#if APR_HAS_THREADS
-    apr_thread_mutex_t *mutex = NULL;
-#endif
-
-    apr_pool_check_integrity(pool);
-
-#if (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE)
-    apr_pool_log_event(pool, "CLEAR", file_line, 1);
-#endif /* (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE) */
-
-#if APR_HAS_THREADS
-    if (pool->parent != NULL)
-        mutex = pool->parent->mutex;
-
-    /* Lock the parent mutex before clearing so that if we have our
-     * own mutex it won't be accessed by apr_pool_walk_tree after
-     * it has been destroyed.
-     */
-    if (mutex != NULL && mutex != pool->mutex) {
-        apr_thread_mutex_lock(mutex);
-    }
-#endif
-
-    pool_clear_debug(pool, file_line);
-
-#if APR_HAS_THREADS
-    /* If we had our own mutex, it will have been destroyed by
-     * the registered cleanups.  Recreate the mutex.  Unlock
-     * the mutex we obtained above.
-     */
-    if (mutex != pool->mutex) {
-        (void)apr_thread_mutex_create(&pool->mutex,
-                                      APR_THREAD_MUTEX_NESTED, pool);
-
-        if (mutex != NULL)
-            (void)apr_thread_mutex_unlock(mutex);
-    }
-#endif /* APR_HAS_THREADS */
-}
-
-APR_DECLARE(void) apr_pool_destroy_debug(apr_pool_t *pool,
-                                         const char *file_line)
-{
-    apr_pool_check_integrity(pool);
-
-#if (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE)
-    apr_pool_log_event(pool, "DESTROY", file_line, 1);
-#endif /* (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE) */
-
-    pool_clear_debug(pool, file_line);
-
-    /* Remove the pool from the parents child list */
-    if (pool->parent) {
-#if APR_HAS_THREADS
-        apr_thread_mutex_t *mutex;
-
-        if ((mutex = pool->parent->mutex) != NULL)
-            apr_thread_mutex_lock(mutex);
-#endif /* APR_HAS_THREADS */
-
-        if ((*pool->ref = pool->sibling) != NULL)
-            pool->sibling->ref = pool->ref;
-
-#if APR_HAS_THREADS
-        if (mutex)
-            apr_thread_mutex_unlock(mutex);
-#endif /* APR_HAS_THREADS */
-    }
-
-    if (pool->allocator != NULL
-        && apr_allocator_owner_get(pool->allocator) == pool) {
-        apr_allocator_destroy(pool->allocator);
-    }
-
-    /* Free the pool itself */
-    free(pool);
-}
-
-APR_DECLARE(apr_status_t) apr_pool_create_ex_debug(apr_pool_t **newpool,
-                                                   apr_pool_t *parent,
-                                                   apr_abortfunc_t abort_fn,
-                                                   apr_allocator_t *allocator,
-                                                   const char *file_line)
-{
-    apr_pool_t *pool;
-
-    *newpool = NULL;
-
-    if (!parent) {
-        parent = global_pool;
-    }
-    else {
-       apr_pool_check_integrity(parent);
-
-       if (!allocator)
-           allocator = parent->allocator;
-    }
-
-    if (!abort_fn && parent)
-        abort_fn = parent->abort_fn;
-
-    if ((pool = malloc(SIZEOF_POOL_T)) == NULL) {
-        if (abort_fn)
-            abort_fn(APR_ENOMEM);
-
-         return APR_ENOMEM;
-    }
-
-    memset(pool, 0, SIZEOF_POOL_T);
-
-    pool->allocator = allocator;
-    pool->abort_fn = abort_fn;
-    pool->tag = file_line;
-    pool->file_line = file_line;
-
-    if ((pool->parent = parent) != NULL) {
-#if APR_HAS_THREADS
-        if (parent->mutex)
-            apr_thread_mutex_lock(parent->mutex);
-#endif /* APR_HAS_THREADS */
-        if ((pool->sibling = parent->child) != NULL)
-            pool->sibling->ref = &pool->sibling;
-
-        parent->child = pool;
-        pool->ref = &parent->child;
-
-#if APR_HAS_THREADS
-        if (parent->mutex)
-            apr_thread_mutex_unlock(parent->mutex);
-#endif /* APR_HAS_THREADS */
-    }
-    else {
-        pool->sibling = NULL;
-        pool->ref = NULL;
-    }
-
-#if APR_HAS_THREADS
-    pool->owner = apr_os_thread_current();
-#endif /* APR_HAS_THREADS */
-
-    if (parent == NULL || parent->allocator != allocator) {
-#if APR_HAS_THREADS
-        apr_status_t rv;
-
-        /* No matter what the creation flags say, always create
-         * a lock.  Without it integrity_check and apr_pool_num_bytes
-         * blow up (because they traverse pools child lists that
-         * possibly belong to another thread, in combination with
-         * the pool having no lock).  However, this might actually
-         * hide problems like creating a child pool of a pool
-         * belonging to another thread.
-         */
-        if ((rv = apr_thread_mutex_create(&pool->mutex,
-                APR_THREAD_MUTEX_NESTED, pool)) != APR_SUCCESS) {
-            free(pool);
-            return rv;
-        }
-#endif /* APR_HAS_THREADS */
-    }
-    else {
-#if APR_HAS_THREADS
-        if (parent)
-            pool->mutex = parent->mutex;
-#endif /* APR_HAS_THREADS */
-    }
-
-    *newpool = pool;
-
-#if (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE)
-    apr_pool_log_event(pool, "CREATE", file_line, 1);
-#endif /* (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE) */
-
-    return APR_SUCCESS;
-}
-
-
-/*
- * "Print" functions (debug)
- */
-
-struct psprintf_data {
-    apr_vformatter_buff_t vbuff;
-    char      *mem;
-    apr_size_t size;
-};
-
-static int psprintf_flush(apr_vformatter_buff_t *vbuff)
-{
-    struct psprintf_data *ps = (struct psprintf_data *)vbuff;
-    apr_size_t size;
-
-    size = ps->vbuff.curpos - ps->mem;
-
-    ps->size <<= 1;
-    if ((ps->mem = realloc(ps->mem, ps->size)) == NULL)
-        return -1;
-
-    ps->vbuff.curpos = ps->mem + size;
-    ps->vbuff.endpos = ps->mem + ps->size - 1;
-
-    return 0;
-}
-
-APR_DECLARE(char *) apr_pvsprintf(apr_pool_t *pool, const char *fmt, va_list ap)
-{
-    struct psprintf_data ps;
-    debug_node_t *node;
-
-    apr_pool_check_integrity(pool);
-
-    ps.size = 64;
-    ps.mem = malloc(ps.size);
-    ps.vbuff.curpos  = ps.mem;
-
-    /* Save a byte for the NUL terminator */
-    ps.vbuff.endpos = ps.mem + ps.size - 1;
-
-    if (apr_vformatter(psprintf_flush, &ps.vbuff, fmt, ap) == -1) {
-        if (pool->abort_fn)
-            pool->abort_fn(APR_ENOMEM);
-
-        return NULL;
-    }
-
-    *ps.vbuff.curpos++ = '\0';
-
-    /*
-     * Link the node in
-     */
-    node = pool->nodes;
-    if (node == NULL || node->index == 64) {
-        if ((node = malloc(SIZEOF_DEBUG_NODE_T)) == NULL) {
-            if (pool->abort_fn)
-                pool->abort_fn(APR_ENOMEM);
-
-            return NULL;
-        }
-
-        node->next = pool->nodes;
-        pool->nodes = node;
-        node->index = 0;
-    }
-
-    node->beginp[node->index] = ps.mem;
-    node->endp[node->index] = ps.mem + ps.size;
-    node->index++;
-
-    return ps.mem;
-}
-
-
-/*
- * Debug functions
- */
-
-APR_DECLARE(void) apr_pool_join(apr_pool_t *p, apr_pool_t *sub)
-{
-}
-
-static int pool_find(apr_pool_t *pool, void *data)
-{
-    void **pmem = (void **)data;
-    debug_node_t *node;
-    apr_uint32_t index;
-
-    node = pool->nodes;
-
-    while (node) {
-        for (index = 0; index < node->index; index++) {
-             if (node->beginp[index] <= *pmem
-                 && node->endp[index] > *pmem) {
-                 *pmem = pool;
-                 return 1;
-             }
-        }
-
-        node = node->next;
-    }
-
-    return 0;
-}
-
-APR_DECLARE(apr_pool_t *) apr_pool_find(const void *mem)
-{
-    void *pool = (void *)mem;
-
-    if (apr_pool_walk_tree(global_pool, pool_find, &pool))
-        return pool;
-
-    return NULL;
-}
-
-static int pool_num_bytes(apr_pool_t *pool, void *data)
-{
-    apr_size_t *psize = (apr_size_t *)data;
-    debug_node_t *node;
-    apr_uint32_t index;
-
-    node = pool->nodes;
-
-    while (node) {
-        for (index = 0; index < node->index; index++) {
-            *psize += (char *)node->endp[index] - (char *)node->beginp[index];
-        }
-
-        node = node->next;
-    }
-
-    return 0;
-}
-
-APR_DECLARE(apr_size_t) apr_pool_num_bytes(apr_pool_t *pool, int recurse)
-{
-    apr_size_t size = 0;
-
-    if (!recurse) {
-        pool_num_bytes(pool, &size);
-
-        return size;
-    }
-
-    apr_pool_walk_tree(pool, pool_num_bytes, &size);
-
-    return size;
-}
-
-APR_DECLARE(void) apr_pool_lock(apr_pool_t *pool, int flag)
-{
-}
-
-#endif /* !APR_POOL_DEBUG */
-
-
-/*
- * "Print" functions (common)
- */
-
-APR_DECLARE_NONSTD(char *) apr_psprintf(apr_pool_t *p, const char *fmt, ...)
-{
-    va_list ap;
-    char *res;
-
-    va_start(ap, fmt);
-    res = apr_pvsprintf(p, fmt, ap);
-    va_end(ap);
-    return res;
-}
-
-/*
- * Pool Properties
- */
-
-APR_DECLARE(void) apr_pool_abort_set(apr_abortfunc_t abort_fn,
-                                     apr_pool_t *pool)
-{
-    pool->abort_fn = abort_fn;
-}
-
-APR_DECLARE(apr_abortfunc_t) apr_pool_abort_get(apr_pool_t *pool)
-{
-    return pool->abort_fn;
-}
-
-APR_DECLARE(apr_pool_t *) apr_pool_parent_get(apr_pool_t *pool)
-{
-#ifdef NETWARE
-    /* On NetWare, don't return the global_pool, return the application pool 
-       as the top most pool */
-    if (pool->parent == global_pool)
-        return NULL;
-    else
-#endif
-    return pool->parent;
-}
-
-APR_DECLARE(apr_allocator_t *) apr_pool_allocator_get(apr_pool_t *pool)
-{
-    return pool->allocator;
-}
-
-/* return TRUE if a is an ancestor of b
- * NULL is considered an ancestor of all pools
- */
-APR_DECLARE(int) apr_pool_is_ancestor(apr_pool_t *a, apr_pool_t *b)
-{
-    if (a == NULL)
-        return 1;
-
-    while (b) {
-        if (a == b)
-            return 1;
-
-        b = b->parent;
-    }
-
-    return 0;
-}
-
-APR_DECLARE(void) apr_pool_tag(apr_pool_t *pool, const char *tag)
-{
-    pool->tag = tag;
-}
-
-
-/*
- * User data management
- */
-
-APR_DECLARE(apr_status_t) apr_pool_userdata_set(const void *data, const char *key,
-                                                apr_status_t (*cleanup) (void *),
-                                                apr_pool_t *pool)
-{
-#if APR_POOL_DEBUG
-    apr_pool_check_integrity(pool);
-#endif /* APR_POOL_DEBUG */
-
-    if (pool->user_data == NULL)
-        pool->user_data = apr_hash_make(pool);
-
-    if (apr_hash_get(pool->user_data, key, APR_HASH_KEY_STRING) == NULL) {
-        char *new_key = apr_pstrdup(pool, key);
-        apr_hash_set(pool->user_data, new_key, APR_HASH_KEY_STRING, data);
-    }
-    else {
-        apr_hash_set(pool->user_data, key, APR_HASH_KEY_STRING, data);
-    }
-
-    if (cleanup)
-        apr_pool_cleanup_register(pool, data, cleanup, cleanup);
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_pool_userdata_setn(const void *data,
-                              const char *key,
-                              apr_status_t (*cleanup)(void *),
-                              apr_pool_t *pool)
-{
-#if APR_POOL_DEBUG
-    apr_pool_check_integrity(pool);
-#endif /* APR_POOL_DEBUG */
-
-    if (pool->user_data == NULL)
-        pool->user_data = apr_hash_make(pool);
-
-    apr_hash_set(pool->user_data, key, APR_HASH_KEY_STRING, data);
-
-    if (cleanup)
-        apr_pool_cleanup_register(pool, data, cleanup, cleanup);
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_pool_userdata_get(void **data, const char *key,
-                                                apr_pool_t *pool)
-{
-#if APR_POOL_DEBUG
-    apr_pool_check_integrity(pool);
-#endif /* APR_POOL_DEBUG */
-
-    if (pool->user_data == NULL) {
-        *data = NULL;
-    }
-    else {
-        *data = apr_hash_get(pool->user_data, key, APR_HASH_KEY_STRING);
-    }
-
-    return APR_SUCCESS;
-}
-
-
-/*
- * Cleanup
- */
-
-struct cleanup_t {
-    struct cleanup_t *next;
-    const void *data;
-    apr_status_t (*plain_cleanup_fn)(void *data);
-    apr_status_t (*child_cleanup_fn)(void *data);
-};
-
-APR_DECLARE(void) apr_pool_cleanup_register(apr_pool_t *p, const void *data,
-                      apr_status_t (*plain_cleanup_fn)(void *data),
-                      apr_status_t (*child_cleanup_fn)(void *data))
-{
-    cleanup_t *c;
-
-#if APR_POOL_DEBUG
-    apr_pool_check_integrity(p);
-#endif /* APR_POOL_DEBUG */
-
-    if (p != NULL) {
-        c = (cleanup_t *)apr_palloc(p, sizeof(cleanup_t));
-        c->data = data;
-        c->plain_cleanup_fn = plain_cleanup_fn;
-        c->child_cleanup_fn = child_cleanup_fn;
-        c->next = p->cleanups;
-        p->cleanups = c;
-    }
-}
-
-APR_DECLARE(void) apr_pool_cleanup_kill(apr_pool_t *p, const void *data,
-                      apr_status_t (*cleanup_fn)(void *))
-{
-    cleanup_t *c, **lastp;
-
-#if APR_POOL_DEBUG
-    apr_pool_check_integrity(p);
-#endif /* APR_POOL_DEBUG */
-
-    if (p == NULL)
-        return;
-
-    c = p->cleanups;
-    lastp = &p->cleanups;
-    while (c) {
-        if (c->data == data && c->plain_cleanup_fn == cleanup_fn) {
-            *lastp = c->next;
-            break;
-        }
-
-        lastp = &c->next;
-        c = c->next;
-    }
-}
-
-APR_DECLARE(void) apr_pool_child_cleanup_set(apr_pool_t *p, const void *data,
-                      apr_status_t (*plain_cleanup_fn)(void *),
-                      apr_status_t (*child_cleanup_fn)(void *))
-{
-    cleanup_t *c;
-
-#if APR_POOL_DEBUG
-    apr_pool_check_integrity(p);
-#endif /* APR_POOL_DEBUG */
-
-    if (p == NULL)
-        return;
-
-    c = p->cleanups;
-    while (c) {
-        if (c->data == data && c->plain_cleanup_fn == plain_cleanup_fn) {
-            c->child_cleanup_fn = child_cleanup_fn;
-            break;
-        }
-
-        c = c->next;
-    }
-}
-
-APR_DECLARE(apr_status_t) apr_pool_cleanup_run(apr_pool_t *p, void *data,
-                              apr_status_t (*cleanup_fn)(void *))
-{
-    apr_pool_cleanup_kill(p, data, cleanup_fn);
-    return (*cleanup_fn)(data);
-}
-
-static void run_cleanups(cleanup_t **cref)
-{
-    cleanup_t *c = *cref;
-
-    while (c) {
-        *cref = c->next;
-        (*c->plain_cleanup_fn)((void *)c->data);
-        c = *cref;
-    }
-}
-
-static void run_child_cleanups(cleanup_t **cref)
-{
-    cleanup_t *c = *cref;
-
-    while (c) {
-        *cref = c->next;
-        (*c->child_cleanup_fn)((void *)c->data);
-        c = *cref;
-    }
-}
-
-static void cleanup_pool_for_exec(apr_pool_t *p)
-{
-    run_child_cleanups(&p->cleanups);
-
-    for (p = p->child; p; p = p->sibling)
-        cleanup_pool_for_exec(p);
-}
-
-APR_DECLARE(void) apr_pool_cleanup_for_exec(void)
-{
-#if !defined(WIN32) && !defined(OS2)
-    /*
-     * Don't need to do anything on NT or OS/2, because I
-     * am actually going to spawn the new process - not
-     * exec it. All handles that are not inheritable, will
-     * be automajically closed. The only problem is with
-     * file handles that are open, but there isn't much
-     * I can do about that (except if the child decides
-     * to go out and close them
-     */
-    cleanup_pool_for_exec(global_pool);
-#endif /* !defined(WIN32) && !defined(OS2) */
-}
-
-APR_DECLARE_NONSTD(apr_status_t) apr_pool_cleanup_null(void *data)
-{
-    /* do nothing cleanup routine */
-    return APR_SUCCESS;
-}
-
-/* Subprocesses don't use the generic cleanup interface because
- * we don't want multiple subprocesses to result in multiple
- * three-second pauses; the subprocesses have to be "freed" all
- * at once.  If other resources are introduced with the same property,
- * we might want to fold support for that into the generic interface.
- * For now, it's a special case.
- */
-APR_DECLARE(void) apr_pool_note_subprocess(apr_pool_t *pool, apr_proc_t *proc,
-                                           apr_kill_conditions_e how)
-{
-    struct process_chain *pc = apr_palloc(pool, sizeof(struct process_chain));
-
-    pc->proc = proc;
-    pc->kill_how = how;
-    pc->next = pool->subprocesses;
-    pool->subprocesses = pc;
-}
-
-static void free_proc_chain(struct process_chain *procs)
-{
-    /* Dispose of the subprocesses we've spawned off in the course of
-     * whatever it was we're cleaning up now.  This may involve killing
-     * some of them off...
-     */
-    struct process_chain *pc;
-    int need_timeout = 0;
-    apr_time_t timeout_interval;
-
-    if (!procs)
-        return; /* No work.  Whew! */
-
-    /* First, check to see if we need to do the SIGTERM, sleep, SIGKILL
-     * dance with any of the processes we're cleaning up.  If we've got
-     * any kill-on-sight subprocesses, ditch them now as well, so they
-     * don't waste any more cycles doing whatever it is that they shouldn't
-     * be doing anymore.
-     */
-
-#ifndef NEED_WAITPID
-    /* Pick up all defunct processes */
-    for (pc = procs; pc; pc = pc->next) {
-        if (apr_proc_wait(pc->proc, NULL, NULL, APR_NOWAIT) != APR_CHILD_NOTDONE)
-            pc->kill_how = APR_KILL_NEVER;
-    }
-#endif /* !defined(NEED_WAITPID) */
-
-    for (pc = procs; pc; pc = pc->next) {
-#ifndef WIN32
-        if ((pc->kill_how == APR_KILL_AFTER_TIMEOUT)
-            || (pc->kill_how == APR_KILL_ONLY_ONCE)) {
-            /*
-             * Subprocess may be dead already.  Only need the timeout if not.
-             * Note: apr_proc_kill on Windows is TerminateProcess(), which is
-             * similar to a SIGKILL, so always give the process a timeout
-             * under Windows before killing it.
-             */
-            if (apr_proc_kill(pc->proc, SIGTERM) == APR_SUCCESS)
-                need_timeout = 1;
-        }
-        else if (pc->kill_how == APR_KILL_ALWAYS) {
-#else /* WIN32 knows only one fast, clean method of killing processes today */
-        if (pc->kill_how != APR_KILL_NEVER) {
-            need_timeout = 1;
-            pc->kill_how = APR_KILL_ALWAYS;
-#endif
-            apr_proc_kill(pc->proc, SIGKILL);
-        }
-    }
-
-    /* Sleep only if we have to. The sleep algorithm grows
-     * by a factor of two on each iteration. TIMEOUT_INTERVAL
-     * is equal to TIMEOUT_USECS / 64.
-     */
-    if (need_timeout) {
-        timeout_interval = TIMEOUT_INTERVAL;
-        apr_sleep(timeout_interval);
-
-        do {
-            /* check the status of the subprocesses */
-            need_timeout = 0;
-            for (pc = procs; pc; pc = pc->next) {
-                if (pc->kill_how == APR_KILL_AFTER_TIMEOUT) {
-                    if (apr_proc_wait(pc->proc, NULL, NULL, APR_NOWAIT)
-                            == APR_CHILD_NOTDONE)
-                        need_timeout = 1;		/* subprocess is still active */
-                    else
-                        pc->kill_how = APR_KILL_NEVER;	/* subprocess has exited */
-                }
-            }
-            if (need_timeout) {
-                if (timeout_interval >= TIMEOUT_USECS) {
-                    break;
-                }
-                apr_sleep(timeout_interval);
-                timeout_interval *= 2;
-            }
-        } while (need_timeout);
-    }
-
-    /* OK, the scripts we just timed out for have had a chance to clean up
-     * --- now, just get rid of them, and also clean up the system accounting
-     * goop...
-     */
-    for (pc = procs; pc; pc = pc->next) {
-        if (pc->kill_how == APR_KILL_AFTER_TIMEOUT)
-            apr_proc_kill(pc->proc, SIGKILL);
-    }
-
-    /* Now wait for all the signaled processes to die */
-    for (pc = procs; pc; pc = pc->next) {
-        if (pc->kill_how != APR_KILL_NEVER)
-            (void)apr_proc_wait(pc->proc, NULL, NULL, APR_WAIT);
-    }
-}
-
-
-/*
- * Pool creation/destruction stubs, for people who are running
- * mixed release/debug enviroments.
- */
-
-#if !APR_POOL_DEBUG
-APR_DECLARE(void *) apr_palloc_debug(apr_pool_t *pool, apr_size_t size,
-                                     const char *file_line)
-{
-    return apr_palloc(pool, size);
-}
-
-APR_DECLARE(void *) apr_pcalloc_debug(apr_pool_t *pool, apr_size_t size,
-                                      const char *file_line)
-{
-    return apr_pcalloc(pool, size);
-}
-
-APR_DECLARE(void) apr_pool_clear_debug(apr_pool_t *pool,
-                                       const char *file_line)
-{
-    apr_pool_clear(pool);
-}
-
-APR_DECLARE(void) apr_pool_destroy_debug(apr_pool_t *pool,
-                                         const char *file_line)
-{
-    apr_pool_destroy(pool);
-}
-
-APR_DECLARE(apr_status_t) apr_pool_create_ex_debug(apr_pool_t **newpool,
-                                                   apr_pool_t *parent,
-                                                   apr_abortfunc_t abort_fn,
-                                                   apr_allocator_t *allocator,
-                                                   const char *file_line)
-{
-    return apr_pool_create_ex(newpool, parent, abort_fn, allocator);
-}
-
-#else /* APR_POOL_DEBUG */
-
-#undef apr_palloc
-APR_DECLARE(void *) apr_palloc(apr_pool_t *pool, apr_size_t size);
-
-APR_DECLARE(void *) apr_palloc(apr_pool_t *pool, apr_size_t size)
-{
-    return apr_palloc_debug(pool, size, "undefined");
-}
-
-#undef apr_pcalloc
-APR_DECLARE(void *) apr_pcalloc(apr_pool_t *pool, apr_size_t size);
-
-APR_DECLARE(void *) apr_pcalloc(apr_pool_t *pool, apr_size_t size)
-{
-    return apr_pcalloc_debug(pool, size, "undefined");
-}
-
-#undef apr_pool_clear
-APR_DECLARE(void) apr_pool_clear(apr_pool_t *pool);
-
-APR_DECLARE(void) apr_pool_clear(apr_pool_t *pool)
-{
-    apr_pool_clear_debug(pool, "undefined");
-}
-
-#undef apr_pool_destroy
-APR_DECLARE(void) apr_pool_destroy(apr_pool_t *pool);
-
-APR_DECLARE(void) apr_pool_destroy(apr_pool_t *pool)
-{
-    apr_pool_destroy_debug(pool, "undefined");
-}
-
-#undef apr_pool_create_ex
-APR_DECLARE(apr_status_t) apr_pool_create_ex(apr_pool_t **newpool,
-                                             apr_pool_t *parent,
-                                             apr_abortfunc_t abort_fn,
-                                             apr_allocator_t *allocator);
-
-APR_DECLARE(apr_status_t) apr_pool_create_ex(apr_pool_t **newpool,
-                                             apr_pool_t *parent,
-                                             apr_abortfunc_t abort_fn,
-                                             apr_allocator_t *allocator)
-{
-    return apr_pool_create_ex_debug(newpool, parent,
-                                    abort_fn, allocator,
-                                    "undefined");
-}
-
-#endif /* APR_POOL_DEBUG */
-
-/* Deprecated */
-APR_DECLARE(void) apr_allocator_set_max_free(apr_allocator_t *allocator,
-                                             apr_size_t size)
-{
-    apr_allocator_max_free_set(allocator, size);
-}
-
-/* Deprecated */
-APR_DECLARE(void) apr_pool_set_abort(apr_abortfunc_t abort_fn,
-                                     apr_pool_t *pool)
-{
-    apr_pool_abort_set(abort_fn, pool);
-}
-
-/* Deprecated */
-APR_DECLARE(apr_abortfunc_t) apr_pool_get_abort(apr_pool_t *pool)
-{
-    return apr_pool_abort_get(pool);
-}
-
-/* Deprecated */
-APR_DECLARE(apr_pool_t *) apr_pool_get_parent(apr_pool_t *pool)
-{
-    return apr_pool_parent_get(pool);
-}
-
-/* Deprecated */
-APR_DECLARE(void) apr_allocator_set_owner(apr_allocator_t *allocator,
-                                          apr_pool_t *pool)
-{
-    apr_allocator_owner_set(allocator, pool);
-}
-
-/* Deprecated */
-APR_DECLARE(apr_pool_t *) apr_allocator_get_owner(
-                                  apr_allocator_t *allocator)
-{
-    return apr_allocator_owner_get(allocator);
-}
-
-#if APR_HAS_THREADS
-/* Deprecated */
-APR_DECLARE(apr_thread_mutex_t *) apr_allocator_get_mutex(
-                                      apr_allocator_t *allocator)
-{
-    return apr_allocator_mutex_get(allocator);
-}
-
-/* Deprecated */
-APR_DECLARE(void) apr_allocator_set_mutex(apr_allocator_t *allocator,
-                                          apr_thread_mutex_t *mutex)
-{
-    apr_allocator_mutex_set(allocator, mutex);
-}
-#endif /* APR_HAS_THREADS */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/memory/unix/apr_pools.lo b/rubbos/app/httpd-2.0.64/srclib/apr/memory/unix/apr_pools.lo
deleted file mode 100644
index 7b062dc8..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/memory/unix/apr_pools.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# apr_pools.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/apr_pools.o'
-
-# Name of the non-PIC object.
-non_pic_object='apr_pools.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/memory/unix/apr_pools.o b/rubbos/app/httpd-2.0.64/srclib/apr/memory/unix/apr_pools.o
deleted file mode 100644
index c3f2036d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/memory/unix/apr_pools.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/netware/apr.xdc b/rubbos/app/httpd-2.0.64/srclib/apr/misc/netware/apr.xdc
deleted file mode 100644
index 12a7f6ba..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/netware/apr.xdc
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/netware/aprlib.def b/rubbos/app/httpd-2.0.64/srclib/apr/misc/netware/aprlib.def
deleted file mode 100644
index 0a2a01eb..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/netware/aprlib.def
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE  LIBC.NLM
-MODULE  WS2_32.NLM
-EXPORT	@aprlib.imp
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/netware/charset.c b/rubbos/app/httpd-2.0.64/srclib/apr/misc/netware/charset.c
deleted file mode 100644
index b79add10..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/netware/charset.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-
-/* static struct utsname sysinfo; */
-
-/* XXX This needs to be fixed to produce the correct system language */
-
-APR_DECLARE(const char*) apr_os_default_encoding (apr_pool_t *pool)
-{
-    return apr_pstrdup(pool, "CP1252");
-}
-
-
-APR_DECLARE(const char*) apr_os_locale_encoding (apr_pool_t *pool)
-{
-    return apr_os_default_encoding(pool);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/netware/libprews.c b/rubbos/app/httpd-2.0.64/srclib/apr/misc/netware/libprews.c
deleted file mode 100644
index 53a630d2..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/netware/libprews.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <netware.h>
-#include <library.h>
-#include <nks/synch.h>
-#include "novsock2.h"
-
-#include "apr_pools.h"
-#include "apr_private.h"
-
-
-/* library-private data...*/
-int          gLibId = -1;
-void         *gLibHandle = (void *) NULL;
-NXMutex_t    *gLibLock = (NXMutex_t *) NULL;
-
-/* internal library function prototypes...*/
-int DisposeLibraryData(void *);
-
-int _NonAppStart
-(
-    void        *NLMHandle,
-    void        *errorScreen,
-    const char  *cmdLine,
-    const char  *loadDirPath,
-    size_t      uninitializedDataLength,
-    void        *NLMFileHandle,
-    int         (*readRoutineP)( int conn, void *fileHandle, size_t offset,
-                    size_t nbytes, size_t *bytesRead, void *buffer ),
-    size_t      customDataOffset,
-    size_t      customDataSize,
-    int         messageCount,
-    const char  **messages
-)
-{
-    WSADATA wsaData;
-    apr_status_t status;
-
-    NX_LOCK_INFO_ALLOC(liblock, "Per-Application Data Lock", 0);
-
-#pragma unused(cmdLine)
-#pragma unused(loadDirPath)
-#pragma unused(uninitializedDataLength)
-#pragma unused(NLMFileHandle)
-#pragma unused(readRoutineP)
-#pragma unused(customDataOffset)
-#pragma unused(customDataSize)
-#pragma unused(messageCount)
-#pragma unused(messages)
-
-    
-    gLibId = register_library(DisposeLibraryData);
-
-    if (gLibId < -1)
-    {
-        OutputToScreen(errorScreen, "Unable to register library with kernel.\n");
-        return -1;
-    }
-
-    gLibHandle = NLMHandle;
-
-    gLibLock = NXMutexAlloc(0, 0, &liblock);
-
-    if (!gLibLock)
-    {
-        OutputToScreen(errorScreen, "Unable to allocate library data lock.\n");
-        return -1;
-    }
-
-    apr_netware_setup_time();
-
-    if ((status = apr_pool_initialize()) != APR_SUCCESS)
-        return status;
-
-    return WSAStartup((WORD) MAKEWORD(2, 0), &wsaData);
-}
-
-void _NonAppStop( void )
-{
-    apr_pool_terminate();
-
-    WSACleanup();
-
-    unregister_library(gLibId);
-    NXMutexFree(gLibLock);
-}
-
-int  _NonAppCheckUnload( void )
-{
-    return 0;
-}
-
-int register_NLM(void *NLMHandle)
-{
-    APP_DATA *app_data = (APP_DATA*) get_app_data(gLibId);
-
-    NXLock(gLibLock);
-    if (!app_data) {
-        app_data = (APP_DATA*)library_malloc(gLibHandle, sizeof(APP_DATA));
-
-        if (app_data) {
-            memset (app_data, 0, sizeof(APP_DATA));
-            set_app_data(gLibId, app_data);
-            app_data->gs_nlmhandle = NLMHandle;
-        }
-    }
-
-    if (app_data && (!app_data->initialized)) {
-        app_data->initialized = 1;
-        NXUnlock(gLibLock);
-        return 0;
-    }
-
-    NXUnlock(gLibLock);
-    return 1;
-}
-
-int unregister_NLM(void *NLMHandle)
-{
-    APP_DATA *app_data = (APP_DATA*) get_app_data(gLibId);
-
-    NXLock(gLibLock);
-    if (app_data) {
-        app_data->initialized = 0;
-        NXUnlock(gLibLock);
-        return 0;
-    }
-    NXUnlock(gLibLock);
-    return 1;
-}
-
-int DisposeLibraryData(void *data)
-{
-    if (data)
-    {
-        library_free(data);
-    }
-
-    return 0;
-}
-
-int setGlobalPool(void *data)
-{
-    APP_DATA *app_data = (APP_DATA*) get_app_data(gLibId);
-
-    NXLock(gLibLock);
-
-    if (app_data && !app_data->gPool) {
-        app_data->gPool = data;
-    }
-
-    NXUnlock(gLibLock);
-    return 1;
-}
-
-void* getGlobalPool()
-{
-    APP_DATA *app_data = (APP_DATA*) get_app_data(gLibId);
-
-    if (app_data) {
-        return app_data->gPool;
-    }
-
-    return NULL;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/netware/rand.c b/rubbos/app/httpd-2.0.64/srclib/apr/misc/netware/rand.c
deleted file mode 100644
index f1f43bec..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/netware/rand.c
+++ /dev/null
@@ -1,72 +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.
- */
-
-#define APR_WANT_MEMFUNC
-#include "apr_want.h"
-#include "apr_general.h"
-#include "apr_private.h"
-
-#if APR_HAS_RANDOM
-
-#include <nks/plat.h>
-
-static int NXSeedRandomInternal( size_t width, void *seed )
-{
-    static int init = 0;
-    int                        *s = (int *) seed;
-    union { int x; char y[4]; } u;
-
-    if (!init) {
-        srand(NXGetSystemTick());
-        init = 1;
-    }
- 
-    if (width > 3)
-    {
-        do
-        {
-            *s++ = rand();
-        }
-        while ((width -= 4) > 3);
-    }
- 
-    if (width > 0)
-    {
-        char *p = (char *) s;
-
-        u.x = rand();
- 
-        while (width > 0)
-           *p++ = u.y[width--];
-    }
- 
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_generate_random_bytes(unsigned char *buf, 
-#ifdef APR_ENABLE_FOR_1_0
-                                                    apr_size_t length)
-#else
-                                                    int length)
-#endif
-{
-    if (NXSeedRandom(length, buf) != 0) {
-        return NXSeedRandomInternal (length, buf);
-    }
-    return APR_SUCCESS;
-}
-
-#endif /* APR_HAS_RANDOM */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/netware/start.c b/rubbos/app/httpd-2.0.64/srclib/apr/misc/netware/start.c
deleted file mode 100644
index 29488e3a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/netware/start.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_signal.h"
-
-#include "apr_arch_misc.h"       /* for WSAHighByte / WSALowByte */
-#include "apr_arch_proc_mutex.h" /* for apr_proc_mutex_unix_setup_lock() */
-#include "apr_arch_internal_time.h"
-
-/*
-** Resource tag signatures for using NetWare WinSock 2. These will no longer
-** be needed by anyone once the new WSAStartupWithNlmHandle() is available
-** since WinSock will make the calls to AllocateResourceTag().
-*/
-#define WS_LOAD_ENTRY_SIGNATURE     (*(unsigned long *) "WLDE")
-#define WS_SKT_SIGNATURE            (*(unsigned long *) "WSKT")
-#define WS_LOOKUP_SERVICE_SIGNATURE (*(unsigned long *) "WLUP")
-#define WS_WSAEVENT_SIGNATURE       (*(unsigned long *) "WEVT")
-#define WS_CPORT_SIGNATURE          (*(unsigned long *) "WCPT")
-
-
-int (*WSAStartupWithNLMHandle)( WORD version, LPWSADATA data, void *handle ) = NULL;
-int (*WSACleanupWithNLMHandle)( void *handle ) = NULL;
-
-static int wsa_startup_with_handle (WORD wVersionRequested, LPWSADATA data, void *handle)
-{
-    APP_DATA *app_data;
-    
-    if (!(app_data = (APP_DATA*) get_app_data(gLibId)))
-        return APR_EGENERAL;
-
-    app_data->gs_startup_rtag = AllocateResourceTag(handle, "WinSock Start-up", WS_LOAD_ENTRY_SIGNATURE);
-    app_data->gs_socket_rtag  = AllocateResourceTag(handle, "WinSock socket()", WS_SKT_SIGNATURE);
-    app_data->gs_lookup_rtag  = AllocateResourceTag(handle, "WinSock Look-up", WS_LOOKUP_SERVICE_SIGNATURE);
-    app_data->gs_event_rtag   = AllocateResourceTag(handle, "WinSock Event", WS_WSAEVENT_SIGNATURE);
-    app_data->gs_pcp_rtag     = AllocateResourceTag(handle, "WinSock C-Port", WS_CPORT_SIGNATURE);
-
-    return WSAStartupRTags(wVersionRequested, data, 
-                           app_data->gs_startup_rtag, 
-                           app_data->gs_socket_rtag, 
-                           app_data->gs_lookup_rtag, 
-                           app_data->gs_event_rtag, 
-                           app_data->gs_pcp_rtag);
-}
-
-static int wsa_cleanup_with_handle (void *handle)
-{
-    APP_DATA *app_data;
-    
-    if (!(app_data = (APP_DATA*) get_app_data(gLibId)))
-        return APR_EGENERAL;
-
-    return WSACleanupRTag(app_data->gs_startup_rtag);
-}
-
-static int UnregisterAppWithWinSock (void *nlm_handle)
-{
-    if (!WSACleanupWithNLMHandle)
-    {
-        if (!(WSACleanupWithNLMHandle = ImportPublicObject(gLibHandle, "WSACleanupWithNLMHandle")))
-            WSACleanupWithNLMHandle = wsa_cleanup_with_handle;
-    }
-
-    return (*WSACleanupWithNLMHandle)(nlm_handle);
-}
-
-static int RegisterAppWithWinSock (void *nlm_handle)
-{
-    int err;
-    WSADATA wsaData;
-    WORD wVersionRequested = MAKEWORD(WSAHighByte, WSALowByte);
-
-    if (!WSAStartupWithNLMHandle)
-    {
-        if (!(WSAStartupWithNLMHandle = ImportPublicObject(gLibHandle, "WSAStartupWithNLMHandle")))
-            WSAStartupWithNLMHandle = wsa_startup_with_handle;
-    }
-
-    err = (*WSAStartupWithNLMHandle)(wVersionRequested, &wsaData, nlm_handle);
-
-    if (LOBYTE(wsaData.wVersion) != WSAHighByte ||
-        HIBYTE(wsaData.wVersion) != WSALowByte) {
-        
-        UnregisterAppWithWinSock (nlm_handle);
-        return APR_EEXIST;
-    }
-
-    return err;
-}
-
-APR_DECLARE(apr_status_t) apr_app_initialize(int *argc, 
-                                             const char * const * *argv, 
-                                             const char * const * *env)
-{
-    /* An absolute noop.  At present, only Win32 requires this stub, but it's
-     * required in order to move command arguments passed through the service
-     * control manager into the process, and it's required to fix the char*
-     * data passed in from win32 unicode into utf-8, win32's apr internal fmt.
-     */
-    return apr_initialize();
-}
-
-APR_DECLARE(apr_status_t) apr_initialize(void)
-{
-    apr_pool_t *pool;
-    int err;
-    void *nlmhandle = getnlmhandle();
-
-    /* Register the NLM as using APR. If it is already
-        registered then just return. */
-    if (register_NLM(nlmhandle) != 0) {
-        return APR_SUCCESS;
-    }
-
-    /* apr_pool_initialize() is being called from the library
-        startup code since all of the memory resources belong 
-        to the library rather than the application. */
-    
-    if (apr_pool_create(&pool, NULL) != APR_SUCCESS) {
-        return APR_ENOPOOL;
-    }
-
-    apr_pool_tag(pool, "apr_initilialize");
-
-    err = RegisterAppWithWinSock (nlmhandle);
-    
-    if (err) {
-        return err;
-    }
-
-    apr_signal_init(pool);
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE_NONSTD(void) apr_terminate(void)
-{
-    APP_DATA *app_data;
-
-    /* Get our instance data for shutting down. */
-    if (!(app_data = (APP_DATA*) get_app_data(gLibId)))
-        return;
-
-    /* Unregister the NLM. If it is not registered
-        then just return. */
-    if (unregister_NLM(app_data->gs_nlmhandle) != 0) {
-        return;
-    }
-
-    /* apr_pool_terminate() is being called from the 
-        library shutdown code since the memory resources
-        belong to the library rather than the application */
-
-    /* Just clean up the memory for the app that is going
-        away. */
-    netware_pool_proc_cleanup ();
-
-    UnregisterAppWithWinSock (app_data->gs_nlmhandle);
-}
-
-APR_DECLARE(void) apr_terminate2(void)
-{
-    apr_terminate();
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/os2/randbyte.c b/rubbos/app/httpd-2.0.64/srclib/apr/misc/os2/randbyte.c
deleted file mode 100644
index 4020e31f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/os2/randbyte.c
+++ /dev/null
@@ -1,123 +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.
- */
-
-/* The high resolution timer API provides access to the hardware timer 
- * running at around 1.1MHz. The amount this changes in a time slice is
- * varies randomly due to system events, hardware interrupts etc
- */
-static UCHAR randbyte_hrtimer()
-{
-    QWORD t1, t2;
-    UCHAR byte;
-
-    DosTmrQueryTime(&t1);
-    DosSleep(5);
-    DosTmrQueryTime(&t2);
-
-    byte = (t2.ulLo - t1.ulLo) & 0xFF;
-    byte ^= (t2.ulLo - t1.ulLo) >> 8;
-    return byte;
-}
-
-
-
-/* A bunch of system information like memory & process stats.
- * Not highly random but every bit helps....
- */
-static UCHAR randbyte_sysinfo()
-{
-    UCHAR byte = 0;
-    UCHAR SysVars[100];
-    int b;
-
-    DosQuerySysInfo(1, QSV_FOREGROUND_PROCESS, SysVars, sizeof(SysVars));
-
-    for (b = 0; b < 100; b++) {
-        byte ^= SysVars[b];
-    }
-
-    return byte;
-}
-
-
-
-/* Similar in concept to randbyte_hrtimer() but accesses the CPU's internal
- * counters which run at the CPU's MHz speed. We get separate 
- * idle / busy / interrupt cycle counts which should provide very good 
- * randomness due to interference of hardware events.
- * This only works on newer CPUs (at least PPro or K6) and newer OS/2 versions
- * which is why it's run-time linked.
- */
-
-static APIRET APIENTRY(*DosPerfSysCall) (ULONG ulCommand, ULONG ulParm1,
-                                         ULONG ulParm2, ULONG ulParm3) = NULL;
-static HMODULE hDoscalls = 0;
-#define   CMD_KI_RDCNT    (0x63)
-
-typedef struct _CPUUTIL {
-    ULONG ulTimeLow;            /* Low 32 bits of time stamp      */
-    ULONG ulTimeHigh;           /* High 32 bits of time stamp     */
-    ULONG ulIdleLow;            /* Low 32 bits of idle time       */
-    ULONG ulIdleHigh;           /* High 32 bits of idle time      */
-    ULONG ulBusyLow;            /* Low 32 bits of busy time       */
-    ULONG ulBusyHigh;           /* High 32 bits of busy time      */
-    ULONG ulIntrLow;            /* Low 32 bits of interrupt time  */
-    ULONG ulIntrHigh;           /* High 32 bits of interrupt time */
-} CPUUTIL;
-
-
-static UCHAR randbyte_perf()
-{
-    UCHAR byte = 0;
-    CPUUTIL util;
-    int c;
-
-    if (hDoscalls == 0) {
-        char failed_module[20];
-        ULONG rc;
-
-        rc = DosLoadModule(failed_module, sizeof(failed_module), "DOSCALLS",
-                           &hDoscalls);
-
-        if (rc == 0) {
-            rc = DosQueryProcAddr(hDoscalls, 976, NULL, (PFN *)&DosPerfSysCall);
-
-            if (rc) {
-                DosPerfSysCall = NULL;
-            }
-        }
-    }
-
-    if (DosPerfSysCall) {
-        if (DosPerfSysCall(CMD_KI_RDCNT, (ULONG)&util, 0, 0) == 0) {
-            for (c = 0; c < sizeof(util); c++) {
-                byte ^= ((UCHAR *)&util)[c];
-            }
-        }
-        else {
-            DosPerfSysCall = NULL;
-        }
-    }
-
-    return byte;
-}
-
-
-
-static UCHAR randbyte()
-{
-    return randbyte_hrtimer() ^ randbyte_sysinfo() ^ randbyte_perf();
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/charset.o b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/charset.o
deleted file mode 100644
index 10062ca8..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/charset.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/env.o b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/env.o
deleted file mode 100644
index c4a911b2..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/env.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/errorcodes.o b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/errorcodes.o
deleted file mode 100644
index b859d41d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/errorcodes.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/getopt.o b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/getopt.o
deleted file mode 100644
index 3ce5cd4f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/getopt.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/otherchild.o b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/otherchild.o
deleted file mode 100644
index 816cd352..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/otherchild.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/rand.o b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/rand.o
deleted file mode 100644
index 97f49838..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/rand.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/start.o b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/start.o
deleted file mode 100644
index 83415657..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/start.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/version.o b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/version.o
deleted file mode 100644
index f1272498..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/.libs/version.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/Makefile
deleted file mode 100644
index f25e2120..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-srcdir = .
-
-
-TARGETS = \
-	start.lo getopt.lo otherchild.lo errorcodes.lo rand.lo version.lo \
-	charset.lo env.lo
-
-# bring in rules.mk for standard functionality
-include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/unix
-DEFOSDIR=$(INCDIR)/arch/unix
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/Makefile.in
deleted file mode 100644
index fffd81c1..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = \
-	start.lo getopt.lo otherchild.lo errorcodes.lo rand.lo version.lo \
-	charset.lo env.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/@OSDIR@
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/charset.c b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/charset.c
deleted file mode 100644
index 57018a7c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/charset.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-
-#ifdef HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
-
-/*
- * simple heuristic to determine codepage of source code so that
- * literal strings (e.g., "GET /\r\n") in source code can be translated
- * properly
- *
- * If appropriate, a symbol can be set at configure time to determine
- * this.  On EBCDIC platforms, it will be important how the code was
- * unpacked.
- */
-
-APR_DECLARE(const char*) apr_os_default_encoding (apr_pool_t *pool)
-{
-#ifdef __MVS__
-#    ifdef __CODESET__
-        return __CODESET__;
-#    else
-        return "IBM-1047";
-#    endif
-#endif
-
-    if ('}' == 0xD0) {
-        return "IBM-1047";
-    }
-
-    if ('{' == 0xFB) {
-        return "EDF04";
-    }
-
-    if ('A' == 0xC1) {
-        return "EBCDIC"; /* not useful */
-    }
-
-    if ('A' == 0x41) {
-        return "ISO8859-1"; /* not necessarily true */
-    }
-
-    return "unknown";
-}
-
-
-APR_DECLARE(const char*) apr_os_locale_encoding (apr_pool_t *pool)
-{
-#if defined(HAVE_NL_LANGINFO) && defined(CODESET)
-    const char *charset;
-
-    charset = nl_langinfo(CODESET);
-    if (charset && *charset) {
-#ifdef _OSD_POSIX /* Bug workaround - delete as soon as fixed in OSD_POSIX */
-        /* Some versions of OSD_POSIX return nl_langinfo(CODESET)="^[nN]" */
-        /* Ignore the bogus information and use apr_os_default_encoding() */
-        if (charset[0] != '^')
-#endif
-        return apr_pstrdup(pool, charset);
-    }
-#endif
-
-    return apr_os_default_encoding(pool);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/charset.lo b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/charset.lo
deleted file mode 100644
index d3e19344..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/charset.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# charset.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/charset.o'
-
-# Name of the non-PIC object.
-non_pic_object='charset.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/charset.o b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/charset.o
deleted file mode 100644
index 218e464a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/charset.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/env.c b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/env.c
deleted file mode 100644
index 9ba6b61e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/env.c
+++ /dev/null
@@ -1,97 +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.
- */
-
-#define APR_WANT_STRFUNC
-#include "apr_want.h"
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_env.h"
-
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#if APR_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-APR_DECLARE(apr_status_t) apr_env_get(char **value,
-                                      const char *envvar,
-                                      apr_pool_t *pool)
-{
-#ifdef HAVE_GETENV
-
-    char *val = getenv(envvar);
-    if (!val)
-        return APR_ENOENT;
-    *value = val;
-    return APR_SUCCESS;
-
-#else
-    return APR_ENOTIMPL;
-#endif
-}
-
-
-APR_DECLARE(apr_status_t) apr_env_set(const char *envvar,
-                                      const char *value,
-                                      apr_pool_t *pool)
-{
-#if defined(HAVE_SETENV)
-
-    if (0 > setenv(envvar, value, 1))
-        return APR_ENOMEM;
-    return APR_SUCCESS;
-
-#elif defined(HAVE_PUTENV)
-
-    apr_size_t elen = strlen(envvar);
-    apr_size_t vlen = strlen(value);
-    char *env = apr_palloc(pool, elen + vlen + 2);
-    char *p = env + elen;
-
-    memcpy(env, envvar, elen);
-    *p++ = '=';
-    memcpy(p, value, vlen);
-    p[vlen] = '\0';
-
-    if (0 > putenv(env))
-        return APR_ENOMEM;
-    return APR_SUCCESS;
-
-#else
-    return APR_ENOTIMPL;
-#endif
-}
-
-
-APR_DECLARE(apr_status_t) apr_env_delete(const char *envvar, apr_pool_t *pool)
-{
-#ifdef HAVE_UNSETENV
-
-    unsetenv(envvar);
-    return APR_SUCCESS;
-
-#else
-    /* hint: some platforms allow envvars to be unset via
-     *       putenv("varname")...  that isn't Single Unix spec,
-     *       but if your platform doesn't have unsetenv() it is
-     *       worth investigating and potentially adding a
-     *       configure check to decide when to use that form of
-     *       putenv() here
-     */
-    return APR_ENOTIMPL;
-#endif
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/env.lo b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/env.lo
deleted file mode 100644
index 7140ef3f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/env.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# env.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/env.o'
-
-# Name of the non-PIC object.
-non_pic_object='env.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/env.o b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/env.o
deleted file mode 100644
index 2189927c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/env.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/errorcodes.c b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/errorcodes.c
deleted file mode 100644
index ec81ca9d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/errorcodes.c
+++ /dev/null
@@ -1,414 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_misc.h"
-#include "apr_strings.h"
-#include "apr_lib.h"
-#include "apr_dso.h"
-
-#if APR_HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-/*
- * stuffbuffer - like apr_cpystrn() but returns the address of the
- * dest buffer instead of the address of the terminating '\0'
- */
-static char *stuffbuffer(char *buf, apr_size_t bufsize, const char *s)
-{
-    apr_cpystrn(buf,s,bufsize);
-    return buf;
-}
-
-static char *apr_error_string(apr_status_t statcode)
-{
-    switch (statcode) {
-    case APR_ENOPOOL:
-        return "A new pool could not be created.";
-    case APR_EBADDATE:
-        return "An invalid date has been provided";
-    case APR_EINVALSOCK:
-        return "An invalid socket was returned";
-    case APR_ENOPROC:
-        return "No process was provided and one was required.";
-    case APR_ENOTIME:
-        return "No time was provided and one was required.";
-    case APR_ENODIR:
-        return "No directory was provided and one was required.";
-    case APR_ENOLOCK:
-        return "No lock was provided and one was required.";
-    case APR_ENOPOLL:
-        return "No poll structure was provided and one was required.";
-    case APR_ENOSOCKET:
-        return "No socket was provided and one was required.";
-    case APR_ENOTHREAD:
-        return "No thread was provided and one was required.";
-    case APR_ENOTHDKEY:
-        return "No thread key structure was provided and one was required.";
-    case APR_ENOSHMAVAIL:
-        return "No shared memory is currently available";
-    case APR_EDSOOPEN:
-#if APR_HAS_DSO && defined(HAVE_LIBDL)
-        return dlerror();
-#else
-        return "DSO load failed";
-#endif /* HAVE_LIBDL */
-    case APR_EBADIP:
-        return "The specified IP address is invalid.";
-    case APR_EBADMASK:
-        return "The specified network mask is invalid.";
-
-    case APR_INCHILD:
-        return
-	    "Your code just forked, and you are currently executing in the "
-	    "child process";
-    case APR_INPARENT:
-        return
-	    "Your code just forked, and you are currently executing in the "
-	    "parent process";
-    case APR_DETACH:
-        return "The specified thread is detached";
-    case APR_NOTDETACH:
-        return "The specified thread is not detached";
-    case APR_CHILD_DONE:
-        return "The specified child process is done executing";
-    case APR_CHILD_NOTDONE:
-        return "The specified child process is not done executing";
-    case APR_TIMEUP:
-        return "The timeout specified has expired";
-    case APR_INCOMPLETE:
-        return "Partial results are valid but processing is incomplete";
-    case APR_BADCH:
-        return "Bad character specified on command line";
-    case APR_BADARG:
-        return "Missing parameter for the specified command line option";
-    case APR_EOF:
-        return "End of file found";
-    case APR_NOTFOUND:
-        return "Could not find specified socket in poll list.";
-    case APR_ANONYMOUS:
-        return "Shared memory is implemented anonymously";
-    case APR_FILEBASED:
-        return "Shared memory is implemented using files";
-    case APR_KEYBASED:
-        return "Shared memory is implemented using a key system";
-    case APR_EINIT:
-        return
-	    "There is no error, this value signifies an initialized "
-	    "error code";
-    case APR_ENOTIMPL:
-        return "This function has not been implemented on this platform";
-    case APR_EMISMATCH:
-        return "passwords do not match";
-    case APR_EABSOLUTE:
-        return "The given path is absolute";
-    case APR_ERELATIVE:
-        return "The given path is relative";
-    case APR_EINCOMPLETE:
-        return "The given path is incomplete";
-    case APR_EABOVEROOT:
-        return "The given path was above the root path";
-    case APR_EBADPATH:
-        return "The given path misformatted or contained invalid characters";
-    case APR_EPATHWILD:
-        return "The given path contained wildcard characters";
-    case APR_EPROC_UNKNOWN:
-        return "The process is not recognized.";
-    default:
-        return "Error string not specified yet";
-    }
-}
-
-
-#ifdef OS2
-#include <ctype.h>
-
-int apr_canonical_error(apr_status_t err);
-
-static char *apr_os_strerror(char* buf, apr_size_t bufsize, int err)
-{
-  char result[200];
-  unsigned char message[HUGE_STRING_LEN];
-  ULONG len;
-  char *pos;
-  int c;
-  
-  if (err >= 10000 && err < 12000) {  /* socket error codes */
-      return stuffbuffer(buf, bufsize,
-                         strerror(apr_canonical_error(err+APR_OS_START_SYSERR)));
-  } 
-  else if (DosGetMessage(NULL, 0, message, HUGE_STRING_LEN, err,
-			 "OSO001.MSG", &len) == 0) {
-      len--;
-      message[len] = 0;
-      pos = result;
-  
-      if (len >= sizeof(result))
-        len = sizeof(result-1);
-
-      for (c=0; c<len; c++) {
-	  /* skip multiple whitespace */
-          while (apr_isspace(message[c]) && apr_isspace(message[c+1]))
-              c++;
-          *(pos++) = apr_isspace(message[c]) ? ' ' : message[c];
-      }
-  
-      *pos = 0;
-  } 
-  else {
-      sprintf(result, "OS/2 error %d", err);
-  }
-
-  /* Stuff the string into the caller supplied buffer, then return 
-   * a pointer to it.
-   */
-  return stuffbuffer(buf, bufsize, result);  
-}
-
-#elif defined(WIN32) || defined(NETWARE)
-
-static const struct {
-    apr_status_t code;
-    const char *msg;
-} gaErrorList[] = {
-    WSAEINTR,           "Interrupted system call",
-    WSAEBADF,           "Bad file number",
-    WSAEACCES,          "Permission denied",
-    WSAEFAULT,          "Bad address",
-    WSAEINVAL,          "Invalid argument",
-    WSAEMFILE,          "Too many open sockets",
-    WSAEWOULDBLOCK,     "Operation would block",
-    WSAEINPROGRESS,     "Operation now in progress",
-    WSAEALREADY,        "Operation already in progress",
-    WSAENOTSOCK,        "Socket operation on non-socket",
-    WSAEDESTADDRREQ,    "Destination address required",
-    WSAEMSGSIZE,        "Message too long",
-    WSAEPROTOTYPE,      "Protocol wrong type for socket",
-    WSAENOPROTOOPT,     "Bad protocol option",
-    WSAEPROTONOSUPPORT, "Protocol not supported",
-    WSAESOCKTNOSUPPORT, "Socket type not supported",
-    WSAEOPNOTSUPP,      "Operation not supported on socket",
-    WSAEPFNOSUPPORT,    "Protocol family not supported",
-    WSAEAFNOSUPPORT,    "Address family not supported",
-    WSAEADDRINUSE,      "Address already in use",
-    WSAEADDRNOTAVAIL,   "Can't assign requested address",
-    WSAENETDOWN,        "Network is down",
-    WSAENETUNREACH,     "Network is unreachable",
-    WSAENETRESET,       "Net connection reset",
-    WSAECONNABORTED,    "Software caused connection abort",
-    WSAECONNRESET,      "Connection reset by peer",
-    WSAENOBUFS,         "No buffer space available",
-    WSAEISCONN,         "Socket is already connected",
-    WSAENOTCONN,        "Socket is not connected",
-    WSAESHUTDOWN,       "Can't send after socket shutdown",
-    WSAETOOMANYREFS,    "Too many references, can't splice",
-    WSAETIMEDOUT,       "Connection timed out",
-    WSAECONNREFUSED,    "Connection refused",
-    WSAELOOP,           "Too many levels of symbolic links",
-    WSAENAMETOOLONG,    "File name too long",
-    WSAEHOSTDOWN,       "Host is down",
-    WSAEHOSTUNREACH,    "No route to host",
-    WSAENOTEMPTY,       "Directory not empty",
-    WSAEPROCLIM,        "Too many processes",
-    WSAEUSERS,          "Too many users",
-    WSAEDQUOT,          "Disc quota exceeded",
-    WSAESTALE,          "Stale NFS file handle",
-    WSAEREMOTE,         "Too many levels of remote in path",
-    WSASYSNOTREADY,     "Network system is unavailable",
-    WSAVERNOTSUPPORTED, "Winsock version out of range",
-    WSANOTINITIALISED,  "WSAStartup not yet called",
-    WSAEDISCON,         "Graceful shutdown in progress",
-    WSAHOST_NOT_FOUND,  "Host not found",
-    WSANO_DATA,         "No host data of that type was found",
-    0,                  NULL
-};
-
-
-static char *apr_os_strerror(char *buf, apr_size_t bufsize, apr_status_t errcode)
-{
-    apr_size_t len=0, i;
-
-#ifndef NETWARE
-    len = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM 
-                      | FORMAT_MESSAGE_IGNORE_INSERTS,
-                        NULL,
-                        errcode,
-                        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */
-                        (LPTSTR) buf,
-                        (DWORD)bufsize,
-                        NULL);
-#endif
-
-    if (!len) {
-        for (i = 0; gaErrorList[i].msg; ++i) {
-            if (gaErrorList[i].code == errcode) {
-                apr_cpystrn(buf, gaErrorList[i].msg, bufsize);
-                len = strlen(buf);
-                break;
-            }
-        }
-    }
-
-    if (len) {
-        /* FormatMessage put the message in the buffer, but it may
-         * have embedded a newline (\r\n), and possible more than one.
-         * Remove the newlines replacing them with a space. This is not
-         * as visually perfect as moving all the remaining message over,
-         * but more efficient.
-         */
-        i = len;
-        while (i) {
-            i--;
-            if ((buf[i] == '\r') || (buf[i] == '\n'))
-                buf[i] = ' ';
-        }
-    }
-    else {
-        /* Windows didn't provide us with a message.  Even stuff like                    * WSAECONNREFUSED won't get a message.
-         */
-        apr_snprintf(buf, bufsize, "Unrecognized Win32 error code %d", errcode);
-    }
-
-    return buf;
-}
-
-#else
-/* On Unix, apr_os_strerror() handles error codes from the resolver 
- * (h_errno). 
- */
-static char *apr_os_strerror(char* buf, apr_size_t bufsize, int err) 
-{
-#ifdef HAVE_HSTRERROR
-    return stuffbuffer(buf, bufsize, hstrerror(err));
-#else /* HAVE_HSTRERROR */
-    const char *msg;
-
-    switch(err) {
-    case HOST_NOT_FOUND:
-        msg = "Unknown host";
-        break;
-#if defined(NO_DATA)
-    case NO_DATA:
-#if defined(NO_ADDRESS) && (NO_DATA != NO_ADDRESS)
-    case NO_ADDRESS:
-#endif
-        msg = "No address for host";
-        break;
-#elif defined(NO_ADDRESS)
-    case NO_ADDRESS:
-        msg = "No address for host";
-        break;
-#endif /* NO_DATA */
-    default:
-        msg = "Unrecognized resolver error";
-    }
-    return stuffbuffer(buf, bufsize, msg);
-#endif /* HAVE_STRERROR */
-}
-#endif
-
-#if defined(HAVE_STRERROR_R) && defined(STRERROR_R_RC_INT) && !defined(BEOS)
-/* AIX and Tru64 style */
-static char *native_strerror(apr_status_t statcode, char *buf,
-                             apr_size_t bufsize)
-{
-    if (strerror_r(statcode, buf, bufsize) < 0) {
-        return stuffbuffer(buf, bufsize, 
-                           "APR does not understand this error code");
-    }
-    else {
-        return buf;
-    }
-}
-#elif defined(HAVE_STRERROR_R)
-/* glibc style */
-
-/* BeOS has the function available, but it doesn't provide
- * the prototype publically (doh!), so to avoid a build warning
- * we add a suitable prototype here.
- */
-#if defined(BEOS)
-const char *strerror_r(apr_status_t, char *, apr_size_t);
-#endif
-
-static char *native_strerror(apr_status_t statcode, char *buf,
-                             apr_size_t bufsize)
-{
-    const char *msg;
-
-    buf[0] = '\0';
-    msg = strerror_r(statcode, buf, bufsize);
-    if (buf[0] == '\0') { /* libc didn't use our buffer */
-        return stuffbuffer(buf, bufsize, msg);
-    }
-    else {
-        return buf;
-    }
-}
-#else
-/* plain old strerror(); 
- * thread-safe on some platforms (e.g., Solaris, OS/390)
- */
-static char *native_strerror(apr_status_t statcode, char *buf,
-                             apr_size_t bufsize)
-{
-#ifdef _WIN32_WCE
-    static char err[32];
-    sprintf(err, "Native Error #%d", statcode);
-    return stuffbuffer(buf, bufsize, err);
-#else
-    const char *err = strerror(statcode);
-    if (err) {
-        return stuffbuffer(buf, bufsize, err);
-    } else {
-        return stuffbuffer(buf, bufsize, 
-                           "APR does not understand this error code");
-    }
-#endif
-}
-#endif
-
-APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
-                                 apr_size_t bufsize)
-{
-    if (statcode < APR_OS_START_ERROR) {
-        return native_strerror(statcode, buf, bufsize);
-    }
-    else if (statcode < APR_OS_START_USERERR) {
-        return stuffbuffer(buf, bufsize, apr_error_string(statcode));
-    }
-    else if (statcode < APR_OS_START_EAIERR) {
-        return stuffbuffer(buf, bufsize, "APR does not understand this error code");
-    }
-    else if (statcode < APR_OS_START_SYSERR) {
-#if defined(HAVE_GAI_STRERROR)
-        statcode -= APR_OS_START_EAIERR;
-#if defined(NEGATIVE_EAI)
-        statcode = -statcode;
-#endif
-        return stuffbuffer(buf, bufsize, gai_strerror(statcode));
-#else
-        return stuffbuffer(buf, bufsize, "APR does not understand this error code");
-#endif
-    }
-    else {
-        return apr_os_strerror(buf, bufsize, statcode - APR_OS_START_SYSERR);
-    }
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/errorcodes.lo b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/errorcodes.lo
deleted file mode 100644
index 0d618afd..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/errorcodes.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# errorcodes.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/errorcodes.o'
-
-# Name of the non-PIC object.
-non_pic_object='errorcodes.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/errorcodes.o b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/errorcodes.o
deleted file mode 100644
index 9540c425..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/errorcodes.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/getopt.c b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/getopt.c
deleted file mode 100644
index 24be3c82..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/getopt.c
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * Copyright (c) 1987, 1993, 1994
- *      The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "apr_arch_misc.h"
-#include "apr_strings.h"
-#include "apr_lib.h"
-
-#define EMSG    ""
-
-APR_DECLARE(apr_status_t) apr_getopt_init(apr_getopt_t **os, apr_pool_t *cont,
-                                      int argc, const char *const *argv)
-{
-    void *argv_buff;
-
-    *os = apr_palloc(cont, sizeof(apr_getopt_t));
-    (*os)->cont = cont;
-    (*os)->reset = 0;
-    (*os)->errfn = (apr_getopt_err_fn_t*)(fprintf);
-    (*os)->errarg = (void*)(stderr);
-
-    (*os)->place = EMSG;
-    (*os)->argc = argc;
-
-    /* The argv parameter must be compatible with main()'s argv, since
-       that's the primary purpose of this function.  But people might
-       want to use this function with arrays other than the main argv,
-       and we shouldn't touch the caller's data.  So we copy. */
-    argv_buff = apr_palloc(cont, (argc + 1) * sizeof(const char *));
-    memcpy(argv_buff, argv, argc * sizeof(const char *));
-    (*os)->argv = argv_buff;
-    (*os)->argv[argc] = NULL;
-
-    (*os)->interleave = 0;
-    (*os)->ind = 1;
-    (*os)->skip_start = 1;
-    (*os)->skip_end = 1;
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_getopt(apr_getopt_t *os, const char *opts, 
-                                     char *optch, const char **optarg)
-{
-    const char *oli;  /* option letter list index */
-
-    if (os->reset || !*os->place) {   /* update scanning pointer */
-        os->reset = 0;
-        if (os->ind >= os->argc || *(os->place = os->argv[os->ind]) != '-') {
-            os->place = EMSG;
-            *optch = os->opt;
-            return (APR_EOF);
-        }
-        if (os->place[1] && *++os->place == '-') {        /* found "--" */
-            ++os->ind;
-            os->place = EMSG;
-            *optch = os->opt;
-            return (APR_EOF);
-        }
-    }                                /* option letter okay? */
-    if ((os->opt = (int) *os->place++) == (int) ':' ||
-        !(oli = strchr(opts, os->opt))) {
-        /*
-         * if the user didn't specify '-' as an option,
-         * assume it means -1.
-         */
-        if (os->opt == (int) '-') {
-            *optch = os->opt;
-            return (APR_EOF);
-        }
-        if (!*os->place)
-            ++os->ind;
-        if (os->errfn && *opts != ':') {
-            (os->errfn)(os->errarg, "%s: illegal option -- %c\n",
-                        apr_filepath_name_get(*os->argv), os->opt);
-        }
-        *optch = os->opt;
-        return (APR_BADCH);
-    }
-    if (*++oli != ':') {        /* don't need argument */
-        *optarg = NULL;
-        if (!*os->place)
-            ++os->ind;
-    }
-    else {                        /* need an argument */
-        if (*os->place)                /* no white space */
-            *optarg = os->place;
-        else if (os->argc <= ++os->ind) {        /* no arg */
-            os->place = EMSG;
-            if (*opts == ':') {
-                *optch = os->opt;
-                return (APR_BADARG);
-            }
-            if (os->errfn) {
-                (os->errfn)(os->errarg, 
-                            "%s: option requires an argument -- %c\n",
-                            apr_filepath_name_get(*os->argv), os->opt);
-            }
-            *optch = os->opt;
-            return (APR_BADCH);
-        }
-        else                        /* white space */
-            *optarg = os->argv[os->ind];
-        os->place = EMSG;
-        ++os->ind;
-    }
-    *optch = os->opt;
-    return APR_SUCCESS;
-}
-
-/* Reverse the sequence argv[start..start+len-1]. */
-static void reverse(const char **argv, int start, int len)
-{
-    const char *temp;
-
-    for (; len >= 2; start++, len -= 2) {
-        temp = argv[start];
-        argv[start] = argv[start + len - 1];
-        argv[start + len - 1] = temp;
-    }
-}
-
-/*
- * Permute os->argv with the goal that non-option arguments will all
- * appear at the end.  os->skip_start is where we started skipping
- * non-option arguments, os->skip_end is where we stopped, and os->ind
- * is where we are now.
- */
-static void permute(apr_getopt_t *os)
-{
-    int len1 = os->skip_end - os->skip_start;
-    int len2 = os->ind - os->skip_end;
-
-    if (os->interleave) {
-        /*
-         * Exchange the sequences argv[os->skip_start..os->skip_end-1] and
-         * argv[os->skip_end..os->ind-1].  The easiest way to do that is
-         * to reverse the entire range and then reverse the two
-         * sub-ranges.
-         */
-        reverse(os->argv, os->skip_start, len1 + len2);
-        reverse(os->argv, os->skip_start, len2);
-        reverse(os->argv, os->skip_start + len2, len1);
-    }
-
-    /* Reset skip range to the new location of the non-option sequence. */
-    os->skip_start += len2;
-    os->skip_end += len2;
-}
-
-/* Helper function to print out an error involving a long option */
-static apr_status_t serr(apr_getopt_t *os, const char *err, const char *str,
-                         apr_status_t status)
-{
-    if (os->errfn)
-        (os->errfn)(os->errarg, "%s: %s: %s\n", 
-                    apr_filepath_name_get(*os->argv), err, str);
-    return status;
-}
-
-/* Helper function to print out an error involving a short option */
-static apr_status_t cerr(apr_getopt_t *os, const char *err, int ch,
-                         apr_status_t status)
-{
-    if (os->errfn)
-        (os->errfn)(os->errarg, "%s: %s: %c\n", 
-                    apr_filepath_name_get(*os->argv), err, ch);
-    return status;
-}
-
-APR_DECLARE(apr_status_t) apr_getopt_long(apr_getopt_t *os,
-                                          const apr_getopt_option_t *opts,
-                                          int *optch, const char **optarg)
-{
-    const char *p;
-    int i;
-
-    /* Let the calling program reset option processing. */
-    if (os->reset) {
-        os->place = EMSG;
-        os->ind = 1;
-        os->reset = 0;
-    }
-
-    /*
-     * We can be in one of two states: in the middle of processing a
-     * run of short options, or about to process a new argument.
-     * Since the second case can lead to the first one, handle that
-     * one first.  */
-    p = os->place;
-    if (*p == '\0') {
-        /* If we are interleaving, skip non-option arguments. */
-        if (os->interleave) {
-            while (os->ind < os->argc && *os->argv[os->ind] != '-')
-                os->ind++;
-            os->skip_end = os->ind;
-        }
-        if (os->ind >= os->argc || *os->argv[os->ind] != '-') {
-            os->ind = os->skip_start;
-            return APR_EOF;
-        }
-
-        p = os->argv[os->ind++] + 1;
-        if (*p == '-' && p[1] != '\0') {        /* Long option */
-            /* Search for the long option name in the caller's table. */
-            apr_size_t len = 0;
-
-            p++;
-            for (i = 0; ; i++) {
-                if (opts[i].optch == 0)             /* No match */
-                    return serr(os, "invalid option", p - 2, APR_BADCH);
-
-                if (opts[i].name) {
-                    len = strlen(opts[i].name);
-                    if (strncmp(p, opts[i].name, len) == 0
-                        && (p[len] == '\0' || p[len] == '='))
-                        break;
-                }
-            }
-            *optch = opts[i].optch;
-
-            if (opts[i].has_arg) {
-                if (p[len] == '=')             /* Argument inline */
-                    *optarg = p + len + 1;
-                else { 
-                    if (os->ind >= os->argc)   /* Argument missing */
-                        return serr(os, "missing argument", p - 2, APR_BADARG);
-                    else                       /* Argument in next arg */
-                        *optarg = os->argv[os->ind++];
-                }
-            } else {
-                *optarg = NULL;
-                if (p[len] == '=')
-                    return serr(os, "erroneous argument", p - 2, APR_BADARG);
-            }
-            permute(os);
-            return APR_SUCCESS;
-        } else {
-            if (*p == '-') {                 /* Bare "--"; we're done */
-                permute(os);
-                os->ind = os->skip_start;
-                return APR_EOF;
-            }
-            else 
-                if (*p == '\0')                    /* Bare "-" is illegal */
-                    return serr(os, "invalid option", p, APR_BADCH);
-        }
-    }
-
-    /*
-     * Now we're in a run of short options, and *p is the next one.
-     * Look for it in the caller's table.
-     */
-    for (i = 0; ; i++) {
-        if (opts[i].optch == 0)                     /* No match */
-            return cerr(os, "invalid option character", *p, APR_BADCH);
-
-        if (*p == opts[i].optch)
-            break;
-    }
-    *optch = *p++;
-
-    if (opts[i].has_arg) {
-        if (*p != '\0')                         /* Argument inline */
-            *optarg = p;
-        else { 
-            if (os->ind >= os->argc)           /* Argument missing */
-                return cerr(os, "missing argument", *optch, APR_BADARG);
-            else                               /* Argument in next arg */
-                *optarg = os->argv[os->ind++];
-        }
-        os->place = EMSG;
-    } else {
-        *optarg = NULL;
-        os->place = p;
-    }
-
-    permute(os);
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/getopt.lo b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/getopt.lo
deleted file mode 100644
index fffb2aa4..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/getopt.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# getopt.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/getopt.o'
-
-# Name of the non-PIC object.
-non_pic_object='getopt.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/getopt.o b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/getopt.o
deleted file mode 100644
index be33d356..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/getopt.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/otherchild.c b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/otherchild.c
deleted file mode 100644
index 0ea57739..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/otherchild.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_arch_misc.h"
-#include "apr_arch_threadproc.h"
-#include "apr_arch_file_io.h"
-
-#if APR_HAS_OTHER_CHILD
-
-#ifdef HAVE_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-#if APR_HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-#ifdef BEOS
-#include <sys/socket.h> /* for fd_set definition! */
-#endif
-
-static apr_other_child_rec_t *other_children = NULL;
-
-static apr_status_t other_child_cleanup(void *data)
-{
-    apr_other_child_rec_t **pocr, *nocr;
-
-    for (pocr = &other_children; *pocr; pocr = &(*pocr)->next) {
-        if ((*pocr)->data == data) {
-            nocr = (*pocr)->next;
-            (*(*pocr)->maintenance) (APR_OC_REASON_UNREGISTER, (*pocr)->data, -1);
-            *pocr = nocr;
-            /* XXX: um, well we've just wasted some space in pconf ? */
-            return APR_SUCCESS;
-        }
-    }
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(void) apr_proc_other_child_register(apr_proc_t *proc,
-                     void (*maintenance) (int reason, void *, int status),
-                     void *data, apr_file_t *write_fd, apr_pool_t *p)
-{
-    apr_other_child_rec_t *ocr;
-
-    ocr = apr_palloc(p, sizeof(*ocr));
-    ocr->p = p;
-    ocr->proc = proc;
-    ocr->maintenance = maintenance;
-    ocr->data = data;
-    if (write_fd == NULL) {
-        ocr->write_fd = (apr_os_file_t) -1;
-    }
-    else {
-#ifdef WIN32
-        /* This should either go away as part of eliminating apr_proc_probe_writable_fds
-         * or write_fd should point to an apr_file_t
-         */
-        ocr->write_fd = write_fd->filehand; 
-#else
-        ocr->write_fd = write_fd->filedes;
-#endif
-
-    }
-    ocr->next = other_children;
-    other_children = ocr;
-    apr_pool_cleanup_register(p, ocr->data, other_child_cleanup, 
-                              apr_pool_cleanup_null);
-}
-
-APR_DECLARE(void) apr_proc_other_child_unregister(void *data)
-{
-    apr_other_child_rec_t *cur;
-
-    cur = other_children;
-    while (cur) {
-        if (cur->data == data) {
-            break;
-        }
-        cur = cur->next;
-    }
-
-    /* segfault if this function called with invalid parm */
-    apr_pool_cleanup_kill(cur->p, cur->data, other_child_cleanup);
-    other_child_cleanup(data);
-}
-
-APR_DECLARE(apr_status_t) apr_proc_other_child_alert(apr_proc_t *proc,
-                                                     int reason,
-                                                     int status)
-{
-    apr_other_child_rec_t *ocr, *nocr;
-
-    for (ocr = other_children; ocr; ocr = nocr) {
-        nocr = ocr->next;
-        if (ocr->proc->pid != proc->pid)
-            continue;
-
-        ocr->proc = NULL;
-        (*ocr->maintenance) (reason, ocr->data, status);
-        return APR_SUCCESS;
-    }
-    return APR_EPROC_UNKNOWN;
-}
-
-APR_DECLARE(void) apr_proc_other_child_refresh(apr_other_child_rec_t *ocr,
-                                               int reason)
-{
-    /* Todo: 
-     * Implement code to detect if pipes are still alive.
-     */
-#ifdef WIN32
-    DWORD status;
-
-    if (ocr->proc == NULL)
-        return;
-
-    if (!ocr->proc->hproc) {
-        /* Already mopped up, perhaps we apr_proc_kill'ed it,
-         * they should have already unregistered!
-         */
-        ocr->proc = NULL;
-        (*ocr->maintenance) (APR_OC_REASON_LOST, ocr->data, -1);
-    }
-    else if (!GetExitCodeProcess(ocr->proc->hproc, &status)) {
-        CloseHandle(ocr->proc->hproc);
-        ocr->proc->hproc = NULL;
-        ocr->proc = NULL;
-        (*ocr->maintenance) (APR_OC_REASON_LOST, ocr->data, -1);
-    }
-    else if (status == STILL_ACTIVE) {
-        (*ocr->maintenance) (reason, ocr->data, -1);
-    }
-    else {
-        CloseHandle(ocr->proc->hproc);
-        ocr->proc->hproc = NULL;
-        ocr->proc = NULL;
-        (*ocr->maintenance) (APR_OC_REASON_DEATH, ocr->data, status);
-    }
-
-#else /* ndef Win32 */
-    pid_t waitret; 
-    int status;
-
-    if (ocr->proc == NULL)
-        return;
-
-    waitret = waitpid(ocr->proc->pid, &status, WNOHANG);
-    if (waitret == ocr->proc->pid) {
-        ocr->proc = NULL;
-        (*ocr->maintenance) (APR_OC_REASON_DEATH, ocr->data, status);
-    }
-    else if (waitret == 0) {
-        (*ocr->maintenance) (reason, ocr->data, -1);
-    }
-    else if (waitret == -1) {
-        /* uh what the heck? they didn't call unregister? */
-        ocr->proc = NULL;
-        (*ocr->maintenance) (APR_OC_REASON_LOST, ocr->data, -1);
-    }
-#endif
-}
-
-APR_DECLARE(void) apr_proc_other_child_refresh_all(int reason)
-{
-    apr_other_child_rec_t *ocr, *next_ocr;
-
-    for (ocr = other_children; ocr; ocr = next_ocr) {
-        next_ocr = ocr->next;
-        apr_proc_other_child_refresh(ocr, reason);
-    }
-}
-
-#else /* !APR_HAS_OTHER_CHILD */
-
-APR_DECLARE(void) apr_proc_other_child_register(apr_proc_t *proc,
-                     void (*maintenance) (int reason, void *, int status),
-                     void *data, apr_file_t *write_fd, apr_pool_t *p)
-{
-    return;
-}
-
-APR_DECLARE(void) apr_proc_other_child_unregister(void *data)
-{
-    return;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_other_child_alert(apr_proc_t *proc,
-                                                     int reason,
-                                                     int status)
-{
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(void) apr_proc_other_child_refresh(apr_other_child_rec_t *ocr,
-                                               int reason)
-{
-    return;
-}
-
-APR_DECLARE(void) apr_proc_other_child_refresh_all(int reason)
-{
-    return;
-}
-
-#endif /* APR_HAS_OTHER_CHILD */
-
-
-/* XXX: deprecated for removal in 1.0
- * The checks behaved differently between win32 and unix, while
- * the old win32 code did a health check, the unix code called
- * other_child_check only at restart.
- */
-APR_DECLARE(void) apr_proc_other_child_check(void)
-{
-#ifdef WIN32
-    apr_proc_other_child_refresh_all(APR_OC_REASON_RUNNING);
-#else
-    apr_proc_other_child_refresh_all(APR_OC_REASON_RESTART);
-#endif
-}
-
-/* XXX: deprecated for removal in 1.0
- * This really didn't test any sort of read - it simply notified
- * the maintenance function that the process had died.
- */
-APR_DECLARE(apr_status_t) apr_proc_other_child_read(apr_proc_t *proc, int status)
-{
-    return apr_proc_other_child_alert(proc, APR_OC_REASON_DEATH, status);
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/otherchild.lo b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/otherchild.lo
deleted file mode 100644
index 3db8e42d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/otherchild.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# otherchild.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/otherchild.o'
-
-# Name of the non-PIC object.
-non_pic_object='otherchild.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/otherchild.o b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/otherchild.o
deleted file mode 100644
index 35ea63f9..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/otherchild.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/rand.c b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/rand.c
deleted file mode 100644
index 843c13fc..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/rand.c
+++ /dev/null
@@ -1,209 +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.
- */
-
-#define APR_WANT_MEMFUNC
-#include "apr_want.h"
-#include "apr_general.h"
-
-#include "apr_arch_misc.h"
-#include <sys/stat.h>
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if APR_HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#if APR_HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#if APR_HAVE_SYS_UN_H
-#include <sys/un.h>
-#endif
-
-#ifndef SHUT_RDWR
-#define SHUT_RDWR 2
-#endif
-
-#if APR_HAS_RANDOM
-
-APR_DECLARE(apr_status_t) apr_generate_random_bytes(unsigned char *buf, 
-#ifdef APR_ENABLE_FOR_1_0
-                                                    apr_size_t length)
-#else
-                                                    int length)
-#endif
-{
-#ifdef DEV_RANDOM
-
-    int fd = -1;
-
-    /* On BSD/OS 4.1, /dev/random gives out 8 bytes at a time, then
-     * gives EOF, so reading 'length' bytes may require opening the
-     * device several times. */
-    do {
-        apr_ssize_t rc;
-
-        if (fd == -1)
-            if ((fd = open(DEV_RANDOM, O_RDONLY)) == -1)
-                return errno;
-        
-        rc = read(fd, buf, length);
-        if (rc < 0) {
-            int errnum = errno;
-            close(fd);
-            return errnum;
-        }
-        else if (rc == 0) {
-            close(fd);
-            fd = -1; /* force open() again */
-        }
-        else {
-            buf += rc;
-            length -= rc;
-        }
-    } while (length > 0);
-    
-    close(fd);
-#elif defined(OS2)
-    static UCHAR randbyte();
-    unsigned int idx;
-
-    for (idx=0; idx<length; idx++)
-	buf[idx] = randbyte();
-
-#elif defined(HAVE_EGD)
-    /* use EGD-compatible socket daemon (such as EGD or PRNGd).
-     * message format:
-     * 0x00 (get entropy level)
-     *   0xMM (msb) 0xmm 0xll 0xLL (lsb)
-     * 0x01 (read entropy nonblocking) 0xNN (bytes requested)
-     *   0xMM (bytes granted) MM bytes
-     * 0x02 (read entropy blocking) 0xNN (bytes desired)
-     *   [block] NN bytes
-     * 0x03 (write entropy) 0xMM 0xLL (bits of entropy) 0xNN (bytes of data) 
-     *      NN bytes
-     * (no response - write only) 
-     * 0x04 (report PID)
-     *   0xMM (length of PID string, not null-terminated) MM chars
-     */
-    static const char *egd_sockets[] = { EGD_DEFAULT_SOCKET, NULL };
-    const char **egdsockname = NULL;
-
-    int egd_socket, egd_path_len, rv, bad_errno;
-    struct sockaddr_un addr;
-    apr_socklen_t egd_addr_len;
-    apr_size_t resp_expected;
-    unsigned char req[2], resp[255];
-    unsigned char *curbuf = buf;
-
-    for (egdsockname = egd_sockets; *egdsockname && length > 0; egdsockname++) {
-        egd_path_len = strlen(*egdsockname);
-        
-        if (egd_path_len > sizeof(addr.sun_path)) {
-            return APR_EINVAL;
-        }
-
-        memset(&addr, 0, sizeof(struct sockaddr_un));
-        addr.sun_family = AF_UNIX;
-        memcpy(addr.sun_path, *egdsockname, egd_path_len);
-        egd_addr_len = APR_OFFSETOF(struct sockaddr_un, sun_path) + 
-          egd_path_len; 
-
-        egd_socket = socket(PF_UNIX, SOCK_STREAM, 0);
-
-        if (egd_socket == -1) {
-            return errno;
-        }
-
-        rv = connect(egd_socket, (struct sockaddr*)&addr, egd_addr_len);
-
-        if (rv == -1) {
-            bad_errno = errno;
-            continue;
-        }
-
-        /* EGD can only return 255 bytes of data at a time.  Silly.  */ 
-        while (length > 0) {
-            apr_ssize_t srv;
-            req[0] = 2; /* We'll block for now. */
-            req[1] = length > 255 ? 255: length;
-
-            srv = write(egd_socket, req, 2);
-            if (srv == -1) {
-                bad_errno = errno;
-                shutdown(egd_socket, SHUT_RDWR);
-                close(egd_socket);
-                break;
-            }
-
-            if (srv != 2) {
-                shutdown(egd_socket, SHUT_RDWR);
-                close(egd_socket);
-                return APR_EGENERAL;
-            }
-            
-            resp_expected = req[1];
-            srv = read(egd_socket, resp, resp_expected);
-            if (srv == -1) {
-                bad_errno = errno;
-                shutdown(egd_socket, SHUT_RDWR);
-                close(egd_socket);
-                return bad_errno;
-            }
-            
-            memcpy(curbuf, resp, srv);
-            curbuf += srv;
-            length -= srv;
-        }
-        
-        shutdown(egd_socket, SHUT_RDWR);
-        close(egd_socket);
-    }
-
-    if (length > 0) {
-        /* We must have iterated through the list of sockets,
-         * and no go. Return the errno.
-         */
-        return bad_errno;
-    }
-
-#elif defined(HAVE_TRUERAND) /* use truerand */
-
-    extern int randbyte(void);	/* from the truerand library */
-    unsigned int idx;
-
-    /* this will increase the startup time of the server, unfortunately...
-     * (generating 20 bytes takes about 8 seconds)
-     */
-    for (idx=0; idx<length; idx++)
-	buf[idx] = (unsigned char) randbyte();
-
-#endif	/* DEV_RANDOM */
-
-    return APR_SUCCESS;
-}
-
-#undef	STR
-#undef	XSTR
-
-#ifdef OS2
-#include "../os2/randbyte.c"
-#endif
-
-#endif /* APR_HAS_RANDOM */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/rand.lo b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/rand.lo
deleted file mode 100644
index 7f15c083..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/rand.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# rand.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/rand.o'
-
-# Name of the non-PIC object.
-non_pic_object='rand.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/rand.o b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/rand.o
deleted file mode 100644
index d4a8f47d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/rand.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/start.c b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/start.c
deleted file mode 100644
index 4b8ad990..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/start.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_signal.h"
-#include "apr_atomic.h"
-
-#include "apr_arch_proc_mutex.h" /* for apr_proc_mutex_unix_setup_lock() */
-#include "apr_arch_internal_time.h"
-
-
-APR_DECLARE(apr_status_t) apr_app_initialize(int *argc, 
-                                             const char * const * *argv, 
-                                             const char * const * *env)
-{
-    /* An absolute noop.  At present, only Win32 requires this stub, but it's
-     * required in order to move command arguments passed through the service
-     * control manager into the process, and it's required to fix the char*
-     * data passed in from win32 unicode into utf-8, win32's apr internal fmt.
-     */
-    return apr_initialize();
-}
-
-static int initialized = 0;
-
-APR_DECLARE(apr_status_t) apr_initialize(void)
-{
-    apr_pool_t *pool;
-    apr_status_t status;
-
-    if (initialized++) {
-        return APR_SUCCESS;
-    }
-
-#if !defined(BEOS) && !defined(OS2)
-    apr_proc_mutex_unix_setup_lock();
-    apr_unix_setup_time();
-#endif
-
-    if ((status = apr_pool_initialize()) != APR_SUCCESS)
-        return status;
-    
-    if (apr_pool_create(&pool, NULL) != APR_SUCCESS) {
-        return APR_ENOPOOL;
-    }
-
-    apr_pool_tag(pool, "apr_initialize");
-
-    /* apr_atomic_init() used to be called from here aswell.
-     * Pools rely on mutexes though, which can be backed by
-     * atomics.  Due to this circular dependency
-     * apr_pool_initialize() is taking care of calling
-     * apr_atomic_init() at the correct time.
-     */
-
-    apr_signal_init(pool);
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE_NONSTD(void) apr_terminate(void)
-{
-    initialized--;
-    if (initialized) {
-        return;
-    }
-    apr_pool_terminate();
-    
-}
-
-APR_DECLARE(void) apr_terminate2(void)
-{
-    apr_terminate();
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/start.lo b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/start.lo
deleted file mode 100644
index 07d5275b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/start.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# start.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/start.o'
-
-# Name of the non-PIC object.
-non_pic_object='start.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/start.o b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/start.o
deleted file mode 100644
index 54e4ef9e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/start.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/version.c b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/version.c
deleted file mode 100644
index 2f111bf9..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/version.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_version.h"
-#include "apr_general.h" /* for APR_STRINGIFY */
-
-APR_DECLARE(void) apr_version(apr_version_t *pvsn)
-{
-    pvsn->major = APR_MAJOR_VERSION;
-    pvsn->minor = APR_MINOR_VERSION;
-    pvsn->patch = APR_PATCH_VERSION;
-#ifdef APR_IS_DEV_VERSION
-    pvsn->is_dev = 1;
-#else
-    pvsn->is_dev = 0;
-#endif
-}
-
-APR_DECLARE(const char *) apr_version_string(void)
-{
-    return APR_VERSION_STRING;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/version.lo b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/version.lo
deleted file mode 100644
index dc9f16e3..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/version.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# version.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/version.o'
-
-# Name of the non-PIC object.
-non_pic_object='version.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/version.o b/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/version.o
deleted file mode 100644
index bb339315..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/unix/version.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/apr_app.c b/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/apr_app.c
deleted file mode 100644
index baac96e8..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/apr_app.c
+++ /dev/null
@@ -1,80 +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.
- */
-
-/* Usage Notes:
- *
- *   this module, and the misc/win32/utf8.c modules must be 
- *   compiled APR_EXPORT_STATIC and linked to an application with
- *   the /entry:wmainCRTStartup flag.  This module becomes the true
- *   wmain entry point, and passes utf-8 reformatted argv and env
- *   arrays to the application's main function.
- *
- *   This module is only compatible with Unicode-only executables.
- *   Mixed (Win9x backwards compatible) binaries should refer instead
- *   to the apr_startup.c module.
- *
- *   _dbg_malloc/realloc is used in place of the usual API, in order
- *   to convince the MSVCRT that they created these entities.  If we
- *   do not create them as _CRT_BLOCK entities, the crt will fault
- *   on an assert.  We are not worrying about the crt's locks here, 
- *   since we are single threaded [so far].
- */
-
-#include "apr_general.h"
-#include "ShellAPI.h"
-#include "crtdbg.h"
-#include "wchar.h"
-#include "apr_arch_file_io.h"
-#include "assert.h"
-#include "apr_private.h"
-#include "apr_arch_misc.h"
-
-/* This symbol is _private_, although it must be exported.
- */
-
-extern int main(int argc, const char **argv, const char **env);
-
-int wmain(int argc, const wchar_t **wargv, const wchar_t **wenv)
-{
-    char **argv;
-    char **env;
-    int dupenv;
-
-    (void)apr_wastrtoastr(&argv, wargv, argc);
-
-    dupenv = apr_wastrtoastr(&env, wenv, -1);
-
-    _environ = _malloc_dbg((dupenv + 1) * sizeof (char *), 
-                           _CRT_BLOCK, __FILE__, __LINE__ );
-    memcpy(_environ, env, (dupenv + 1) * sizeof (char *));
-
-    /* MSVCRT will attempt to maintain the wide environment calls
-     * on _putenv(), which is bogus if we've passed a non-ascii
-     * string to _putenv(), since they use MultiByteToWideChar
-     * and breaking the implicit utf-8 assumption we've built.
-     *
-     * Reset _wenviron for good measure.
-     */
-    if (_wenviron) {
-        wenv = _wenviron;
-        _wenviron = NULL;
-        free((wchar_t **)wenv);
-    }
-
-    apr_app_init_complete = 1;
-
-    return main(argc, argv, env);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/charset.c b/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/charset.c
deleted file mode 100644
index 41135b25..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/charset.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-
-
-APR_DECLARE(const char*) apr_os_default_encoding (apr_pool_t *pool)
-{
-    return apr_psprintf(pool, "CP%u", (unsigned) GetACP());
-}
-
-
-APR_DECLARE(const char*) apr_os_locale_encoding (apr_pool_t *pool)
-{
-#ifdef _UNICODE
-    int i;
-#endif
-#if defined(_WIN32_WCE)
-    LCID locale = GetUserDefaultLCID();
-#else
-    LCID locale = GetThreadLocale();
-#endif
-    int len = GetLocaleInfo(locale, LOCALE_IDEFAULTANSICODEPAGE, NULL, 0);
-    char *cp = apr_palloc(pool, (len * sizeof(TCHAR)) + 2);
-    if (0 < GetLocaleInfo(locale, LOCALE_IDEFAULTANSICODEPAGE, (TCHAR*) (cp + 2), len))
-    {
-        /* Fix up the returned number to make a valid codepage name of
-          the form "CPnnnn". */
-        cp[0] = 'C';
-        cp[1] = 'P';
-#ifdef _UNICODE
-        for(i = 0; i < len; i++) {
-            cp[i + 2] = (char) ((TCHAR*) (cp + 2))[i];
-        }
-#endif
-        return cp;
-    }
-
-    return apr_os_default_encoding(pool);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/env.c b/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/env.c
deleted file mode 100644
index 644f59b8..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/env.c
+++ /dev/null
@@ -1,192 +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.
- */
-
-#define APR_WANT_STRFUNC
-#include "apr_want.h"
-#include "apr.h"
-#include "apr_arch_misc.h"
-#include "apr_arch_utf8.h"
-#include "apr_env.h"
-#include "apr_errno.h"
-#include "apr_pools.h"
-#include "apr_strings.h"
-
-#if APR_HAS_UNICODE_FS && !defined(_WIN32_WCE)
-static apr_status_t widen_envvar_name (apr_wchar_t *buffer,
-                                       apr_size_t bufflen,
-                                       const char *envvar)
-{
-    apr_size_t inchars;
-    apr_status_t status;
-
-    inchars = strlen(envvar) + 1;
-    status = apr_conv_utf8_to_ucs2(envvar, &inchars, buffer, &bufflen);
-    if (status == APR_INCOMPLETE)
-        status = APR_ENAMETOOLONG;
-
-    return status;
-}
-#endif
-
-
-APR_DECLARE(apr_status_t) apr_env_get(char **value,
-                                      const char *envvar,
-                                      apr_pool_t *pool)
-{
-#if defined(_WIN32_WCE)
-    return APR_ENOTIMPL;
-#else
-    char *val = NULL;
-    DWORD size;
-
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        apr_wchar_t wenvvar[APR_PATH_MAX];
-        apr_size_t inchars, outchars;
-        apr_wchar_t *wvalue, dummy;
-        apr_status_t status;
-
-        status = widen_envvar_name(wenvvar, APR_PATH_MAX, envvar);
-        if (status)
-            return status;
-
-        SetLastError(0);
-        size = GetEnvironmentVariableW(wenvvar, &dummy, 0);
-        if (GetLastError() == ERROR_ENVVAR_NOT_FOUND)
-            /* The environment variable doesn't exist. */
-            return APR_ENOENT;
-
-        if (size == 0) {
-            /* The environment value exists, but is zero-length. */
-            *value = apr_pstrdup(pool, "");
-            return APR_SUCCESS;
-        }
-
-        wvalue = apr_palloc(pool, size * sizeof(*wvalue));
-        size = GetEnvironmentVariableW(wenvvar, wvalue, size);
-
-        inchars = wcslen(wvalue) + 1;
-        outchars = 3 * inchars; /* Enough for any UTF-8 representation */
-        val = apr_palloc(pool, outchars);
-        status = apr_conv_ucs2_to_utf8(wvalue, &inchars, val, &outchars);
-        if (status)
-            return status;
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-    {
-        char dummy;
-
-        SetLastError(0);
-        size = GetEnvironmentVariableA(envvar, &dummy, 0);
-        if (GetLastError() == ERROR_ENVVAR_NOT_FOUND)
-            /* The environment variable doesn't exist. */
-            return APR_ENOENT;
-
-        if (size == 0) {
-            /* The environment value exists, but is zero-length. */
-            *value = apr_pstrdup(pool, "");
-            return APR_SUCCESS;
-        }
-
-        val = apr_palloc(pool, size);
-        size = GetEnvironmentVariableA(envvar, val, size);
-        if (size == 0)
-            /* Mid-air collision?. Somebody must've changed the env. var. */
-            return APR_INCOMPLETE;
-    }
-#endif
-
-    *value = val;
-    return APR_SUCCESS;
-#endif
-}
-
-
-APR_DECLARE(apr_status_t) apr_env_set(const char *envvar,
-                                      const char *value,
-                                      apr_pool_t *pool)
-{
-#if defined(_WIN32_WCE)
-    return APR_ENOTIMPL;
-#else
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        apr_wchar_t wenvvar[APR_PATH_MAX];
-        apr_wchar_t *wvalue;
-        apr_size_t inchars, outchars;
-        apr_status_t status;
-
-        status = widen_envvar_name(wenvvar, APR_PATH_MAX, envvar);
-        if (status)
-            return status;
-
-        outchars = inchars = strlen(value) + 1;
-        wvalue = apr_palloc(pool, outchars * sizeof(*wvalue));
-        status = apr_conv_utf8_to_ucs2(value, &inchars, wvalue, &outchars);
-        if (status)
-            return status;
-
-        if (!SetEnvironmentVariableW(wenvvar, wvalue))
-            return apr_get_os_error();
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-    {
-        if (!SetEnvironmentVariableA(envvar, value))
-            return apr_get_os_error();
-    }
-#endif
-
-    return APR_SUCCESS;
-#endif
-}
-
-
-APR_DECLARE(apr_status_t) apr_env_delete(const char *envvar, apr_pool_t *pool)
-{
-#if defined(_WIN32_WCE)
-    return APR_ENOTIMPL;
-#else
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        apr_wchar_t wenvvar[APR_PATH_MAX];
-        apr_status_t status;
-
-        status = widen_envvar_name(wenvvar, APR_PATH_MAX, envvar);
-        if (status)
-            return status;
-
-        if (!SetEnvironmentVariableW(wenvvar, NULL))
-            return apr_get_os_error();
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-    {
-        if (!SetEnvironmentVariableA(envvar, NULL))
-            return apr_get_os_error();
-    }
-#endif
-
-    return APR_SUCCESS;
-#endif
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/internal.c b/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/internal.c
deleted file mode 100644
index b045bd42..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/internal.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_private.h"
-
-#include "apr_arch_misc.h"
-#include "apr_arch_file_io.h"
-#include <crtdbg.h>
-#include <assert.h>
-
-/* This module is the source of -static- helper functions that are
- * entirely internal to apr.  If the fn is exported - it does not
- * belong here.
- *
- * Namespace decoration is still required to protect us from symbol
- * clashes in static linkages.
- */
-
-
-/* Shared by apr_app.c and start.c 
- *
- * An internal apr function to convert an array of strings (either
- * a counted or NULL terminated list, such as an argv[argc] or env[]
- * list respectively) from wide Unicode strings to narrow utf-8 strings.
- * These are allocated from the MSVCRT's _CRT_BLOCK to trick the system
- * into trusting our store.
- */
-int apr_wastrtoastr(char const * const * *retarr, 
-                    wchar_t const * const *arr, int args)
-{
-    apr_size_t elesize = 0;
-    char **newarr;
-    char *elements;
-    char *ele;
-    int arg;
-
-    if (args < 0) {
-        for (args = 0; arr[args]; ++args)
-            ;
-    }
-
-    newarr = _malloc_dbg((args + 1) * sizeof(char *),
-                         _CRT_BLOCK, __FILE__, __LINE__);
-
-    for (arg = 0; arg < args; ++arg) {
-        newarr[arg] = (void*)(wcslen(arr[arg]) + 1);
-        elesize += (apr_size_t)newarr[arg];
-    }
-
-    /* This is a safe max allocation, we will realloc after
-     * processing and return the excess to the free store.
-     * 3 ucs bytes hold any single wchar_t value (16 bits)
-     * 4 ucs bytes will hold a wchar_t pair value (20 bits)
-     */
-    elesize = elesize * 3 + 1;
-    ele = elements = _malloc_dbg(elesize * sizeof(char), 
-                                 _CRT_BLOCK, __FILE__, __LINE__);
-
-    for (arg = 0; arg < args; ++arg) {
-        apr_size_t len = (apr_size_t)newarr[arg];
-        apr_size_t newlen = elesize;
-
-        newarr[arg] = ele;
-        (void)apr_conv_ucs2_to_utf8(arr[arg], &len,
-                                    newarr[arg], &elesize);
-
-        newlen -= elesize;
-        ele += newlen;
-        assert(elesize && (len == 0));
-    }
-
-    newarr[arg] = NULL;
-    *(ele++) = '\0';
-
-    /* Return to the free store if the heap realloc is the least bit optimized
-     */
-    ele = _realloc_dbg(elements, ele - elements, 
-                       _CRT_BLOCK, __FILE__, __LINE__);
-
-    if (ele != elements) {
-        apr_size_t diff = ele - elements;
-        for (arg = 0; arg < args; ++arg) {
-            newarr[arg] += diff;
-        }
-    }
-
-    *retarr = newarr;
-    return args;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/misc.c b/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/misc.c
deleted file mode 100644
index f121cac9..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/misc.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_private.h"
-#include "apr_arch_misc.h"
-#include "crtdbg.h"
-#include "apr_arch_file_io.h"
-#include "assert.h"
-#include "apr_lib.h"
-
-APR_DECLARE_DATA apr_oslevel_e apr_os_level = APR_WIN_UNK;
-
-apr_status_t apr_get_oslevel(apr_oslevel_e *level)
-{
-    if (apr_os_level == APR_WIN_UNK) 
-    {
-        static OSVERSIONINFO oslev;
-        oslev.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-        GetVersionEx(&oslev);
-
-        if (oslev.dwPlatformId == VER_PLATFORM_WIN32_NT) 
-        {
-            static unsigned int servpack = 0;
-            char *pservpack;
-            if (pservpack = oslev.szCSDVersion) {
-                while (*pservpack && !apr_isdigit(*pservpack)) {
-                    pservpack++;
-                }
-                if (*pservpack)
-                    servpack = atoi(pservpack);
-            }
-
-            if (oslev.dwMajorVersion < 3) {
-                apr_os_level = APR_WIN_UNSUP;
-            }
-            else if (oslev.dwMajorVersion == 3) {
-                if (oslev.dwMajorVersion < 50) {
-                    apr_os_level = APR_WIN_UNSUP;
-                }
-                else if (oslev.dwMajorVersion == 50) {
-                    apr_os_level = APR_WIN_NT_3_5;
-                }
-                else {
-                    apr_os_level = APR_WIN_NT_3_51;
-                }
-            }
-            else if (oslev.dwMajorVersion == 4) {
-                if (servpack < 2)
-                    apr_os_level = APR_WIN_NT_4;
-                else if (servpack <= 2)
-                    apr_os_level = APR_WIN_NT_4_SP2;
-                else if (servpack <= 3)
-                    apr_os_level = APR_WIN_NT_4_SP3;
-                else if (servpack <= 4)
-                    apr_os_level = APR_WIN_NT_4_SP4;
-                else if (servpack <= 5)
-                    apr_os_level = APR_WIN_NT_4_SP5;
-                else 
-                    apr_os_level = APR_WIN_NT_4_SP6;
-            }
-            else if (oslev.dwMajorVersion == 5) {
-                if (oslev.dwMinorVersion == 0) {
-                    if (servpack == 0)
-                        apr_os_level = APR_WIN_2000;
-                    else if (servpack == 1)
-                        apr_os_level = APR_WIN_2000_SP1;
-                    else
-                        apr_os_level = APR_WIN_2000_SP2;
-                }
-                else {
-                    apr_os_level = APR_WIN_XP;
-                }
-            }
-            else {
-                apr_os_level = APR_WIN_XP;
-            }
-        }
-#ifndef WINNT
-        else if (oslev.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
-            char *prevision;
-            if (prevision = oslev.szCSDVersion) {
-                while (*prevision && !apr_isupper(*prevision)) {
-                     prevision++;
-                }
-            }
-            else prevision = "";
-
-            if (oslev.dwMinorVersion < 10) {
-                if (*prevision < 'C')
-                    apr_os_level = APR_WIN_95;
-                else
-                    apr_os_level = APR_WIN_95_OSR2;
-            }
-            else if (oslev.dwMinorVersion < 90) {
-                if (*prevision < 'A')
-                    apr_os_level = APR_WIN_98;
-                else
-                    apr_os_level = APR_WIN_98_SE;
-            }
-            else {
-                apr_os_level = APR_WIN_ME;
-            }
-        }
-#endif
-#ifdef _WIN32_WCE
-        else if (oslev.dwPlatformId == VER_PLATFORM_WIN32_CE) 
-        {
-            if (oslev.dwMajorVersion < 3) {
-                apr_os_level = APR_WIN_UNSUP;
-            }
-            else {
-                apr_os_level = APR_WIN_CE_3;
-            }
-        }
-#endif
-        else {
-            apr_os_level = APR_WIN_UNSUP;
-        }
-    }
-
-    *level = apr_os_level;
-
-    if (apr_os_level < APR_WIN_UNSUP) {
-        return APR_EGENERAL;
-    }
-
-    return APR_SUCCESS;
-}
-
-
-/* This is the helper code to resolve late bound entry points 
- * missing from one or more releases of the Win32 API
- */
-
-static const char* const lateDllName[DLL_defined] = {
-    "kernel32", "advapi32", "mswsock",  "ws2_32", "shell32", "ntdll.dll"  };
-static HMODULE lateDllHandle[DLL_defined] = {
-     NULL,       NULL,       NULL,       NULL,     NULL,       NULL       };
-
-FARPROC apr_load_dll_func(apr_dlltoken_e fnLib, char* fnName, int ordinal)
-{
-    if (!lateDllHandle[fnLib]) { 
-        lateDllHandle[fnLib] = LoadLibrary(lateDllName[fnLib]);
-        if (!lateDllHandle[fnLib])
-            return NULL;
-    }
-    if (ordinal)
-        return GetProcAddress(lateDllHandle[fnLib], (char *) ordinal);
-    else
-        return GetProcAddress(lateDllHandle[fnLib], fnName);
-}
-
-/* Declared in include/arch/win32/apr_dbg_win32_handles.h
- */
-APR_DECLARE_NONSTD(HANDLE) apr_dbg_log(char* fn, HANDLE ha, char* fl, int ln, 
-                                       int nh, /* HANDLE hv, char *dsc */...)
-{
-    static DWORD tlsid = 0xFFFFFFFF;
-    static HANDLE fh = NULL;
-    static long ctr = 0;
-    static CRITICAL_SECTION cs;
-    long seq;
-    DWORD wrote;
-    char *sbuf;
-    
-    seq = (InterlockedIncrement)(&ctr);
-
-    if (tlsid == 0xFFFFFFFF) {
-        tlsid = (TlsAlloc)();
-    }
-
-    sbuf = (TlsGetValue)(tlsid);
-    if (!fh || !sbuf) {
-        sbuf = (malloc)(1024);
-        (TlsSetValue)(tlsid, sbuf);
-        sbuf[1023] = '\0';
-        if (!fh) {
-            (GetModuleFileName)(NULL, sbuf, 250);
-            sprintf(strchr(sbuf, '\0'), ".%d",
-                    (GetCurrentProcessId)());
-            fh = (CreateFile)(sbuf, GENERIC_WRITE, 0, NULL, 
-                            CREATE_ALWAYS, 0, NULL);
-            (InitializeCriticalSection)(&cs);
-        }
-    }
-
-    if (!nh) {
-        (sprintf)(sbuf, "%08x %08x %08x %s() %s:%d\n",
-                  (DWORD)ha, seq, GetCurrentThreadId(), fn, fl, ln);
-        (EnterCriticalSection)(&cs);
-        (WriteFile)(fh, sbuf, strlen(sbuf), &wrote, NULL);
-        (LeaveCriticalSection)(&cs);
-    } 
-    else {
-        va_list a;
-        va_start(a,nh);
-        (EnterCriticalSection)(&cs);
-        do {
-            HANDLE *hv = va_arg(a, HANDLE*);
-            char *dsc = va_arg(a, char*);
-            if (strcmp(dsc, "Signaled") == 0) {
-                if ((DWORD)ha >= STATUS_WAIT_0 
-                       && (DWORD)ha < STATUS_ABANDONED_WAIT_0) {
-                    hv += (DWORD)ha;
-                }
-                else if ((DWORD)ha >= STATUS_ABANDONED_WAIT_0
-                            && (DWORD)ha < STATUS_USER_APC) {
-                    hv += (DWORD)ha - STATUS_ABANDONED_WAIT_0;
-                    dsc = "Abandoned";
-                }
-                else if ((DWORD)ha == WAIT_TIMEOUT) {
-                    dsc = "Timed Out";
-                }
-            }
-            (sprintf)(sbuf, "%08x %08x %08x %s(%s) %s:%d\n",
-                      (DWORD*)*hv, seq, GetCurrentThreadId(), 
-                      fn, dsc, fl, ln);
-            (WriteFile)(fh, sbuf, strlen(sbuf), &wrote, NULL);
-        } while (--nh);
-        (LeaveCriticalSection)(&cs);
-        va_end(a);
-    }
-    return ha;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/rand.c b/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/rand.c
deleted file mode 100644
index e72637bf..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/rand.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <windows.h>
-#include <wincrypt.h>
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_portable.h"
-#include "apr_arch_misc.h"
-
-
-APR_DECLARE(apr_status_t) apr_generate_random_bytes(unsigned char * buf,
-#ifdef APR_ENABLE_FOR_1_0
-                                                    apr_size_t length)
-#else
-                                                    int length)
-#endif
-{
-    HCRYPTPROV hProv;
-    apr_status_t res = APR_SUCCESS;
-
-    /* 0x40 bit = CRYPT_SILENT, only introduced in more recent PSDKs 
-     * and will only work for Win2K and later.
-     */
-    DWORD flags = CRYPT_VERIFYCONTEXT
-                | ((apr_os_level >= APR_WIN_2000) ? 0x40 : 0);
-
-    if (!CryptAcquireContext(&hProv, NULL, NULL, PROV_RSA_FULL, flags)) {
-	return apr_get_os_error();
-    }
-    if (!CryptGenRandom(hProv, length, buf)) {
-    	res = apr_get_os_error();
-    }
-    CryptReleaseContext(hProv, 0);
-    return res;
-}
-
-
-APR_DECLARE(apr_status_t) apr_os_uuid_get(unsigned char *uuid_data)
-{
-    /* Note: this call doesn't actually require CoInitialize() first 
-     *
-     * XXX: we should scramble the bytes or some such to eliminate the
-     * possible misuse/abuse since uuid is based on the NIC address, and
-     * is therefore not only a uniqifier, but an identity (which might not
-     * be appropriate in all cases.
-     *
-     * Note that Win2000, XP and later no longer suffer from this problem,
-     * a scrambling fix is only needed for (apr_os_level < APR_WIN_2000)
-     */
-    if (FAILED(UuidCreate((UUID *)uuid_data))) {
-        return APR_EGENERAL;
-    }
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/start.c b/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/start.c
deleted file mode 100644
index f25776be..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/start.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_signal.h"
-#include "shellapi.h"
-
-#include "apr_arch_misc.h"       /* for WSAHighByte / WSALowByte */
-#include "wchar.h"
-#include "apr_arch_file_io.h"    /* bring in unicode-ness */
-#include "apr_arch_threadproc.h" /* bring in apr_threadproc_init */
-#include "crtdbg.h"
-#include "assert.h"
-
-/* This symbol is _private_, although it must be exported.
- */
-int APR_DECLARE_DATA apr_app_init_complete = 0;
-
-#if !defined(_WIN32_WCE)
-/* Used by apr_app_initialize to reprocess the environment
- *
- * An internal apr function to convert a double-null terminated set
- * of single-null terminated strings from wide Unicode to narrow utf-8
- * as a list of strings.  These are allocated from the MSVCRT's 
- * _CRT_BLOCK to trick the system into trusting our store.
- */
-static int warrsztoastr(const char * const * *retarr, 
-                        const wchar_t * arrsz, int args)
-{
-    const apr_wchar_t *wch;
-    apr_size_t totlen;
-    apr_size_t newlen;
-    apr_size_t wsize;
-    char **newarr;
-    int arg;
-
-    if (args < 0) {
-        for (args = 1, wch = arrsz; wch[0] || wch[1]; ++wch)
-            if (!*wch) 
-                ++args;
-    }
-    wsize = 1 + wch - arrsz;
-
-    newarr = _malloc_dbg((args + 1) * sizeof(char *),
-                         _CRT_BLOCK, __FILE__, __LINE__);
-
-    /* This is a safe max allocation, we will realloc after
-     * processing and return the excess to the free store.
-     * 3 ucs bytes hold any single wchar_t value (16 bits)
-     * 4 ucs bytes will hold a wchar_t pair value (20 bits)
-     */
-    newlen = totlen = wsize * 3 + 1;
-    newarr[0] = _malloc_dbg(newlen * sizeof(char), 
-                            _CRT_BLOCK, __FILE__, __LINE__);
-
-    (void)apr_conv_ucs2_to_utf8(arrsz, &wsize,
-                                newarr[0], &newlen);
-
-    assert(newlen && !wsize);
-    /* Return to the free store if the heap realloc is the least bit optimized
-     */
-    newarr[0] = _realloc_dbg(newarr[0], totlen - newlen, 
-                             _CRT_BLOCK, __FILE__, __LINE__);
-
-    for (arg = 1; arg < args; ++arg) {
-        newarr[arg] = newarr[arg - 1] + 2;
-        while (*(newarr[arg]++)) {
-            /* continue */;
-        }
-    }
-
-    newarr[arg] = NULL;
-
-    *retarr = newarr;
-    return args;
-}
-#endif
-
-/* Reprocess the arguments to main() for a completely apr-ized application
- */
-
-APR_DECLARE(apr_status_t) apr_app_initialize(int *argc, 
-                                             const char * const * *argv, 
-                                             const char * const * *env)
-{
-    apr_status_t rv = apr_initialize();
-
-    if (rv != APR_SUCCESS) {
-        return rv;
-    }
-
-#if defined(_WIN32_WCE)
-    apr_app_init_complete = 1;
-#elif APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        apr_wchar_t **wstrs;
-        apr_wchar_t *sysstr;
-        int wstrc;
-        int dupenv;
-
-        if (apr_app_init_complete) {
-            return rv;
-        }
-
-        apr_app_init_complete = 1;
-
-        sysstr = GetCommandLineW();
-        if (sysstr) {
-            wstrs = CommandLineToArgvW(sysstr, &wstrc);
-            if (wstrs) {
-                *argc = apr_wastrtoastr(argv, wstrs, wstrc);
-                GlobalFree(wstrs);
-            }
-        }
-
-        sysstr = GetEnvironmentStringsW();
-        dupenv = warrsztoastr(&_environ, sysstr, -1);
-
-	if (env) {
-            *env = _malloc_dbg((dupenv + 1) * sizeof (char *), 
-                               _CRT_BLOCK, __FILE__, __LINE__ );
-            memcpy((void*)*env, _environ, (dupenv + 1) * sizeof (char *));
-        }
-        else {
-        }
-
-        FreeEnvironmentStringsW(sysstr);
-
-        /* MSVCRT will attempt to maintain the wide environment calls
-         * on _putenv(), which is bogus if we've passed a non-ascii
-         * string to _putenv(), since they use MultiByteToWideChar
-         * and breaking the implicit utf-8 assumption we've built.
-         *
-         * Reset _wenviron for good measure.
-         */
-        if (_wenviron) {
-            apr_wchar_t **wenv = _wenviron;
-            _wenviron = NULL;
-            free(wenv);
-        }
-
-    }
-#endif
-    return rv;
-}
-
-static int initialized = 0;
-
-/* Provide to win32/thread.c */
-extern DWORD tls_apr_thread;
-
-APR_DECLARE(apr_status_t) apr_initialize(void)
-{
-    apr_pool_t *pool;
-    apr_status_t status;
-    int iVersionRequested;
-    WSADATA wsaData;
-    int err;
-    apr_oslevel_e osver;
-
-    if (initialized++) {
-        return APR_SUCCESS;
-    }
-
-    /* Initialize apr_os_level global */
-    if (apr_get_oslevel(&osver) != APR_SUCCESS) {
-        return APR_EEXIST;
-    }
-    
-    tls_apr_thread = TlsAlloc();
-    if ((status = apr_pool_initialize()) != APR_SUCCESS)
-        return status;
-    
-    if (apr_pool_create(&pool, NULL) != APR_SUCCESS) {
-        return APR_ENOPOOL;
-    }
-
-    apr_pool_tag(pool, "apr_initialize");
-
-    iVersionRequested = MAKEWORD(WSAHighByte, WSALowByte);
-    err = WSAStartup((WORD) iVersionRequested, &wsaData);
-    if (err) {
-        return err;
-    }
-    if (LOBYTE(wsaData.wVersion) != WSAHighByte ||
-        HIBYTE(wsaData.wVersion) != WSALowByte) {
-        WSACleanup();
-        return APR_EEXIST;
-    }
-    
-    apr_signal_init(pool);
-
-    apr_threadproc_init(pool);
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE_NONSTD(void) apr_terminate(void)
-{
-    initialized--;
-    if (initialized) {
-        return;
-    }
-    apr_pool_terminate();
-    
-    WSACleanup();
-
-    TlsFree(tls_apr_thread);
-}
-
-APR_DECLARE(void) apr_terminate2(void)
-{
-    apr_terminate();
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/utf8.c b/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/utf8.c
deleted file mode 100644
index b37dba44..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/misc/win32/utf8.c
+++ /dev/null
@@ -1,254 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_errno.h"
-#include "apr_arch_utf8.h"
-
-/* Implement the design principal specified by RFC 2718 2.2.5 
- * Guidelines for new URL Schemes - within the APR.
- *
- * Since many architectures support unicode, and UCS2 is the most
- * efficient storage used by those archictures, these functions
- * exist to validate a UCS string.  It is up to the operating system
- * to determine the validitity of the string in the context of it's
- * native language support.  File systems that support filename 
- * characters of 0x80-0xff but have no support of Unicode will find 
- * this function useful only for validating the character sequences 
- * and rejecting poorly encoded strings, if RFC 2718 2.2.5 naming is
- * desired.
- *
- * from RFC 2279 UTF-8, a transformation format of ISO 10646
- *
- *     UCS-4 range (hex.)    UTF-8 octet sequence (binary)
- * 1:2 0000 0000-0000 007F   0xxxxxxx
- * 2:2 0000 0080-0000 07FF   110XXXXx 10xxxxxx
- * 3:2 0000 0800-0000 FFFF   1110XXXX 10Xxxxxx 10xxxxxx
- * 4:4 0001 0000-001F FFFF   11110zXX 10XXxxxx 10xxxxxx 10xxxxxx
- * inv 0020 0000-03FF FFFF   111110XX 10XXXxxx 10xxxxxx 10xxxxxx 10xxxxxx
- * inv 0400 0000-7FFF FFFF   1111110X 10XXXXxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
- *
- * One of the X values must be one for the encoding length to be legit.
- * Neither the z bit, nor the final two forms, are used for ucs-2
- *
- *   "Pairs of UCS-2 values between D800 and DFFF (surrogate pairs in 
- *   Unicode parlance), being actually UCS-4 characters transformed 
- *   through UTF-16, need special treatment: the UTF-16 transformation 
- *   must be undone, yielding a UCS-4 character that is then transformed 
- *   as above."
- *
- * from RFC2781 UTF-16: the compressed ISO 10646 encoding bitmask
- *
- *  U' = U - 0x10000
- *  U' = 000000000000yyyyyyyyyyxxxxxxxxxx
- *                  W1 = 110110yyyyyyyyyy
- *                  W2 = 110111xxxxxxxxxx
- *
- * apr_conv_utf8_to_ucs2 out bytes:sizeof(in) * 1 <= Req <= sizeof(in) * 2
- *
- * apr_conv_ucs2_to_utf8 out words:sizeof(in) / 2 <= Req <= sizeof(in) * 3 / 2
- */
-
-APR_DECLARE(apr_status_t) apr_conv_utf8_to_ucs2(const char *in, 
-                                                apr_size_t *inbytes,
-                                                apr_wchar_t *out, 
-                                                apr_size_t *outwords)
-{
-    apr_int64_t newch, mask;
-    apr_size_t expect, eating;
-    int ch;
-    
-    while (*inbytes && *outwords) 
-    {
-        ch = (unsigned char)(*in++);
-        if (!(ch & 0200)) {
-            /* US-ASCII-7 plain text
-             */
-            --*inbytes;
-            --*outwords;
-            *(out++) = ch;
-        }
-        else
-        {
-            if ((ch & 0300) != 0300) { 
-                /* Multibyte Continuation is out of place
-                 */
-                return APR_EINVAL;
-            }
-            else
-            {
-                /* Multibyte Sequence Lead Character
-                 *
-                 * Compute the expected bytes while adjusting
-                 * or lead byte and leading zeros mask.
-                 */
-                mask = 0340;
-                expect = 1;
-                while ((ch & mask) == mask) {
-                    mask |= mask >> 1;
-                    if (++expect > 3) /* (truly 5 for ucs-4) */
-                        return APR_EINVAL;
-                }
-                newch = ch & ~mask;
-                eating = expect + 1;
-                if (*inbytes <= expect)
-                    return APR_INCOMPLETE;
-                /* Reject values of excessive leading 0 bits
-                 * utf-8 _demands_ the shortest possible byte length
-                 */
-                if (expect == 1) {
-                    if (!(newch & 0036))
-                        return APR_EINVAL;
-                }
-                else {
-                    /* Reject values of excessive leading 0 bits
-                     */
-                    if (!newch && !((unsigned char)*in & 0077 & (mask << 1)))
-                        return APR_EINVAL;
-                    if (expect == 2) {
-                        /* Reject values D800-DFFF when not utf16 encoded
-                         * (may not be an appropriate restriction for ucs-4)
-                         */
-                        if (newch == 0015 && ((unsigned char)*in & 0040))
-                            return APR_EINVAL;
-                    }
-                    else if (expect == 3) {
-                        /* Short circuit values > 110000
-                         */
-                        if (newch > 4)
-                            return APR_EINVAL;
-                        if (newch == 4 && ((unsigned char)*in & 0060))
-                            return APR_EINVAL;
-                    }
-                }
-                /* Where the boolean (expect > 2) is true, we will need
-                 * an extra word for the output.
-                 */
-                if (*outwords < (apr_size_t)(expect > 2) + 1) 
-                    break; /* buffer full */
-                while (expect--)
-                {
-                    /* Multibyte Continuation must be legal */
-                    if (((ch = (unsigned char)*(in++)) & 0300) != 0200)
-                        return APR_EINVAL;
-                    newch <<= 6;
-                    newch |= (ch & 0077);
-                }
-                *inbytes -= eating;
-                /* newch is now a true ucs-4 character
-                 *
-                 * now we need to fold to ucs-2
-                 */
-                if (newch < 0x10000) 
-                {
-                    --*outwords;
-                    *(out++) = (apr_wchar_t) newch;
-                }
-                else 
-                {
-                    *outwords -= 2;
-                    newch -= 0x10000;
-                    *(out++) = (apr_wchar_t) (0xD800 | (newch >> 10));
-                    *(out++) = (apr_wchar_t) (0xDC00 | (newch & 0x03FF));                    
-                }
-            }
-        }
-    }
-    /* Buffer full 'errors' aren't errors, the client must inspect both
-     * the inbytes and outwords values
-     */
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_conv_ucs2_to_utf8(const apr_wchar_t *in, 
-                                                apr_size_t *inwords,
-                                                char *out, 
-                                                apr_size_t *outbytes)
-{
-    apr_int64_t newch, require;
-    apr_size_t need;
-    char *invout;
-    int ch;
-    
-    while (*inwords && *outbytes) 
-    {
-        ch = (unsigned short)(*in++);
-        if (ch < 0x80)
-        {
-            --*inwords;
-            --*outbytes;
-            *(out++) = (unsigned char) ch;
-        }
-        else 
-        {
-            if ((ch & 0xFC00) == 0xDC00) {
-                /* Invalid Leading ucs-2 Multiword Continuation Character
-                 */
-                return APR_EINVAL;
-            }
-            if ((ch & 0xFC00) == 0xD800) {
-                /* Leading ucs-2 Multiword Character
-                 */
-                if (*inwords < 2) {
-                    /* Missing ucs-2 Multiword Continuation Character
-                     */
-                    return APR_INCOMPLETE;
-                }
-                if (((unsigned short)(*in) & 0xFC00) != 0xDC00) {
-                    /* Invalid ucs-2 Multiword Continuation Character
-                     */
-                    return APR_EINVAL;
-                }
-                newch = (ch & 0x03FF) << 10 | ((unsigned short)(*in++) & 0x03FF);
-                newch += 0x10000;
-            }
-            else {
-                /* ucs-2 Single Word Character
-                 */
-                newch = ch;
-            }
-            /* Determine the absolute minimum utf-8 bytes required
-             */
-            require = newch >> 11;
-            need = 1;
-            while (require)
-                require >>= 5, ++need;
-            if (need >= *outbytes)
-                break; /* Insufficient buffer */
-            *inwords -= (need > 2) + 1;
-            *outbytes -= need + 1;
-            /* Compute the utf-8 characters in last to first order,
-             * calculating the lead character length bits along the way.
-             */
-            ch = 0200;
-            out += need + 1;
-            invout = out;
-            while (need--) {
-                ch |= ch >> 1;
-                *(--invout) = (unsigned char)(0200 | (newch & 0077));
-                newch >>= 6;
-            }
-            /* Compute the lead utf-8 character and move the dest offset
-             */
-            *(--invout) = (unsigned char)(ch | newch);
-        }
-    }
-    /* Buffer full 'errors' aren't errors, the client must inspect both
-     * the inwords and outbytes values
-     */
-    return APR_SUCCESS;    
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/.libs/common.o b/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/.libs/common.o
deleted file mode 100644
index 6d1983fa..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/.libs/common.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/.libs/mmap.o b/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/.libs/mmap.o
deleted file mode 100644
index 61b59ca3..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/.libs/mmap.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/Makefile
deleted file mode 100644
index b7e6ddb2..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-srcdir = .
-
-
-TARGETS = mmap.lo common.lo
-
-# bring in rules.mk for standard functionality
-include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
-
-DEFOSDIR=$(INCDIR)/arch/unix
-INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/Makefile.in
deleted file mode 100644
index 11dde067..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = mmap.lo common.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/common.c b/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/common.c
deleted file mode 100644
index a9789928..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/common.c
+++ /dev/null
@@ -1,43 +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.
- */
-
-/* common .c
- * This file has any function that is truly common and platform
- * neutral.  Or at least that's the theory.
- * 
- * The header files are a problem so there are a few #ifdef's to take
- * care of those.
- *
- */
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_mmap.h"
-#include "apr_errno.h"
-
-#if APR_HAS_MMAP || defined(BEOS)
-
-APR_DECLARE(apr_status_t) apr_mmap_offset(void **addr, apr_mmap_t *mmap,
-                                          apr_off_t offset)
-{  
-    if (offset < 0 || offset > mmap->size)
-        return APR_EINVAL;
-    
-    (*addr) = (char *) mmap->mm + offset;
-    return APR_SUCCESS;
-}
-
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/common.lo b/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/common.lo
deleted file mode 100644
index 6a593217..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/common.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# common.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/common.o'
-
-# Name of the non-PIC object.
-non_pic_object='common.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/common.o b/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/common.o
deleted file mode 100644
index 784af170..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/common.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/mmap.c b/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/mmap.c
deleted file mode 100644
index eea7ac04..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/mmap.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_strings.h"
-#include "apr_mmap.h"
-#include "apr_errno.h"
-#include "apr_arch_file_io.h"
-#include "apr_portable.h"
-
-/* System headers required for the mmap library */
-#ifdef BEOS
-#include <kernel/OS.h>
-#endif
-#if APR_HAVE_STRING_H
-#include <string.h>
-#endif
-#if APR_HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-
-#if APR_HAS_MMAP || defined(BEOS)
-
-static apr_status_t mmap_cleanup(void *themmap)
-{
-    apr_mmap_t *mm = themmap;
-    apr_mmap_t *next = APR_RING_NEXT(mm,link);
-    int rv = 0;
-
-    /* we no longer refer to the mmaped region */
-    APR_RING_REMOVE(mm,link);
-    APR_RING_NEXT(mm,link) = NULL;
-    APR_RING_PREV(mm,link) = NULL;
-
-    if (next != mm) {
-        /* more references exist, so we're done */
-        return APR_SUCCESS;
-    }
-
-#ifdef BEOS
-    rv = delete_area(mm->area);
-#else
-    rv = munmap(mm->mm, mm->size);
-#endif
-    mm->mm = (void *)-1;
-
-    if (rv == 0) {
-        return APR_SUCCESS;
-    }
-    return errno;
-}
-
-APR_DECLARE(apr_status_t) apr_mmap_create(apr_mmap_t **new, 
-                                          apr_file_t *file, apr_off_t offset, 
-                                          apr_size_t size, apr_int32_t flag, 
-                                          apr_pool_t *cont)
-{
-    void *mm;
-#ifdef BEOS
-    area_id aid = -1;
-    uint32 pages = 0;
-#else
-    apr_int32_t native_flags = 0;
-#endif
-
-    if (size == 0)
-        return APR_EINVAL;
-    
-    if (file == NULL || file->filedes == -1 || file->buffered)
-        return APR_EBADF;
-    (*new) = (apr_mmap_t *)apr_pcalloc(cont, sizeof(apr_mmap_t));
-    
-#ifdef BEOS
-    /* XXX: mmap shouldn't really change the seek offset */
-    apr_file_seek(file, APR_SET, &offset);
-
-    /* There seems to be some strange interactions that mean our area must
-     * be set as READ & WRITE or writev will fail!  Go figure...
-     * So we ignore the value in flags and always ask for both READ and WRITE
-     */
-    pages = (size + B_PAGE_SIZE -1) / B_PAGE_SIZE;
-    aid = create_area("apr_mmap", &mm , B_ANY_ADDRESS, pages * B_PAGE_SIZE,
-        B_NO_LOCK, B_WRITE_AREA|B_READ_AREA);
-
-    if (aid < B_NO_ERROR) {
-        /* we failed to get an area we can use... */
-        *new = NULL;
-        return APR_ENOMEM;
-    }
-
-    if (aid >= B_NO_ERROR)
-        read(file->filedes, mm, size);
-    
-    (*new)->area = aid;
-#else
-
-    if (flag & APR_MMAP_WRITE) {
-        native_flags |= PROT_WRITE;
-    }
-    if (flag & APR_MMAP_READ) {
-        native_flags |= PROT_READ;
-    }
-
-    mm = mmap(NULL, size, native_flags, MAP_SHARED, file->filedes, offset);
-
-    if (mm == (void *)-1) {
-        /* we failed to get an mmap'd file... */
-        *new = NULL;
-        return errno;
-    }
-#endif
-
-    (*new)->mm = mm;
-    (*new)->size = size;
-    (*new)->cntxt = cont;
-    APR_RING_ELEM_INIT(*new, link);
-
-    /* register the cleanup... */
-    apr_pool_cleanup_register((*new)->cntxt, (void*)(*new), mmap_cleanup,
-             apr_pool_cleanup_null);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_mmap_dup(apr_mmap_t **new_mmap,
-                                       apr_mmap_t *old_mmap,
-                                       apr_pool_t *p,
-                                       int transfer_ownership)
-{
-    *new_mmap = (apr_mmap_t *)apr_pmemdup(p, old_mmap, sizeof(apr_mmap_t));
-    (*new_mmap)->cntxt = p;
-
-    APR_RING_INSERT_AFTER(old_mmap, *new_mmap, link);
-
-    apr_pool_cleanup_register(p, *new_mmap, mmap_cleanup,
-                              apr_pool_cleanup_null);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_mmap_delete(apr_mmap_t *mm)
-{
-    return apr_pool_cleanup_run(mm->cntxt, mm, mmap_cleanup);
-}
-
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/mmap.lo b/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/mmap.lo
deleted file mode 100644
index 57b83252..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/mmap.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# mmap.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/mmap.o'
-
-# Name of the non-PIC object.
-non_pic_object='mmap.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/mmap.o b/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/mmap.o
deleted file mode 100644
index bb13fff7..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/unix/mmap.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/win32/mmap.c b/rubbos/app/httpd-2.0.64/srclib/apr/mmap/win32/mmap.c
deleted file mode 100644
index c288e9fd..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/mmap/win32/mmap.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_private.h"
-#include "apr_general.h"
-#include "apr_mmap.h"
-#include "apr_errno.h"
-#include "apr_arch_file_io.h"
-#include "apr_portable.h"
-#include "apr_strings.h"
-
-#if APR_HAS_MMAP
-
-static apr_status_t mmap_cleanup(void *themmap)
-{
-    apr_mmap_t *mm = themmap;
-    apr_mmap_t *next = APR_RING_NEXT(mm,link);
-    apr_status_t rv = 0;
-
-    /* we no longer refer to the mmaped region */
-    APR_RING_REMOVE(mm,link);
-    APR_RING_NEXT(mm,link) = NULL;
-    APR_RING_PREV(mm,link) = NULL;
-
-    if (next != mm) {
-        /* more references exist, so we're done */
-        return APR_SUCCESS;
-    }
-
-    if (mm->mv) {
-        if (!UnmapViewOfFile(mm->mv))
-        {
-            apr_status_t rv = apr_get_os_error();
-            CloseHandle(mm->mhandle);
-            mm->mv = NULL;
-            mm->mhandle = NULL;
-            return rv;
-        }
-        mm->mv = NULL;
-    }
-    if (mm->mhandle) 
-    {
-        if (!CloseHandle(mm->mhandle))
-        {
-            apr_status_t rv = apr_get_os_error();
-            CloseHandle(mm->mhandle);
-            mm->mhandle = NULL;
-            return rv;
-        }
-        mm->mhandle = NULL;
-    }
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_mmap_create(apr_mmap_t **new, apr_file_t *file,
-                                          apr_off_t offset, apr_size_t size,
-                                          apr_int32_t flag, apr_pool_t *cont)
-{
-    static DWORD memblock = 0;
-    DWORD fmaccess = 0;
-    DWORD mvaccess = 0;
-    DWORD offlo;
-    DWORD offhi;
-
-    if (size == 0)
-        return APR_EINVAL;
-    
-    if (flag & APR_MMAP_WRITE)
-        fmaccess |= PAGE_READWRITE;
-    else if (flag & APR_MMAP_READ)
-        fmaccess |= PAGE_READONLY;
-
-    if (flag & APR_MMAP_READ)
-        mvaccess |= FILE_MAP_READ;
-    if (flag & APR_MMAP_WRITE)
-        mvaccess |= FILE_MAP_WRITE;
-
-    if (!file || !file->filehand || file->filehand == INVALID_HANDLE_VALUE
-        || file->buffered)
-        return APR_EBADF;
-
-    if (!memblock)
-    {
-        SYSTEM_INFO si;
-        GetSystemInfo(&si);
-        memblock = si.dwAllocationGranularity;
-    }   
-    
-    *new = apr_pcalloc(cont, sizeof(apr_mmap_t));
-    (*new)->pstart = (offset / memblock) * memblock;
-    (*new)->poffset = offset - (*new)->pstart;
-    (*new)->psize = (apr_size_t)((*new)->poffset) + size;
-    /* The size of the CreateFileMapping object is the current size
-     * of the size of the mmap object (e.g. file size), not the size 
-     * of the mapped region!
-     */
-
-    (*new)->mhandle = CreateFileMapping(file->filehand, NULL, fmaccess,
-                                        0, 0, NULL);
-    if (!(*new)->mhandle || (*new)->mhandle == INVALID_HANDLE_VALUE)
-    {
-        *new = NULL;
-        return apr_get_os_error();
-    }
-
-    offlo = (DWORD)(*new)->pstart;
-    offhi = (DWORD)((*new)->pstart >> 32);
-    (*new)->mv = MapViewOfFile((*new)->mhandle, mvaccess, offhi,
-                               offlo, (*new)->psize);
-    if (!(*new)->mv)
-    {
-        apr_status_t rv = apr_get_os_error();
-        CloseHandle((*new)->mhandle);
-        *new = NULL;
-        return rv;
-    }
-
-    (*new)->mm = (char*)((*new)->mv) + (*new)->poffset;
-    (*new)->size = size;
-    (*new)->cntxt = cont;
-    APR_RING_ELEM_INIT(*new, link);
-
-    /* register the cleanup... */
-    apr_pool_cleanup_register((*new)->cntxt, (void*)(*new), mmap_cleanup,
-                         apr_pool_cleanup_null);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_mmap_dup(apr_mmap_t **new_mmap,
-                                       apr_mmap_t *old_mmap,
-                                       apr_pool_t *p,
-                                       int transfer_ownership)
-{
-    *new_mmap = (apr_mmap_t *)apr_pmemdup(p, old_mmap, sizeof(apr_mmap_t));
-    (*new_mmap)->cntxt = p;
-
-    APR_RING_INSERT_AFTER(old_mmap, *new_mmap, link);
-
-    apr_pool_cleanup_register(p, *new_mmap, mmap_cleanup,
-                              apr_pool_cleanup_null);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_mmap_delete(apr_mmap_t *mm)
-{
-    return apr_pool_cleanup_run(mm->cntxt, mm, mmap_cleanup);
-}
-
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/beos/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/beos/Makefile.in
deleted file mode 100644
index b2c93fbb..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/beos/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = sendrecv.lo socketcommon.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/@OSDIR@
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/beos/sendrecv.c b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/beos/sendrecv.c
deleted file mode 100644
index a9e7d443..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/beos/sendrecv.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_private.h"
-#if BEOS_BONE /* BONE uses the unix code - woohoo */
-#include "../unix/sendrecv.c"
-#else
-#include "apr_arch_networkio.h"
-#include "apr_time.h"
-
-apr_status_t apr_wait_for_io_or_timeout(apr_socket_t *sock, int for_read)
-{
-    struct timeval tv, *tvptr;
-    fd_set fdset;
-    int srv;
-
-    do {
-        FD_ZERO(&fdset);
-        FD_SET(sock->socketdes, &fdset);
-        if (sock->timeout < 0) {
-            tvptr = NULL;
-        }
-        else {
-            tv.tv_sec = sock->timeout / APR_USEC_PER_SEC;
-            tv.tv_usec = sock->timeout % APR_USEC_PER_SEC;
-            tvptr = &tv;
-        }
-        srv = select(sock->socketdes + 1,
-            for_read ? &fdset : NULL,
-            for_read ? NULL : &fdset, 
-            NULL,
-            tvptr);
-            /* TODO - timeout should be smaller on repeats of this loop */
-    } while (srv == -1 && errno == EINTR);
-
-    if (srv == 0) {
-        return APR_TIMEUP;
-    }
-    else if (srv < 0) {
-        return errno;
-    }
-    return APR_SUCCESS;
-}
-
-#define SEND_WAIT APR_USEC_PER_SEC / 10
-
-APR_DECLARE(apr_status_t) apr_socket_send(apr_socket_t *sock, const char *buf,
-                                          apr_size_t *len)
-{
-    apr_ssize_t rv;
-	
-    do {
-        rv = send(sock->socketdes, buf, (*len), 0);
-    } while (rv == -1 && errno == EINTR);
-
-    if (rv == -1 && errno == EWOULDBLOCK && sock->timeout > 0) {
-        apr_int32_t snooze_val = SEND_WAIT;
-        apr_int32_t zzz = 0;  
-        
-        do {
-            rv = send(sock->socketdes, buf, (*len), 0);
-            if (rv == -1 && errno == EWOULDBLOCK){
-                apr_sleep (snooze_val);
-                zzz += snooze_val;
-                snooze_val += SEND_WAIT;
-                /* have we passed our timeout value */
-                if (zzz > (sock->timeout * APR_USEC_PER_SEC))
-                    break;
-            }
-        } while (rv == -1 && (errno == EINTR || errno == EWOULDBLOCK));
-    }
-    if (rv == -1) {
-        *len = 0;
-        return errno;
-    }
-    (*len) = rv;
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_socket_recv(apr_socket_t *sock, char *buf, 
-                                          apr_size_t *len)
-{
-    apr_ssize_t rv;
-   
-    do {
-        rv = recv(sock->socketdes, buf, (*len), 0);
-    } while (rv == -1 && errno == EINTR);
-
-    if (rv == -1 && errno == EWOULDBLOCK && sock->timeout > 0) {
-        apr_status_t arv = apr_wait_for_io_or_timeout(sock, 1);
-        if (arv != APR_SUCCESS) {
-            *len = 0;
-            return arv;
-        }
-        else {
-            do {
-                rv = recv(sock->socketdes, buf, (*len), 0);
-            } while (rv == -1 && errno == EINTR);
-        }
-    }
-    if (rv == -1) {
-        (*len) = 0;
-        return errno;
-    }
-    (*len) = rv;
-    if (rv == 0)
-        return APR_EOF;
-    return APR_SUCCESS;
-}
-
-/* BeOS doesn't have writev for sockets so we use the following instead...
- */
-APR_DECLARE(apr_status_t) apr_socket_sendv(apr_socket_t * sock, 
-                                           const struct iovec *vec,
-                                           apr_int32_t nvec, apr_size_t *len)
-{
-    *len = vec[0].iov_len;
-    return apr_socket_send(sock, vec[0].iov_base, len);
-}
-
-APR_DECLARE(apr_status_t) apr_socket_sendto(apr_socket_t *sock, 
-                                            apr_sockaddr_t *where,
-                                            apr_int32_t flags, const char *buf,
-                                            apr_size_t *len)
-{
-    apr_ssize_t rv;
-
-    do {
-        rv = sendto(sock->socketdes, buf, (*len), flags,
-                    (const struct sockaddr*)&where->sa,
-                    where->salen);
-    } while (rv == -1 && errno == EINTR);
-
-    if (rv == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)
-        && sock->timeout != 0) {
-        apr_status_t arv = apr_wait_for_io_or_timeout(sock, 0);
-        if (arv != APR_SUCCESS) {
-            *len = 0;
-            return arv;
-        } else {
-            do {
-                rv = sendto(sock->socketdes, buf, (*len), flags,
-                            (const struct sockaddr*)&where->sa,
-                            where->salen);
-            } while (rv == -1 && errno == EINTR);
-        }
-    }
-    if (rv == -1) {
-        *len = 0;
-        return errno;
-    }
-    *len = rv;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_socket_recvfrom(apr_sockaddr_t *from,
-                                              apr_socket_t *sock,
-                                              apr_int32_t flags, char *buf,
-                                              apr_size_t *len)
-{
-    apr_ssize_t rv;
-
-    if (from == NULL){
-        return APR_ENOMEM;
-        /* Not sure if this is correct.  Maybe we should just allocate
-           the memory??
-         */
-    }
-
-    do {
-        rv = recvfrom(sock->socketdes, buf, (*len), flags,
-                      (struct sockaddr*)&from->sa, &from->salen);
-    } while (rv == -1 && errno == EINTR);
-
-    if (rv == -1 && (errno == EAGAIN || errno == EWOULDBLOCK) &&
-        sock->timeout != 0) {
-        apr_status_t arv = apr_wait_for_io_or_timeout(sock, 1);
-        if (arv != APR_SUCCESS) {
-            *len = 0;
-            return arv;
-        } else {
-            do {
-                rv = recvfrom(sock->socketdes, buf, (*len), flags,
-                              (struct sockaddr*)&from->sa, &from->salen);
-                } while (rv == -1 && errno == EINTR);
-        }
-    }
-    if (rv == -1) {
-        (*len) = 0;
-        return errno;
-    }
-
-    (*len) = rv;
-    if (rv == 0)
-        return APR_EOF;
-
-    return APR_SUCCESS;
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_send(apr_socket_t *sock, const char *buf,
-                                   apr_size_t *len)
-{
-    return apr_socket_send(sock, buf, len);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_sendv(apr_socket_t * sock, 
-                                    const struct iovec *vec,
-                                    apr_int32_t nvec, apr_size_t *len)
-{
-    return apr_socket_sendv(sock, vec, nvec, len);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_sendto(apr_socket_t *sock, apr_sockaddr_t *where,
-                                     apr_int32_t flags, const char *buf,
-                                     apr_size_t *len)
-{
-    return apr_socket_sendto(sock, where, flags, buf, len);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_recvfrom(apr_sockaddr_t *from, apr_socket_t *sock,
-                                       apr_int32_t flags, char *buf,
-                                       apr_size_t *len)
-{
-    return apr_socket_recvfrom(from, sock, flags, buf, len);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_recv(apr_socket_t *sock, char *buf, 
-                                   apr_size_t *len)
-{
-    return apr_socket_recv(sock, buf, len);
-}
-
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/beos/socketcommon.c b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/beos/socketcommon.c
deleted file mode 100644
index cdadc856..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/beos/socketcommon.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "../unix/inet_ntop.c"
-#include "../unix/inet_pton.c"
-#include "../unix/sockets.c"
-#include "../unix/sockaddr.c"
-#include "../unix/sockopt.c"
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/Makefile.in
deleted file mode 100644
index 04b8e32d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = \
-	sendrecv.lo \
-	sendrecv_udp.lo \
-	sockets.lo \
-	sockopt.lo \
-	sockaddr.lo \
-	inet_ntop.lo \
-	inet_pton.lo \
-	os2calls.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/@OSDIR@
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/inet_ntop.c b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/inet_ntop.c
deleted file mode 100644
index f1f79d49..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/inet_ntop.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../unix/inet_ntop.c"
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/inet_pton.c b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/inet_pton.c
deleted file mode 100644
index dbd3ac45..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/inet_pton.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../unix/inet_pton.c"
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/os2calls.c b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/os2calls.c
deleted file mode 100644
index 6bf1fcd0..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/os2calls.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_networkio.h"
-#include "apr_network_io.h"
-#include "apr_portable.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-
-static int os2_socket_init(int, int ,int);
-
-int (*apr_os2_socket)(int, int, int) = os2_socket_init;
-int (*apr_os2_select)(int *, int, int, int, long) = NULL;
-int (*apr_os2_sock_errno)() = NULL;
-int (*apr_os2_accept)(int, struct sockaddr *, int *) = NULL;
-int (*apr_os2_bind)(int, struct sockaddr *, int) = NULL;
-int (*apr_os2_connect)(int, struct sockaddr *, int) = NULL;
-int (*apr_os2_getpeername)(int, struct sockaddr *, int *) = NULL;
-int (*apr_os2_getsockname)(int, struct sockaddr *, int *) = NULL;
-int (*apr_os2_getsockopt)(int, int, int, char *, int *) = NULL;
-int (*apr_os2_ioctl)(int, int, caddr_t, int) = NULL;
-int (*apr_os2_listen)(int, int) = NULL;
-int (*apr_os2_recv)(int, char *, int, int) = NULL;
-int (*apr_os2_send)(int, const char *, int, int) = NULL;
-int (*apr_os2_setsockopt)(int, int, int, char *, int) = NULL;
-int (*apr_os2_shutdown)(int, int) = NULL;
-int (*apr_os2_soclose)(int) = NULL;
-int (*apr_os2_writev)(int, struct iovec *, int) = NULL;
-int (*apr_os2_sendto)(int, const char *, int, int, const struct sockaddr *, int);
-int (*apr_os2_recvfrom)(int, char *, int, int, struct sockaddr *, int *);
-
-static HMODULE hSO32DLL;
-
-static int os2_fn_link()
-{
-    DosEnterCritSec(); /* Stop two threads doing this at the same time */
-
-    if (apr_os2_socket == os2_socket_init) {
-        ULONG rc;
-        char errorstr[200];
-
-        rc = DosLoadModule(errorstr, sizeof(errorstr), "SO32DLL", &hSO32DLL);
-
-        if (rc)
-            return APR_OS2_STATUS(rc);
-
-        rc = DosQueryProcAddr(hSO32DLL, 0, "SOCKET", &apr_os2_socket);
-
-        if (!rc)
-            rc = DosQueryProcAddr(hSO32DLL, 0, "SELECT", &apr_os2_select);
-
-        if (!rc)
-            rc = DosQueryProcAddr(hSO32DLL, 0, "SOCK_ERRNO", &apr_os2_sock_errno);
-
-        if (!rc)
-            rc = DosQueryProcAddr(hSO32DLL, 0, "ACCEPT", &apr_os2_accept);
-
-        if (!rc)
-            rc = DosQueryProcAddr(hSO32DLL, 0, "BIND", &apr_os2_bind);
-
-        if (!rc)
-            rc = DosQueryProcAddr(hSO32DLL, 0, "CONNECT", &apr_os2_connect);
-
-        if (!rc)
-            rc = DosQueryProcAddr(hSO32DLL, 0, "GETPEERNAME", &apr_os2_getpeername);
-
-        if (!rc)
-            rc = DosQueryProcAddr(hSO32DLL, 0, "GETSOCKNAME", &apr_os2_getsockname);
-
-        if (!rc)
-            rc = DosQueryProcAddr(hSO32DLL, 0, "GETSOCKOPT", &apr_os2_getsockopt);
-
-        if (!rc)
-            rc = DosQueryProcAddr(hSO32DLL, 0, "IOCTL", &apr_os2_ioctl);
-
-        if (!rc)
-            rc = DosQueryProcAddr(hSO32DLL, 0, "LISTEN", &apr_os2_listen);
-
-        if (!rc)
-            rc = DosQueryProcAddr(hSO32DLL, 0, "RECV", &apr_os2_recv);
-
-        if (!rc)
-            rc = DosQueryProcAddr(hSO32DLL, 0, "SEND", &apr_os2_send);
-
-        if (!rc)
-            rc = DosQueryProcAddr(hSO32DLL, 0, "SETSOCKOPT", &apr_os2_setsockopt);
-
-        if (!rc)
-            rc = DosQueryProcAddr(hSO32DLL, 0, "SHUTDOWN", &apr_os2_shutdown);
-
-        if (!rc)
-            rc = DosQueryProcAddr(hSO32DLL, 0, "SOCLOSE", &apr_os2_soclose);
-
-        if (!rc)
-            rc = DosQueryProcAddr(hSO32DLL, 0, "WRITEV", &apr_os2_writev);
-
-        if (!rc)
-            rc = DosQueryProcAddr(hSO32DLL, 0, "SENDTO", &apr_os2_sendto);
-
-        if (!rc)
-            rc = DosQueryProcAddr(hSO32DLL, 0, "RECVFROM", &apr_os2_recvfrom);
-
-        if (rc)
-            return APR_OS2_STATUS(rc);
-    }
-
-    DosExitCritSec();
-    return APR_SUCCESS;
-}
-
-
-
-static int os2_socket_init(int domain, int type, int protocol)
-{
-    int rc = os2_fn_link();
-    if (rc == APR_SUCCESS)
-        return apr_os2_socket(domain, type, protocol);
-    return rc;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/sendrecv.c b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/sendrecv.c
deleted file mode 100644
index 73b12c2b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/sendrecv.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_networkio.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_network_io.h"
-#include "apr_lib.h"
-#include <sys/time.h>
-
-APR_DECLARE(apr_status_t) apr_socket_send(apr_socket_t *sock, const char *buf,
-                                          apr_size_t *len)
-{
-    apr_ssize_t rv;
-    int fds, err = 0;
-
-    if (*len > 65536) {
-        *len = 65536;
-    }
-
-    do {
-        if (!sock->nonblock || err == SOCEWOULDBLOCK) {
-            fds = sock->socketdes;
-            rv = select(&fds, 0, 1, 0, sock->timeout >= 0 ? sock->timeout/1000 : -1);
-
-            if (rv != 1) {
-                *len = 0;
-                err = sock_errno();
-
-                if (rv == 0)
-                    return APR_TIMEUP;
-
-                if (err == SOCEINTR)
-                    continue;
-
-                return APR_OS2_STATUS(err);
-            }
-        }
-
-        rv = send(sock->socketdes, buf, (*len), 0);
-        err = rv < 0 ? sock_errno() : 0;
-    } while (err == SOCEINTR || err == SOCEWOULDBLOCK);
-
-    if (err) {
-        *len = 0;
-        return APR_OS2_STATUS(err);
-    }
-
-    (*len) = rv;
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_socket_recv(apr_socket_t *sock, char *buf,
-                                          apr_size_t *len)
-{
-    apr_ssize_t rv;
-    int fds, err = 0;
-
-    do {
-        if (!sock->nonblock || (err == SOCEWOULDBLOCK && sock->timeout != 0)) {
-            fds = sock->socketdes;
-            rv = select(&fds, 1, 0, 0, sock->timeout >= 0 ? sock->timeout/1000 : -1);
-
-            if (rv != 1) {
-                *len = 0;
-                err = sock_errno();
-
-                if (rv == 0)
-                    return APR_TIMEUP;
-
-                if (err == SOCEINTR)
-                    continue;
-
-                return APR_OS2_STATUS(err);
-            }
-        }
-
-        rv = recv(sock->socketdes, buf, (*len), 0);
-        err = rv < 0 ? sock_errno() : 0;
-    } while (err == SOCEINTR || (err == SOCEWOULDBLOCK && sock->timeout != 0));
-
-    if (err) {
-        *len = 0;
-        return APR_OS2_STATUS(err);
-    }
-
-    (*len) = rv;
-    return rv == 0 ? APR_EOF : APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_socket_sendv(apr_socket_t *sock, 
-                                           const struct iovec *vec, 
-                                           apr_int32_t nvec, apr_size_t *len)
-{
-    apr_status_t rv;
-    struct iovec *tmpvec;
-    int fds, err = 0;
-    int nv_tosend, total = 0;
-
-    /* Make sure writev() only gets fed 64k at a time */
-    for ( nv_tosend = 0; nv_tosend < nvec && total + vec[nv_tosend].iov_len < 65536; nv_tosend++ ) {
-        total += vec[nv_tosend].iov_len;
-    }
-
-    tmpvec = alloca(sizeof(struct iovec) * nv_tosend);
-    memcpy(tmpvec, vec, sizeof(struct iovec) * nv_tosend);
-
-    do {
-        if (!sock->nonblock || err == SOCEWOULDBLOCK) {
-            fds = sock->socketdes;
-            rv = select(&fds, 0, 1, 0, sock->timeout >= 0 ? sock->timeout/1000 : -1);
-
-            if (rv != 1) {
-                *len = 0;
-                err = sock_errno();
-
-                if (rv == 0)
-                    return APR_TIMEUP;
-
-                if (err == SOCEINTR)
-                    continue;
-
-                return APR_OS2_STATUS(err);
-            }
-        }
-
-        rv = writev(sock->socketdes, tmpvec, nv_tosend);
-        err = rv < 0 ? sock_errno() : 0;
-    } while (err == SOCEINTR || err == SOCEWOULDBLOCK);
-
-    if (err) {
-        *len = 0;
-        return APR_OS2_STATUS(err);
-    }
-
-    *len = rv;
-    return APR_SUCCESS;
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_send(apr_socket_t *sock, const char *buf,
-                                   apr_size_t *len)
-{
-    return apr_socket_send(sock, buf, len);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_sendv(apr_socket_t *sock, 
-                                    const struct iovec *vec, 
-                                    apr_int32_t nvec, apr_size_t *len)
-{
-    return apr_socket_sendv(sock, vec, nvec, len);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_recv(apr_socket_t *sock, char *buf,
-                                   apr_size_t *len)
-{
-    return apr_socket_recv(sock, buf, len);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/sendrecv_udp.c b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/sendrecv_udp.c
deleted file mode 100644
index 0e23d11e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/sendrecv_udp.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_networkio.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_network_io.h"
-#include "apr_support.h"
-#include "apr_lib.h"
-#include <sys/time.h>
-
-
-APR_DECLARE(apr_status_t) apr_socket_sendto(apr_socket_t *sock, 
-                                            apr_sockaddr_t *where,
-                                            apr_int32_t flags, const char *buf,
-                                            apr_size_t *len)
-{
-    apr_ssize_t rv;
-    int serrno;
-
-    do {
-        rv = sendto(sock->socketdes, buf, (*len), flags, 
-                    (struct sockaddr*)&where->sa,
-                    where->salen);
-    } while (rv == -1 && (serrno = sock_errno()) == EINTR);
-
-    if (rv == -1 && serrno == SOCEWOULDBLOCK && sock->timeout != 0) {
-        apr_status_t arv = apr_wait_for_io_or_timeout(NULL, sock, 0);
-
-        if (arv != APR_SUCCESS) {
-            *len = 0;
-            return arv;
-        } else {
-            do {
-                rv = sendto(sock->socketdes, buf, *len, flags,
-                            (const struct sockaddr*)&where->sa,
-                            where->salen);
-            } while (rv == -1 && (serrno = sock_errno()) == SOCEINTR);
-        }
-    }
-
-    if (rv == -1) {
-        *len = 0;
-        return APR_FROM_OS_ERROR(serrno);
-    }
-
-    *len = rv;
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_socket_recvfrom(apr_sockaddr_t *from,
-                                              apr_socket_t *sock,
-                                              apr_int32_t flags, char *buf,
-                                              apr_size_t *len)
-{
-    apr_ssize_t rv;
-    int serrno;
-
-    do {
-        rv = recvfrom(sock->socketdes, buf, (*len), flags, 
-                      (struct sockaddr*)&from->sa, &from->salen);
-    } while (rv == -1 && (serrno = sock_errno()) == EINTR);
-
-    if (rv == -1 && serrno == SOCEWOULDBLOCK && sock->timeout != 0) {
-        apr_status_t arv = apr_wait_for_io_or_timeout(NULL, sock, 1);
-
-        if (arv != APR_SUCCESS) {
-            *len = 0;
-            return arv;
-        } else {
-            do {
-                rv = recvfrom(sock->socketdes, buf, *len, flags,
-                              (struct sockaddr*)&from->sa, &from->salen);
-                } while (rv == -1 && (serrno = sock_errno()) == EINTR);
-        }
-    }
-
-    if (rv == -1) {
-        (*len) = 0;
-        return APR_FROM_OS_ERROR(serrno);
-    }
-
-    (*len) = rv;
-
-    if (rv == 0 && sock->type == SOCK_STREAM)
-        return APR_EOF;
-
-    return APR_SUCCESS;
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_sendto(apr_socket_t *sock, apr_sockaddr_t *where,
-                                     apr_int32_t flags, const char *buf,
-                                     apr_size_t *len)
-{
-    return apr_socket_sendto(sock, where, flags, buf, len);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_recvfrom(apr_sockaddr_t *from,
-                                       apr_socket_t *sock,
-                                       apr_int32_t flags, char *buf,
-                                       apr_size_t *len)
-{
-    return apr_socket_recvfrom(from, sock, flags, buf, len);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/sockaddr.c b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/sockaddr.c
deleted file mode 100644
index 2afe4b77..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/sockaddr.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../unix/sockaddr.c"
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/sockets.c b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/sockets.c
deleted file mode 100644
index 38196642..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/sockets.c
+++ /dev/null
@@ -1,343 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_networkio.h"
-#include "apr_arch_inherit.h"
-#include "apr_network_io.h"
-#include "apr_general.h"
-#include "apr_portable.h"
-#include "apr_lib.h"
-#include "apr_strings.h"
-#include <errno.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <netinet/tcp.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include "apr_arch_os2calls.h"
-
-static apr_status_t socket_cleanup(void *sock)
-{
-    apr_socket_t *thesocket = sock;
-
-    if (thesocket->socketdes < 0) {
-        return APR_EINVALSOCK;
-    }
-
-    if (soclose(thesocket->socketdes) == 0) {
-        thesocket->socketdes = -1;
-        return APR_SUCCESS;
-    }
-    else {
-        return APR_OS2_STATUS(sock_errno());
-    }
-}
-
-static void set_socket_vars(apr_socket_t *sock, int family, int type, int protocol)
-{
-    sock->type = type;
-    sock->protocol = protocol;
-    apr_sockaddr_vars_set(sock->local_addr, family, 0);
-    apr_sockaddr_vars_set(sock->remote_addr, family, 0);
-}
-
-static void alloc_socket(apr_socket_t **new, apr_pool_t *p)
-{
-    *new = (apr_socket_t *)apr_pcalloc(p, sizeof(apr_socket_t));
-    (*new)->cntxt = p;
-    (*new)->local_addr = (apr_sockaddr_t *)apr_pcalloc((*new)->cntxt,
-                                                       sizeof(apr_sockaddr_t));
-    (*new)->local_addr->pool = p;
-    (*new)->remote_addr = (apr_sockaddr_t *)apr_pcalloc((*new)->cntxt,
-                                                        sizeof(apr_sockaddr_t));
-    (*new)->remote_addr->pool = p;
-}
-
-APR_DECLARE(apr_status_t) apr_socket_protocol_get(apr_socket_t *sock, int *protocol)
-{
-    *protocol = sock->protocol;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_socket_create_ex(apr_socket_t **new, int family, int type,
-                                               int protocol, apr_pool_t *cont)
-{
-    int downgrade = (family == AF_UNSPEC);
-
-    if (family == AF_UNSPEC) {
-#if APR_HAVE_IPV6
-        family = AF_INET6;
-#else
-        family = AF_INET;
-#endif
-    }
-
-    alloc_socket(new, cont);
-
-    (*new)->socketdes = socket(family, type, protocol);
-#if APR_HAVE_IPV6
-    if ((*new)->socketdes < 0 && downgrade) {
-        family = AF_INET;
-        (*new)->socketdes = socket(family, type, protocol);
-    }
-#endif
-
-    if ((*new)->socketdes < 0) {
-        return APR_OS2_STATUS(sock_errno());
-    }
-    set_socket_vars(*new, family, type, protocol);
-
-    (*new)->timeout = -1;
-    (*new)->nonblock = FALSE;
-    apr_pool_cleanup_register((*new)->cntxt, (void *)(*new), 
-                        socket_cleanup, apr_pool_cleanup_null);
-    return APR_SUCCESS;
-} 
-
-APR_DECLARE(apr_status_t) apr_socket_create(apr_socket_t **new, int family, int type,
-                                            apr_pool_t *cont)
-{
-    return apr_socket_create_ex(new, family, type, 0, cont);
-}
-
-APR_DECLARE(apr_status_t) apr_socket_shutdown(apr_socket_t *thesocket, 
-                                              apr_shutdown_how_e how)
-{
-    if (shutdown(thesocket->socketdes, how) == 0) {
-        return APR_SUCCESS;
-    }
-    else {
-        return APR_OS2_STATUS(sock_errno());
-    }
-}
-
-APR_DECLARE(apr_status_t) apr_socket_close(apr_socket_t *thesocket)
-{
-    apr_pool_cleanup_kill(thesocket->cntxt, thesocket, socket_cleanup);
-    return socket_cleanup(thesocket);
-}
-
-APR_DECLARE(apr_status_t) apr_socket_bind(apr_socket_t *sock,
-                                          apr_sockaddr_t *sa)
-{
-    if (bind(sock->socketdes, 
-             (struct sockaddr *)&sa->sa,
-             sa->salen) == -1)
-        return APR_OS2_STATUS(sock_errno());
-    else {
-        sock->local_addr = sa;
-        /* XXX IPv6 - this assumes sin_port and sin6_port at same offset */
-        if (sock->local_addr->sa.sin.sin_port == 0) { /* no need for ntohs() when comparing w/ 0 */
-            sock->local_port_unknown = 1; /* kernel got us an ephemeral port */
-        }
-        return APR_SUCCESS;
-    }
-}
-
-APR_DECLARE(apr_status_t) apr_socket_listen(apr_socket_t *sock, 
-                                            apr_int32_t backlog)
-{
-    if (listen(sock->socketdes, backlog) == -1)
-        return APR_OS2_STATUS(sock_errno());
-    else
-        return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_socket_accept(apr_socket_t **new, 
-                                            apr_socket_t *sock,
-                                            apr_pool_t *connection_context)
-{
-    alloc_socket(new, connection_context);
-    set_socket_vars(*new, sock->local_addr->sa.sin.sin_family, SOCK_STREAM, sock->protocol);
-
-    (*new)->timeout = -1;
-    (*new)->nonblock = FALSE;
-
-    (*new)->socketdes = accept(sock->socketdes, 
-                               (struct sockaddr *)&(*new)->remote_addr->sa,
-                               &(*new)->remote_addr->salen);
-
-    if ((*new)->socketdes < 0) {
-        return APR_OS2_STATUS(sock_errno());
-    }
-
-    *(*new)->local_addr = *sock->local_addr;
-    (*new)->local_addr->pool = connection_context;
-    (*new)->remote_addr->port = ntohs((*new)->remote_addr->sa.sin.sin_port);
-
-    /* fix up any pointers which are no longer valid */
-    if (sock->local_addr->sa.sin.sin_family == AF_INET) {
-        (*new)->local_addr->ipaddr_ptr = &(*new)->local_addr->sa.sin.sin_addr;
-    }
-
-    apr_pool_cleanup_register((*new)->cntxt, (void *)(*new), 
-                        socket_cleanup, apr_pool_cleanup_null);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_socket_connect(apr_socket_t *sock,
-                                             apr_sockaddr_t *sa)
-{
-    if ((connect(sock->socketdes, (struct sockaddr *)&sa->sa.sin, 
-                 sa->salen) < 0) &&
-        (sock_errno() != SOCEINPROGRESS)) {
-        return APR_OS2_STATUS(sock_errno());
-    }
-    else {
-        int namelen = sizeof(sock->local_addr->sa.sin);
-        getsockname(sock->socketdes, (struct sockaddr *)&sock->local_addr->sa.sin, 
-                    &namelen);
-        sock->remote_addr = sa;
-        return APR_SUCCESS;
-    }
-}
-
-
-APR_DECLARE(apr_status_t) apr_socket_data_get(void **data, const char *key,
-                                     apr_socket_t *sock)
-{
-    sock_userdata_t *cur = sock->userdata;
-
-    *data = NULL;
-
-    while (cur) {
-        if (!strcmp(cur->key, key)) {
-            *data = cur->data;
-            break;
-        }
-        cur = cur->next;
-    }
-
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_socket_data_set(apr_socket_t *sock, void *data, const char *key,
-                                     apr_status_t (*cleanup) (void *))
-{
-    sock_userdata_t *new = apr_palloc(sock->cntxt, sizeof(sock_userdata_t));
-
-    new->key = apr_pstrdup(sock->cntxt, key);
-    new->data = data;
-    new->next = sock->userdata;
-    sock->userdata = new;
-
-    if (cleanup) {
-        apr_pool_cleanup_register(sock->cntxt, data, cleanup, cleanup);
-    }
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_sock_get(apr_os_sock_t *thesock, apr_socket_t *sock)
-{
-    *thesock = sock->socketdes;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_sock_make(apr_socket_t **apr_sock, 
-                                           apr_os_sock_info_t *os_sock_info, 
-                                           apr_pool_t *cont)
-{
-    alloc_socket(apr_sock, cont);
-#ifdef APR_ENABLE_FOR_1_0 /* no protocol field yet */
-    set_socket_vars(*apr_sock, os_sock_info->family, os_sock_info->type, os_sock_info->protocol);
-#else
-    set_socket_vars(*apr_sock, os_sock_info->family, os_sock_info->type, 0);
-#endif
-    (*apr_sock)->timeout = -1;
-    (*apr_sock)->socketdes = *os_sock_info->os_sock;
-    if (os_sock_info->local) {
-        memcpy(&(*apr_sock)->local_addr->sa.sin, 
-               os_sock_info->local, 
-               (*apr_sock)->local_addr->salen);
-        /* XXX IPv6 - this assumes sin_port and sin6_port at same offset */
-        (*apr_sock)->local_addr->port = ntohs((*apr_sock)->local_addr->sa.sin.sin_port);
-    }
-    else {
-        (*apr_sock)->local_port_unknown = (*apr_sock)->local_interface_unknown = 1;
-    }
-    if (os_sock_info->remote) {
-        memcpy(&(*apr_sock)->remote_addr->sa.sin, 
-               os_sock_info->remote,
-               (*apr_sock)->remote_addr->salen);
-        /* XXX IPv6 - this assumes sin_port and sin6_port at same offset */
-        (*apr_sock)->remote_addr->port = ntohs((*apr_sock)->remote_addr->sa.sin.sin_port);
-    }
-    else {
-        (*apr_sock)->remote_addr_unknown = 1;
-    }
-        
-    apr_pool_cleanup_register((*apr_sock)->cntxt, (void *)(*apr_sock), 
-                        socket_cleanup, apr_pool_cleanup_null);
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_sock_put(apr_socket_t **sock, apr_os_sock_t *thesock, apr_pool_t *cont)
-{
-    if (cont == NULL) {
-        return APR_ENOPOOL;
-    }
-    if ((*sock) == NULL) {
-        alloc_socket(sock, cont);
-        set_socket_vars(*sock, AF_INET, SOCK_STREAM, 0);
-        (*sock)->timeout = -1;
-    }
-
-    (*sock)->local_port_unknown = (*sock)->local_interface_unknown = 1;
-    (*sock)->remote_addr_unknown = 1;
-    (*sock)->socketdes = *thesock;
-    return APR_SUCCESS;
-}
-
-APR_IMPLEMENT_INHERIT_SET(socket, inherit, cntxt, socket_cleanup)
-
-APR_IMPLEMENT_INHERIT_UNSET(socket, inherit, cntxt, socket_cleanup)
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_shutdown(apr_socket_t *thesocket, 
-                                       apr_shutdown_how_e how)
-{
-    return apr_socket_shutdown(thesocket, how);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_bind(apr_socket_t *sock, apr_sockaddr_t *sa)
-{
-    return apr_socket_bind(sock, sa);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_listen(apr_socket_t *sock, apr_int32_t backlog)
-{
-    return apr_socket_listen(sock, backlog);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_accept(apr_socket_t **new, apr_socket_t *sock,
-                                     apr_pool_t *connection_context)
-{
-    return apr_socket_accept(new, sock, connection_context);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_connect(apr_socket_t *sock, apr_sockaddr_t *sa)
-{
-    return apr_socket_connect(sock, sa);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/sockopt.c b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/sockopt.c
deleted file mode 100644
index 5a668d14..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/os2/sockopt.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_networkio.h"
-#include "apr_network_io.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_strings.h"
-#include <errno.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <netinet/tcp.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#include <netdb.h>
-#include <sys/so_ioctl.h>
-
-
-APR_DECLARE(apr_status_t) apr_socket_timeout_set(apr_socket_t *sock, 
-                                                 apr_interval_time_t t)
-{
-    sock->timeout = t;
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_socket_opt_set(apr_socket_t *sock, 
-                                             apr_int32_t opt, apr_int32_t on)
-{
-    int one;
-    struct linger li;
-
-    if (on)
-        one = 1;
-    else
-        one = 0;
-
-    if (opt & APR_SO_KEEPALIVE) {
-        if (setsockopt(sock->socketdes, SOL_SOCKET, SO_KEEPALIVE, (void *)&one, sizeof(int)) == -1) {
-            return APR_OS2_STATUS(sock_errno());
-        }
-    }
-    if (opt & APR_SO_DEBUG) {
-        if (setsockopt(sock->socketdes, SOL_SOCKET, SO_DEBUG, (void *)&one, sizeof(int)) == -1) {
-            return APR_OS2_STATUS(sock_errno());
-        }
-    }
-    if (opt & APR_SO_REUSEADDR) {
-        if (setsockopt(sock->socketdes, SOL_SOCKET, SO_REUSEADDR, (void *)&one, sizeof(int)) == -1) {
-            return APR_OS2_STATUS(sock_errno());
-        }
-    }
-    if (opt & APR_SO_SNDBUF) {
-        if (setsockopt(sock->socketdes, SOL_SOCKET, SO_SNDBUF, (void *)&on, sizeof(int)) == -1) {
-            return APR_OS2_STATUS(sock_errno());
-        }
-    }
-    if (opt & APR_SO_NONBLOCK) {
-        if (ioctl(sock->socketdes, FIONBIO, (caddr_t)&one, sizeof(one)) == -1) {
-            return APR_OS2_STATUS(sock_errno());
-        } else {
-            sock->nonblock = one;
-        }
-    }
-    if (opt & APR_SO_LINGER) {
-        li.l_onoff = on;
-        li.l_linger = APR_MAX_SECS_TO_LINGER;
-        if (setsockopt(sock->socketdes, SOL_SOCKET, SO_LINGER, (char *) &li, sizeof(struct linger)) == -1) {
-            return APR_OS2_STATUS(sock_errno());
-        }
-    }
-    if (opt & APR_SO_TIMEOUT) {
-        /* XXX: To be deprecated */
-        return apr_socket_timeout_set(sock, on);
-    }
-    if (opt & APR_TCP_NODELAY) {
-        if (setsockopt(sock->socketdes, IPPROTO_TCP, TCP_NODELAY, (void *)&on, sizeof(int)) == -1) {
-            return APR_OS2_STATUS(sock_errno());
-        }
-    }
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_socket_timeout_get(apr_socket_t *sock, 
-                                                 apr_interval_time_t *t)
-{
-    *t = sock->timeout;
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_socket_opt_get(apr_socket_t *sock, 
-                                             apr_int32_t opt, apr_int32_t *on)
-{
-    switch(opt) {
-    case APR_SO_TIMEOUT:
-        /* XXX: To be deprecated */
-        *on = (apr_int32_t)sock->timeout;
-        break;
-    default:
-        return APR_EINVAL;
-    }
-    return APR_SUCCESS;
-}
-
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_setsocketopt(apr_socket_t *sock,
-                                           apr_int32_t opt, apr_int32_t on)
-{
-    return apr_socket_opt_set(sock, opt, on);
-}
-
-APR_DECLARE(apr_status_t) apr_getsocketopt(apr_socket_t *sock,
-                                           apr_int32_t opt, apr_int32_t *on)
-{
-    return apr_socket_opt_get(sock, opt, on);
-}
-                                           
-
-APR_DECLARE(apr_status_t) apr_socket_atmark(apr_socket_t *sock, int *atmark)
-{
-    int oobmark;
-
-    if (ioctl(sock->socketdes, SIOCATMARK, (void*)&oobmark, sizeof(oobmark)) < 0) {
-        return APR_OS2_STATUS(sock_errno());
-    }
-
-    *atmark = (oobmark != 0);
-
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_gethostname(char *buf, apr_int32_t len, 
-                                          apr_pool_t *cont)
-{
-    if (gethostname(buf, len) == -1) {
-        buf[0] = '\0';
-        return APR_OS2_STATUS(sock_errno());
-    }
-    else if (!memchr(buf, '\0', len)) { /* buffer too small */
-        buf[0] = '\0';
-        return APR_ENAMETOOLONG;
-    }
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/.libs/inet_ntop.o b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/.libs/inet_ntop.o
deleted file mode 100644
index 817cc79d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/.libs/inet_ntop.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/.libs/inet_pton.o b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/.libs/inet_pton.o
deleted file mode 100644
index 2e7742cd..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/.libs/inet_pton.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/.libs/sendrecv.o b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/.libs/sendrecv.o
deleted file mode 100644
index 491c3a31..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/.libs/sendrecv.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/.libs/sockaddr.o b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/.libs/sockaddr.o
deleted file mode 100644
index b2e965fb..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/.libs/sockaddr.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/.libs/sockets.o b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/.libs/sockets.o
deleted file mode 100644
index fef86515..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/.libs/sockets.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/.libs/sockopt.o b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/.libs/sockopt.o
deleted file mode 100644
index d0d49c18..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/.libs/sockopt.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/Makefile
deleted file mode 100644
index a942d0d5..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-srcdir = .
-
-
-TARGETS = \
-	sendrecv.lo \
-	sockets.lo \
-	sockopt.lo \
-	sockaddr.lo \
-	inet_ntop.lo \
-	inet_pton.lo
-
-# bring in rules.mk for standard functionality
-include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/unix
-DEFOSDIR=$(INCDIR)/arch/unix
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/Makefile.in
deleted file mode 100644
index 3ea7d03b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = \
-	sendrecv.lo \
-	sockets.lo \
-	sockopt.lo \
-	sockaddr.lo \
-	inet_ntop.lo \
-	inet_pton.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/@OSDIR@
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/inet_ntop.c b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/inet_ntop.c
deleted file mode 100644
index 78dd3baa..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/inet_ntop.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/* Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#include "apr_private.h"
-#include "apr_arch_networkio.h"
-#include "apr_strings.h"
-
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if APR_HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#if APR_HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#if APR_HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#include <string.h>
-#if APR_HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#include <stdio.h>
-
-#ifndef IN6ADDRSZ
-#define IN6ADDRSZ   16
-#endif
-
-#ifndef INT16SZ
-#define INT16SZ sizeof(apr_int16_t)
-#endif
-
-#ifndef __P
-#define __P(x) x
-#endif
-
-#if !defined(EAFNOSUPPORT) && defined(WSAEAFNOSUPPORT)
-#define EAFNOSUPPORT WSAEAFNOSUPPORT
-#endif
-
-/*
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static const char *inet_ntop4 __P((const unsigned char *src, char *dst, apr_size_t size));
-#if APR_HAVE_IPV6
-static const char *inet_ntop6 __P((const unsigned char *src, char *dst, apr_size_t size));
-#endif
-
-/* char *
- * inet_ntop(af, src, dst, size)
- *	convert a network format address to presentation format.
- * return:
- *	pointer to presentation format address (`dst'), or NULL (see errno).
- * author:
- *	Paul Vixie, 1996.
- */
-const char *
-apr_inet_ntop(int af, const void *src, char *dst, apr_size_t size)
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_ntop4(src, dst, size));
-#if APR_HAVE_IPV6
-	case AF_INET6:
-		return (inet_ntop6(src, dst, size));
-#endif
-	default:
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-	/* NOTREACHED */
-}
-
-/* const char *
- * inet_ntop4(src, dst, size)
- *	format an IPv4 address, more or less like inet_ntoa()
- * return:
- *	`dst' (as a const)
- * notes:
- *	(1) uses no statics
- *	(2) takes a u_char* not an in_addr as input
- * author:
- *	Paul Vixie, 1996.
- */
-static const char *
-inet_ntop4(const unsigned char *src, char *dst, apr_size_t size)
-{
-	const apr_size_t MIN_SIZE = 16; /* space for 255.255.255.255\0 */
-	int n = 0;
-	char *next = dst;
-
-	if (size < MIN_SIZE) {
-	    errno = ENOSPC;
-	    return NULL;
-	}
-	do {
-	    unsigned char u = *src++;
-	    if (u > 99) {
-		*next++ = '0' + u/100;
-		u %= 100;
-		*next++ = '0' + u/10;
-		u %= 10;
-	    }
-	    else if (u > 9) {
-		*next++ = '0' + u/10;
-		u %= 10;
-	    }
-	    *next++ = '0' + u;
-	    *next++ = '.';
-	    n++;
-	} while (n < 4);
-	*--next = 0;
-	return dst;
-}
-
-#if APR_HAVE_IPV6
-/* const char *
- * inet_ntop6(src, dst, size)
- *	convert IPv6 binary address into presentation (printable) format
- * author:
- *	Paul Vixie, 1996.
- */
-static const char *
-inet_ntop6(const unsigned char *src, char *dst, apr_size_t size)
-{
-    /*
-     * Note that int32_t and int16_t need only be "at least" large enough
-     * to contain a value of the specified size.  On some systems, like
-     * Crays, there is no such thing as an integer variable with 16 bits.
-     * Keep this in mind if you think this function should have been coded
-     * to use pointer overlays.  All the world's not a VAX.
-     */
-    char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
-    struct { int base, len; } best = {-1, 0}, cur = {-1, 0};
-    unsigned int words[IN6ADDRSZ / INT16SZ];
-    int i;
-    const unsigned char *next_src, *src_end;
-    unsigned int *next_dest;
-
-    /*
-     * Preprocess:
-     *	Copy the input (bytewise) array into a wordwise array.
-     *	Find the longest run of 0x00's in src[] for :: shorthanding.
-     */
-    next_src = src;
-    src_end = src + IN6ADDRSZ;
-    next_dest = words;
-    i = 0;
-    do {
-        unsigned int next_word = (unsigned int)*next_src++;
-        next_word <<= 8;
-        next_word |= (unsigned int)*next_src++;
-        *next_dest++ = next_word;
-
-        if (next_word == 0) {
-            if (cur.base == -1) {
-                cur.base = i;
-                cur.len = 1;
-            }
-            else {
-                cur.len++;
-            }
-        } else {
-            if (cur.base != -1) {
-                if (best.base == -1 || cur.len > best.len) {
-                    best = cur;
-                }
-                cur.base = -1;
-            }
-        }
-
-        i++;
-    } while (next_src < src_end);
-
-    if (cur.base != -1) {
-        if (best.base == -1 || cur.len > best.len) {
-            best = cur;
-        }
-    }
-    if (best.base != -1 && best.len < 2) {
-        best.base = -1;
-    }
-
-    /*
-     * Format the result.
-     */
-    tp = tmp;
-    for (i = 0; i < (IN6ADDRSZ / INT16SZ);) {
-        /* Are we inside the best run of 0x00's? */
-        if (i == best.base) {
-            *tp++ = ':';
-            i += best.len;
-            continue;
-        }
-        /* Are we following an initial run of 0x00s or any real hex? */
-        if (i != 0) {
-            *tp++ = ':';
-        }
-        /* Is this address an encapsulated IPv4? */
-        if (i == 6 && best.base == 0 &&
-            (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) {
-            if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp))) {
-                return (NULL);
-            }
-            tp += strlen(tp);
-            break;
-        }
-        tp += apr_snprintf(tp, sizeof tmp - (tp - tmp), "%x", words[i]);
-        i++;
-    }
-    /* Was it a trailing run of 0x00's? */
-    if (best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ)) {
-        *tp++ = ':';
-    }
-    *tp++ = '\0';
-
-    /*
-     * Check for overflow, copy, and we're done.
-     */
-    if ((apr_size_t)(tp - tmp) > size) {
-        errno = ENOSPC;
-        return (NULL);
-    }
-    strcpy(dst, tmp);
-    return (dst);
-}
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/inet_ntop.lo b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/inet_ntop.lo
deleted file mode 100644
index 2345ed35..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/inet_ntop.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# inet_ntop.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/inet_ntop.o'
-
-# Name of the non-PIC object.
-non_pic_object='inet_ntop.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/inet_ntop.o b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/inet_ntop.o
deleted file mode 100644
index 0812ba54..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/inet_ntop.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/inet_pton.c b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/inet_pton.c
deleted file mode 100644
index 550ab2a4..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/inet_pton.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/* Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#include "apr_private.h"
-#include "apr_arch_networkio.h"
-
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if APR_HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#if APR_HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#if APR_HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#include <string.h>
-#if APR_HAVE_ERRNO_H
-#include <errno.h>
-#endif
-
-#ifndef IN6ADDRSZ
-#define IN6ADDRSZ   16
-#endif
-
-#ifndef INT16SZ
-#define INT16SZ sizeof(apr_int16_t)
-#endif
-
-#ifndef INADDRSZ
-#define INADDRSZ    4
-#endif
-
-#ifndef __P
-#define __P(x) x
-#endif
-
-#if !defined(EAFNOSUPPORT) && defined(WSAEAFNOSUPPORT)
-#define EAFNOSUPPORT WSAEAFNOSUPPORT
-#endif
-
-/*
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static int	inet_pton4 __P((const char *src, unsigned char *dst));
-#if APR_HAVE_IPV6
-static int	inet_pton6 __P((const char *src, unsigned char *dst));
-#endif
-
-/* int
- * inet_pton(af, src, dst)
- *	convert from presentation format (which usually means ASCII printable)
- *	to network format (which is usually some kind of binary format).
- * return:
- *	1 if the address was valid for the specified address family
- *	0 if the address wasn't valid (`dst' is untouched in this case)
- *	-1 if some other error occurred (`dst' is untouched in this case, too)
- * author:
- *	Paul Vixie, 1996.
- */
-int
-apr_inet_pton(int af, const char *src, void *dst)
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_pton4(src, dst));
-#if APR_HAVE_IPV6
-	case AF_INET6:
-		return (inet_pton6(src, dst));
-#endif
-	default:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-	/* NOTREACHED */
-}
-
-/* int
- * inet_pton4(src, dst)
- *	like inet_aton() but without all the hexadecimal and shorthand.
- * return:
- *	1 if `src' is a valid dotted quad, else 0.
- * notice:
- *	does not touch `dst' unless it's returning 1.
- * author:
- *	Paul Vixie, 1996.
- */
-static int
-inet_pton4(const char *src, unsigned char *dst)
-{
-	static const char digits[] = "0123456789";
-	int saw_digit, octets, ch;
-	unsigned char tmp[INADDRSZ], *tp;
-
-	saw_digit = 0;
-	octets = 0;
-	*(tp = tmp) = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		if ((pch = strchr(digits, ch)) != NULL) {
-			unsigned int new = *tp * 10 + (pch - digits);
-
-			if (new > 255)
-				return (0);
-			*tp = new;
-			if (! saw_digit) {
-				if (++octets > 4)
-					return (0);
-				saw_digit = 1;
-			}
-		} else if (ch == '.' && saw_digit) {
-			if (octets == 4)
-				return (0);
-			*++tp = 0;
-			saw_digit = 0;
-		} else
-			return (0);
-	}
-	if (octets < 4)
-		return (0);
-
-	memcpy(dst, tmp, INADDRSZ);
-	return (1);
-}
-
-#if APR_HAVE_IPV6
-/* int
- * inet_pton6(src, dst)
- *	convert presentation level address to network order binary form.
- * return:
- *	1 if `src' is a valid [RFC1884 2.2] address, else 0.
- * notice:
- *	(1) does not touch `dst' unless it's returning 1.
- *	(2) :: in a full address is silently ignored.
- * credit:
- *	inspired by Mark Andrews.
- * author:
- *	Paul Vixie, 1996.
- */
-static int
-inet_pton6(const char *src, unsigned char *dst)
-{
-	static const char xdigits_l[] = "0123456789abcdef",
-			  xdigits_u[] = "0123456789ABCDEF";
-	unsigned char tmp[IN6ADDRSZ], *tp, *endp, *colonp;
-	const char *xdigits, *curtok;
-	int ch, saw_xdigit;
-	unsigned int val;
-
-	memset((tp = tmp), '\0', IN6ADDRSZ);
-	endp = tp + IN6ADDRSZ;
-	colonp = NULL;
-	/* Leading :: requires some special handling. */
-	if (*src == ':')
-		if (*++src != ':')
-			return (0);
-	curtok = src;
-	saw_xdigit = 0;
-	val = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
-			pch = strchr((xdigits = xdigits_u), ch);
-		if (pch != NULL) {
-			val <<= 4;
-			val |= (pch - xdigits);
-			if (val > 0xffff)
-				return (0);
-			saw_xdigit = 1;
-			continue;
-		}
-		if (ch == ':') {
-			curtok = src;
-			if (!saw_xdigit) {
-				if (colonp)
-					return (0);
-				colonp = tp;
-				continue;
-			}
-			if (tp + INT16SZ > endp)
-				return (0);
-			*tp++ = (unsigned char) (val >> 8) & 0xff;
-			*tp++ = (unsigned char) val & 0xff;
-			saw_xdigit = 0;
-			val = 0;
-			continue;
-		}
-		if (ch == '.' && ((tp + INADDRSZ) <= endp) &&
-		    inet_pton4(curtok, tp) > 0) {
-			tp += INADDRSZ;
-			saw_xdigit = 0;
-			break;	/* '\0' was seen by inet_pton4(). */
-		}
-		return (0);
-	}
-	if (saw_xdigit) {
-		if (tp + INT16SZ > endp)
-			return (0);
-		*tp++ = (unsigned char) (val >> 8) & 0xff;
-		*tp++ = (unsigned char) val & 0xff;
-	}
-	if (colonp != NULL) {
-		/*
-		 * Since some memmove()'s erroneously fail to handle
-		 * overlapping regions, we'll do the shift by hand.
-		 */
-		const int n = tp - colonp;
-		int i;
-
-		for (i = 1; i <= n; i++) {
-			endp[- i] = colonp[n - i];
-			colonp[n - i] = 0;
-		}
-		tp = endp;
-	}
-	if (tp != endp)
-		return (0);
-	memcpy(dst, tmp, IN6ADDRSZ);
-	return (1);
-}
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/inet_pton.lo b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/inet_pton.lo
deleted file mode 100644
index 780b7a7b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/inet_pton.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# inet_pton.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/inet_pton.o'
-
-# Name of the non-PIC object.
-non_pic_object='inet_pton.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/inet_pton.o b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/inet_pton.o
deleted file mode 100644
index 0601b0dd..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/inet_pton.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sendrecv.c b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sendrecv.c
deleted file mode 100644
index bf1bf99f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sendrecv.c
+++ /dev/null
@@ -1,1014 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_networkio.h"
-#include "apr_support.h"
-
-#if APR_HAS_SENDFILE
-/* This file is needed to allow us access to the apr_file_t internals. */
-#include "apr_arch_file_io.h"
-#endif /* APR_HAS_SENDFILE */
-
-/* sys/sysctl.h is only needed on FreeBSD for include_hdrs_in_length() */
-#if defined(__FreeBSD__) && defined(HAVE_SYS_SYSCTL_H)
-#include <sys/sysctl.h>
-#endif
-
-apr_status_t apr_socket_send(apr_socket_t *sock, const char *buf, 
-                             apr_size_t *len)
-{
-    apr_ssize_t rv;
-    
-    if (sock->netmask & APR_INCOMPLETE_WRITE) {
-        sock->netmask &= ~APR_INCOMPLETE_WRITE;
-        goto do_select;
-    }
-
-    do {
-        rv = write(sock->socketdes, buf, (*len));
-    } while (rv == -1 && errno == EINTR);
-
-    while (rv == -1 && (errno == EAGAIN || errno == EWOULDBLOCK) 
-        && apr_is_option_set(sock->netmask, APR_SO_TIMEOUT)) {
-        apr_status_t arv;
-do_select:
-        arv = apr_wait_for_io_or_timeout(NULL, sock, 0);
-        if (arv != APR_SUCCESS) {
-            *len = 0;
-            return arv;
-        }
-        else {
-            do {
-                rv = write(sock->socketdes, buf, (*len));
-            } while (rv == -1 && errno == EINTR);
-        }
-    }
-    if (rv == -1) {
-        *len = 0;
-        return errno;
-    }
-    if (apr_is_option_set(sock->netmask, APR_SO_TIMEOUT) && rv < *len) {
-        sock->netmask |= APR_INCOMPLETE_WRITE;
-    }
-    (*len) = rv;
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_socket_recv(apr_socket_t *sock, char *buf, apr_size_t *len)
-{
-    apr_ssize_t rv;
-    apr_status_t arv;
-
-    if (sock->netmask & APR_INCOMPLETE_READ) {
-        sock->netmask &= ~APR_INCOMPLETE_READ;
-        goto do_select;
-    }
-
-    do {
-        rv = read(sock->socketdes, buf, (*len));
-    } while (rv == -1 && errno == EINTR);
-
-    while (rv == -1 && (errno == EAGAIN || errno == EWOULDBLOCK) && 
-        apr_is_option_set(sock->netmask, APR_SO_TIMEOUT)) {
-do_select:
-        arv = apr_wait_for_io_or_timeout(NULL, sock, 1);
-        if (arv != APR_SUCCESS) {
-            *len = 0;
-            return arv;
-        }
-        else {
-            do {
-                rv = read(sock->socketdes, buf, (*len));
-            } while (rv == -1 && errno == EINTR);
-        }
-    }
-    if (rv == -1) {
-        (*len) = 0;
-        return errno;
-    }
-    if (apr_is_option_set(sock->netmask, APR_SO_TIMEOUT) && rv < *len) {
-        sock->netmask |= APR_INCOMPLETE_READ;
-    }
-    (*len) = rv;
-    if (rv == 0) {
-        return APR_EOF;
-    }
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_socket_sendto(apr_socket_t *sock, apr_sockaddr_t *where,
-                               apr_int32_t flags, const char *buf,
-                               apr_size_t *len)
-{
-    apr_ssize_t rv;
-
-    do {
-        rv = sendto(sock->socketdes, buf, (*len), flags, 
-                    (const struct sockaddr*)&where->sa, 
-                    where->salen);
-    } while (rv == -1 && errno == EINTR);
-
-    while (rv == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)
-        && apr_is_option_set(sock->netmask, APR_SO_TIMEOUT)) {
-        apr_status_t arv = apr_wait_for_io_or_timeout(NULL, sock, 0);
-        if (arv != APR_SUCCESS) {
-            *len = 0;
-            return arv;
-        } else {
-            do {
-                rv = sendto(sock->socketdes, buf, (*len), flags,
-                            (const struct sockaddr*)&where->sa,
-                            where->salen);
-            } while (rv == -1 && errno == EINTR);
-        }
-    }
-    if (rv == -1) {
-        *len = 0;
-        return errno;
-    }
-    *len = rv;
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_socket_recvfrom(apr_sockaddr_t *from, apr_socket_t *sock,
-                                 apr_int32_t flags, char *buf, 
-                                 apr_size_t *len)
-{
-    apr_ssize_t rv;
-
-    do {
-        rv = recvfrom(sock->socketdes, buf, (*len), flags, 
-                      (struct sockaddr*)&from->sa, &from->salen);
-    } while (rv == -1 && errno == EINTR);
-
-    while (rv == -1 && (errno == EAGAIN || errno == EWOULDBLOCK) &&
-        apr_is_option_set(sock->netmask, APR_SO_TIMEOUT)) {
-        apr_status_t arv = apr_wait_for_io_or_timeout(NULL, sock, 1);
-        if (arv != APR_SUCCESS) {
-            *len = 0;
-            return arv;
-        } else {
-            do {
-                rv = recvfrom(sock->socketdes, buf, (*len), flags,
-                              (struct sockaddr*)&from->sa, &from->salen);
-            } while (rv == -1 && errno == EINTR);
-        }
-    }
-    if (rv == -1) {
-        (*len) = 0;
-        return errno;
-    }
-
-    (*len) = rv;
-    if (rv == 0 && sock->type == SOCK_STREAM) {
-        return APR_EOF;
-    }
-
-    return APR_SUCCESS;
-}
-
-#ifdef HAVE_WRITEV
-apr_status_t apr_socket_sendv(apr_socket_t * sock, const struct iovec *vec,
-                              apr_int32_t nvec, apr_size_t *len)
-{
-    apr_ssize_t rv;
-    apr_size_t requested_len = 0;
-    apr_int32_t i;
-
-    for (i = 0; i < nvec; i++) {
-        requested_len += vec[i].iov_len;
-    }
-
-    if (sock->netmask & APR_INCOMPLETE_WRITE) {
-        sock->netmask &= ~APR_INCOMPLETE_WRITE;
-        goto do_select;
-    }
-
-    do {
-        rv = writev(sock->socketdes, vec, nvec);
-    } while (rv == -1 && errno == EINTR);
-
-    while (rv == -1 && (errno == EAGAIN || errno == EWOULDBLOCK) && 
-        apr_is_option_set(sock->netmask, APR_SO_TIMEOUT)) {
-        apr_status_t arv;
-do_select:
-        arv = apr_wait_for_io_or_timeout(NULL, sock, 0);
-        if (arv != APR_SUCCESS) {
-            *len = 0;
-            return arv;
-        }
-        else {
-            do {
-                rv = writev(sock->socketdes, vec, nvec);
-            } while (rv == -1 && errno == EINTR);
-        }
-    }
-    if (rv == -1) {
-        *len = 0;
-        return errno;
-    }
-    if (apr_is_option_set(sock->netmask, APR_SO_TIMEOUT) &&
-        rv < requested_len) {
-        sock->netmask |= APR_INCOMPLETE_WRITE;
-    }
-    (*len) = rv;
-    return APR_SUCCESS;
-}
-#endif
-
-#if APR_HAS_SENDFILE
-
-/* TODO: Verify that all platforms handle the fd the same way,
- * i.e. that they don't move the file pointer.
- */
-/* TODO: what should flags be?  int_32? */
-
-/* Define a structure to pass in when we have a NULL header value */
-static apr_hdtr_t no_hdtr;
-
-#if defined(__linux__) && defined(HAVE_WRITEV)
-
-apr_status_t apr_socket_sendfile(apr_socket_t *sock, apr_file_t *file,
-                                 apr_hdtr_t *hdtr, apr_off_t *offset,
-                                 apr_size_t *len, apr_int32_t flags)
-{
-    off_t off = *offset;
-    int rv, nbytes = 0, total_hdrbytes, i;
-    apr_status_t arv;
-
-    if (!hdtr) {
-        hdtr = &no_hdtr;
-    }
-
-    /* Ignore flags for now. */
-    flags = 0;
-
-    if (hdtr->numheaders > 0) {
-        apr_size_t hdrbytes;
-
-        /* cork before writing headers */
-        rv = apr_socket_opt_set(sock, APR_TCP_NOPUSH, 1);
-        if (rv != APR_SUCCESS) {
-            return rv;
-        }
-
-        /* Now write the headers */
-        arv = apr_socket_sendv(sock, hdtr->headers, hdtr->numheaders,
-                               &hdrbytes);
-        if (arv != APR_SUCCESS) {
-            *len = 0;
-            return errno;
-        }
-        nbytes += hdrbytes;
-
-        /* If this was a partial write and we aren't doing timeouts, 
-         * return now with the partial byte count; this is a non-blocking 
-         * socket.
-         */
-        total_hdrbytes = 0;
-        for (i = 0; i < hdtr->numheaders; i++) {
-            total_hdrbytes += hdtr->headers[i].iov_len;
-        }
-        if (hdrbytes < total_hdrbytes) {
-            *len = hdrbytes;
-            return apr_socket_opt_set(sock, APR_TCP_NOPUSH, 0);
-        }
-    }
-
-    if (sock->netmask & APR_INCOMPLETE_WRITE) {
-        sock->netmask &= ~APR_INCOMPLETE_WRITE;
-        goto do_select;
-    }
-
-    do {
-        rv = sendfile(sock->socketdes,    /* socket */
-                      file->filedes, /* open file descriptor of the file to be sent */
-                      &off,    /* where in the file to start */
-                      *len);   /* number of bytes to send */
-    } while (rv == -1 && errno == EINTR);
-
-    while (rv == -1 && 
-        (errno == EAGAIN || errno == EWOULDBLOCK) && 
-        apr_is_option_set(sock->netmask, APR_SO_TIMEOUT)) {
-do_select:
-        arv = apr_wait_for_io_or_timeout(NULL, sock, 0);
-        if (arv != APR_SUCCESS) {
-            *len = 0;
-            return arv;
-        }
-        else {
-            do {
-                rv = sendfile(sock->socketdes,    /* socket */
-                              file->filedes, /* open file descriptor of the file to be sent */
-                              &off,    /* where in the file to start */
-                              *len);    /* number of bytes to send */
-            } while (rv == -1 && errno == EINTR);
-        }
-    }
-
-    if (rv == -1) {
-        *len = nbytes;
-        rv = errno;
-        apr_socket_opt_set(sock, APR_TCP_NOPUSH, 0);
-        return rv;
-    }
-
-    nbytes += rv;
-
-    if (rv < *len) {
-        *len = nbytes;
-        arv = apr_socket_opt_set(sock, APR_TCP_NOPUSH, 0);
-        if (rv > 0) {
-                
-            /* If this was a partial write, return now with the 
-             * partial byte count;  this is a non-blocking socket.
-             */
-
-            if (apr_is_option_set(sock->netmask, APR_SO_TIMEOUT)) {
-                sock->netmask |= APR_INCOMPLETE_WRITE;
-            }
-            return arv;
-        }
-        else {
-            /* If the file got smaller mid-request, eventually the offset
-             * becomes equal to the new file size and the kernel returns 0.  
-             * Make this an error so the caller knows to log something and
-             * exit.
-             */
-            return APR_EOF;
-        }
-    }
-
-    /* Now write the footers */
-    if (hdtr->numtrailers > 0) {
-        apr_size_t trbytes;
-        arv = apr_socket_sendv(sock, hdtr->trailers, hdtr->numtrailers, 
-                               &trbytes);
-        nbytes += trbytes;
-        if (arv != APR_SUCCESS) {
-            *len = nbytes;
-            rv = errno;
-            apr_socket_opt_set(sock, APR_TCP_NOPUSH, 0);
-            return rv;
-        }
-    }
-
-    apr_socket_opt_set(sock, APR_TCP_NOPUSH, 0);
-    
-    (*len) = nbytes;
-    return rv < 0 ? errno : APR_SUCCESS;
-}
-
-#elif defined(__FreeBSD__)
-
-static int include_hdrs_in_length(void)
-{
-#ifdef HAVE_SYS_SYSCTL_H
-/* this assumes: 
- *   if the header exists, so does the sysctlbyname() syscall, and 
- *   if the header doesn't exist, the kernel is really old
- */
-
-/* see 
- * http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/sys/param.h#rev1.61.2.29 
- * for kernel version number
- * 
- * http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/kern/uipc_syscalls.c#rev1.65.2.10
- * for the sendfile patch
- */
-#define KERNEL_WITH_SENDFILE_LENGTH_FIX 460001
-
-    typedef enum { UNKNOWN = 0, 
-                   NEW, 
-                   OLD 
-                 } api_e;
-
-    static api_e api; 
-    int kernel_version;  
-    apr_size_t kernel_version_size;
-
-    if (api != UNKNOWN) {
-        return (api == OLD);
-    }
-    kernel_version = 0;    /* silence compiler warning */
-    kernel_version_size = sizeof(kernel_version);
-    if (sysctlbyname("kern.osreldate", &kernel_version, 
-                     &kernel_version_size, NULL, 0) == 0 &&
-        kernel_version < KERNEL_WITH_SENDFILE_LENGTH_FIX) {
-        api = OLD;
-        return 1;
-    }
-    /* size of kern.osreldate's output might change in the future 
-     * causing the sysctlbyname to fail,
-     * but if it's the future, we should use the newer API 
-     */
-    api = NEW;
-    return 0;
-#else
-    /* the build system's kernel is older than 3.4.  Use the old API */
-    return 1;
-#endif
-}
-
-/* Release 3.1 or greater */
-apr_status_t apr_socket_sendfile(apr_socket_t * sock, apr_file_t * file,
-                                 apr_hdtr_t * hdtr, apr_off_t * offset,
-                                 apr_size_t * len, apr_int32_t flags)
-{
-    off_t nbytes = 0;
-    int rv, i;
-    struct sf_hdtr headerstruct;
-    apr_size_t bytes_to_send = *len;
-
-    /* Ignore flags for now. */
-    flags = 0;
-
-    if (!hdtr) {
-        hdtr = &no_hdtr;
-    }
-
-    else if (hdtr->numheaders && include_hdrs_in_length()) {
-
-        /* On early versions of FreeBSD sendfile, the number of bytes to send 
-         * must include the length of the headers.  Don't look at the man page 
-         * for this :(  Instead, look at the the logic in 
-         * src/sys/kern/uipc_syscalls::sendfile().
-         *
-         * This was fixed in the middle of 4.6-STABLE
-         */
-        for (i = 0; i < hdtr->numheaders; i++) {
-            bytes_to_send += hdtr->headers[i].iov_len;
-        }
-    }
-
-    headerstruct.headers = hdtr->headers;
-    headerstruct.hdr_cnt = hdtr->numheaders;
-    headerstruct.trailers = hdtr->trailers;
-    headerstruct.trl_cnt = hdtr->numtrailers;
-
-    /* FreeBSD can send the headers/footers as part of the system call */
-    do {
-        if (sock->netmask & APR_INCOMPLETE_WRITE) {
-            apr_status_t arv;
-            sock->netmask &= ~APR_INCOMPLETE_WRITE;
-            arv = apr_wait_for_io_or_timeout(NULL, sock, 0);
-            if (arv != APR_SUCCESS) {
-                *len = 0;
-                return arv;
-            }
-        }
-        if (bytes_to_send) {
-            /* We won't dare call sendfile() if we don't have
-             * header or file bytes to send because bytes_to_send == 0
-             * means send the whole file.
-             */
-            rv = sendfile(file->filedes, /* file to be sent */
-                          sock->socketdes, /* socket */
-                          *offset,       /* where in the file to start */
-                          bytes_to_send, /* number of bytes to send */
-                          &headerstruct, /* Headers/footers */
-                          &nbytes,       /* number of bytes written */
-                          flags);        /* undefined, set to 0 */
-
-            if (rv == -1) {
-                if (errno == EAGAIN) {
-                    if (apr_is_option_set(sock->netmask, APR_SO_TIMEOUT)) {
-                        sock->netmask |= APR_INCOMPLETE_WRITE;
-                    }
-                    /* FreeBSD's sendfile can return -1/EAGAIN even if it
-                     * sent bytes.  Sanitize the result so we get normal EAGAIN
-                     * semantics w.r.t. bytes sent.
-                     */
-                    if (nbytes) {
-                        /* normal exit for a big file & non-blocking io */
-                        (*len) = nbytes;
-                        return APR_SUCCESS;
-                    }
-                }
-            }
-            else {       /* rv == 0 (or the kernel is broken) */
-                if (nbytes == 0) {
-                    /* Most likely the file got smaller after the stat.
-                     * Return an error so the caller can do the Right Thing.
-                     */
-                    (*len) = nbytes;
-                    return APR_EOF;
-                }
-            }
-        }    
-        else {
-            /* just trailer bytes... use writev()
-             */
-            rv = writev(sock->socketdes,
-                        hdtr->trailers,
-                        hdtr->numtrailers);
-            if (rv > 0) {
-                nbytes = rv;
-                rv = 0;
-            }
-            else {
-                nbytes = 0;
-            }
-        }
-        if (rv == -1 &&
-            errno == EAGAIN && 
-            apr_is_option_set(sock->netmask, APR_SO_TIMEOUT)) {
-            apr_status_t arv = apr_wait_for_io_or_timeout(NULL, sock, 0);
-            if (arv != APR_SUCCESS) {
-                *len = 0;
-                return arv;
-            }
-        }
-    } while (rv == -1 && (errno == EINTR || errno == EAGAIN));
-
-    (*len) = nbytes;
-    if (rv == -1) {
-        return errno;
-    }
-    return APR_SUCCESS;
-}
-
-#elif defined(__hpux) || defined(__hpux__)
-
-/* HP cc in ANSI mode defines __hpux; gcc defines __hpux__ */
-
-/* HP-UX Version 10.30 or greater
- * (no worries, because we only get here if autoconfiguration found sendfile)
- */
-
-/* ssize_t sendfile(int s, int fd, off_t offset, size_t nbytes,
- *                  const struct iovec *hdtrl, int flags);
- *
- * nbytes is the number of bytes to send just from the file; as with FreeBSD, 
- * if nbytes == 0, the rest of the file (from offset) is sent
- */
-
-apr_status_t apr_socket_sendfile(apr_socket_t *sock, apr_file_t *file,
-                                 apr_hdtr_t *hdtr, apr_off_t *offset,
-                                 apr_size_t *len, apr_int32_t flags)
-{
-    int i;
-    apr_ssize_t rc;
-    apr_size_t nbytes = *len, headerlen, trailerlen;
-    struct iovec hdtrarray[2];
-    char *headerbuf, *trailerbuf;
-
-    if (!hdtr) {
-        hdtr = &no_hdtr;
-    }
-
-    /* Ignore flags for now. */
-    flags = 0;
-
-    /* HP-UX can only send one header iovec and one footer iovec; try to
-     * only allocate storage to combine input iovecs when we really have to
-     */
-
-    switch(hdtr->numheaders) {
-    case 0:
-        hdtrarray[0].iov_base = NULL;
-        hdtrarray[0].iov_len = 0;
-        break;
-    case 1:
-        hdtrarray[0] = hdtr->headers[0];
-        break;
-    default:
-        headerlen = 0;
-        for (i = 0; i < hdtr->numheaders; i++) {
-            headerlen += hdtr->headers[i].iov_len;
-        }  
-
-        /* XXX:  BUHHH? wow, what a memory leak! */
-        headerbuf = hdtrarray[0].iov_base = apr_palloc(sock->cntxt, headerlen);
-        hdtrarray[0].iov_len = headerlen;
-
-        for (i = 0; i < hdtr->numheaders; i++) {
-            memcpy(headerbuf, hdtr->headers[i].iov_base,
-                   hdtr->headers[i].iov_len);
-            headerbuf += hdtr->headers[i].iov_len;
-        }
-    }
-
-    switch(hdtr->numtrailers) {
-    case 0:
-        hdtrarray[1].iov_base = NULL;
-        hdtrarray[1].iov_len = 0;
-        break;
-    case 1:
-        hdtrarray[1] = hdtr->trailers[0];
-        break;
-    default:
-        trailerlen = 0;
-        for (i = 0; i < hdtr->numtrailers; i++) {
-            trailerlen += hdtr->trailers[i].iov_len;
-        }
-
-        /* XXX:  BUHHH? wow, what a memory leak! */
-        trailerbuf = hdtrarray[1].iov_base = apr_palloc(sock->cntxt, trailerlen);
-        hdtrarray[1].iov_len = trailerlen;
-
-        for (i = 0; i < hdtr->numtrailers; i++) {
-            memcpy(trailerbuf, hdtr->trailers[i].iov_base,
-                   hdtr->trailers[i].iov_len);
-            trailerbuf += hdtr->trailers[i].iov_len;
-        }
-    }
-
-    do {
-        if (nbytes) {       /* any bytes to send from the file? */
-            rc = sendfile(sock->socketdes,      /* socket  */
-                          file->filedes,        /* file descriptor to send */
-                          *offset,              /* where in the file to start */
-                          nbytes,               /* number of bytes to send from file */
-                          hdtrarray,            /* Headers/footers */
-                          flags);               /* undefined, set to 0 */
-        }
-        else {              /* we can't call sendfile() with no bytes to send from the file */
-            rc = writev(sock->socketdes, hdtrarray, 2);
-        }
-    } while (rc == -1 && errno == EINTR);
-
-    while (rc == -1 && 
-        (errno == EAGAIN || errno == EWOULDBLOCK) && 
-        apr_is_option_set(sock->netmask, APR_SO_TIMEOUT)) {
-        apr_status_t arv = apr_wait_for_io_or_timeout(NULL, sock, 0);
-
-        if (arv != APR_SUCCESS) {
-            *len = 0;
-            return arv;
-        }
-        else {
-            do {
-                if (nbytes) {
-                    rc = sendfile(sock->socketdes,    /* socket  */
-                                  file->filedes,      /* file descriptor to send */
-                                  *offset,            /* where in the file to start */
-                                  nbytes,             /* number of bytes to send from file */
-                                  hdtrarray,          /* Headers/footers */
-                                  flags);             /* undefined, set to 0 */
-                }
-                else {      /* we can't call sendfile() with no bytes to send from the file */
-                    rc = writev(sock->socketdes, hdtrarray, 2);
-                }
-            } while (rc == -1 && errno == EINTR);
-        }
-    }
-
-    if (rc == -1) {
-        *len = 0;
-        return errno;
-    }
-
-    /* Set len to the number of bytes written */
-    *len = rc;
-    return APR_SUCCESS;
-}
-#elif defined(_AIX) || defined(__MVS__)
-/* AIX and OS/390 have the same send_file() interface.
- *
- * subtle differences:
- *   AIX doesn't update the file ptr but OS/390 does
- *
- * availability (correctly determined by autoconf):
- *
- * AIX -  version 4.3.2 with APAR IX85388, or version 4.3.3 and above
- * OS/390 - V2R7 and above
- */
-apr_status_t apr_socket_sendfile(apr_socket_t * sock, apr_file_t * file,
-                                 apr_hdtr_t * hdtr, apr_off_t * offset,
-                                 apr_size_t * len, apr_int32_t flags)
-{
-    int i, ptr, rv = 0;
-    void * hbuf=NULL, * tbuf=NULL;
-    apr_status_t arv;
-    struct sf_parms parms;
-
-    if (!hdtr) {
-        hdtr = &no_hdtr;
-    }
-
-    /* Ignore flags for now. */
-    flags = 0;
-
-    /* word to the wise: by default, AIX stores files sent by send_file()
-     * in the network buffer cache...  there are supposedly scenarios
-     * where the most recent copy of the file won't be sent, but I can't
-     * recreate the potential problem, perhaps because of the way we
-     * use send_file()...  if you suspect such a problem, try turning
-     * on the SF_SYNC_CACHE flag
-     */
-
-    /* AIX can also send the headers/footers as part of the system call */
-    parms.header_length = 0;
-    if (hdtr && hdtr->numheaders) {
-        if (hdtr->numheaders == 1) {
-            parms.header_data = hdtr->headers[0].iov_base;
-            parms.header_length = hdtr->headers[0].iov_len;
-        }
-        else {
-            for (i = 0; i < hdtr->numheaders; i++) {
-                parms.header_length += hdtr->headers[i].iov_len;
-            }
-#if 0
-            /* Keepalives make apr_palloc a bad idea */
-            hbuf = malloc(parms.header_length);
-#else
-            /* but headers are small, so maybe we can hold on to the
-             * memory for the life of the socket...
-             */
-            hbuf = apr_palloc(sock->cntxt, parms.header_length);
-#endif
-            ptr = 0;
-            for (i = 0; i < hdtr->numheaders; i++) {
-                memcpy((char *)hbuf + ptr, hdtr->headers[i].iov_base,
-                       hdtr->headers[i].iov_len);
-                ptr += hdtr->headers[i].iov_len;
-            }
-            parms.header_data = hbuf;
-        }
-    }
-    else parms.header_data = NULL;
-    parms.trailer_length = 0;
-    if (hdtr && hdtr->numtrailers) {
-        if (hdtr->numtrailers == 1) {
-            parms.trailer_data = hdtr->trailers[0].iov_base;
-            parms.trailer_length = hdtr->trailers[0].iov_len;
-        }
-        else {
-            for (i = 0; i < hdtr->numtrailers; i++) {
-                parms.trailer_length += hdtr->trailers[i].iov_len;
-            }
-#if 0
-            /* Keepalives make apr_palloc a bad idea */
-            tbuf = malloc(parms.trailer_length);
-#else
-            tbuf = apr_palloc(sock->cntxt, parms.trailer_length);
-#endif
-            ptr = 0;
-            for (i = 0; i < hdtr->numtrailers; i++) {
-                memcpy((char *)tbuf + ptr, hdtr->trailers[i].iov_base,
-                       hdtr->trailers[i].iov_len);
-                ptr += hdtr->trailers[i].iov_len;
-            }
-            parms.trailer_data = tbuf;
-        }
-    }
-    else {
-        parms.trailer_data = NULL;
-    }
-
-    /* Whew! Headers and trailers set up. Now for the file data */
-
-    parms.file_descriptor = file->filedes;
-    parms.file_offset = *offset;
-    parms.file_bytes = *len;
-
-    /* O.K. All set up now. Let's go to town */
-
-    if (sock->netmask & APR_INCOMPLETE_WRITE) {
-        sock->netmask &= ~APR_INCOMPLETE_WRITE;
-        goto do_select;
-    }
-
-    do {
-        rv = send_file(&(sock->socketdes), /* socket */
-                       &(parms),           /* all data */
-                       flags);             /* flags */
-    } while (rv == -1 && errno == EINTR);
-
-    while (rv == -1 &&
-        (errno == EAGAIN || errno == EWOULDBLOCK) &&
-        apr_is_option_set(sock->netmask, APR_SO_TIMEOUT)) {
-do_select:
-        arv = apr_wait_for_io_or_timeout(NULL, sock, 0);
-        if (arv != APR_SUCCESS) {
-            *len = 0;
-            return arv;
-        }
-        else {
-            do {
-                rv = send_file(&(sock->socketdes), /* socket */
-                               &(parms),           /* all data */
-                               flags);             /* flags */
-            } while (rv == -1 && errno == EINTR);
-        }
-    }
-
-    (*len) = parms.bytes_sent;
-
-#if 0
-    /* Clean up after ourselves */
-    if(hbuf) free(hbuf);
-    if(tbuf) free(tbuf);
-#endif
-
-    if (rv == -1) {
-        return errno;
-    }
-
-    if (apr_is_option_set(sock->netmask, APR_SO_TIMEOUT) &&
-        (parms.bytes_sent < (parms.file_bytes + parms.header_length + parms.trailer_length))) {
-        sock->netmask |= APR_INCOMPLETE_WRITE;
-    }
-
-    return APR_SUCCESS;
-}
-#elif defined(__osf__) && defined (__alpha)
-/* Tru64's sendfile implementation doesn't work, and we need to make sure that
- * we don't use it until it is fixed.  If it is used as it is now, it will
- * hang the machine and the only way to fix it is a reboot.
- */
-#elif defined(HAVE_SENDFILEV)
-/* Solaris 8's sendfilev() interface 
- *
- * SFV_FD_SELF refers to our memory space.
- *
- * Required Sparc patches (or newer):
- * 111297-01, 108528-09, 109472-06, 109234-03, 108995-02, 111295-01, 109025-03,
- * 108991-13
- * Required x86 patches (or newer):
- * 111298-01, 108529-09, 109473-06, 109235-04, 108996-02, 111296-01, 109026-04,
- * 108992-13
- */
-apr_status_t apr_socket_sendfile(apr_socket_t *sock, apr_file_t *file,
-                                 apr_hdtr_t *hdtr, apr_off_t *offset,
-                                 apr_size_t *len, apr_int32_t flags)
-{
-    apr_status_t rv, arv;
-    apr_size_t nbytes;
-    sendfilevec_t *sfv;
-    int vecs, curvec, i, repeat;
-    apr_size_t requested_len = 0;
-
-    if (!hdtr) {
-        hdtr = &no_hdtr;
-    }
-
-    /* Ignore flags for now. */
-    flags = 0;
-
-    /* Calculate how much space we need. */
-    vecs = hdtr->numheaders + hdtr->numtrailers + 1;
-    sfv = apr_palloc(sock->cntxt, sizeof(sendfilevec_t) * vecs);
-
-    curvec = 0;
-
-    /* Add the headers */
-    for (i = 0; i < hdtr->numheaders; i++, curvec++) {
-        sfv[curvec].sfv_fd = SFV_FD_SELF;
-        sfv[curvec].sfv_flag = 0;
-        sfv[curvec].sfv_off = (off_t)hdtr->headers[i].iov_base;
-        sfv[curvec].sfv_len = hdtr->headers[i].iov_len;
-        requested_len += sfv[curvec].sfv_len;
-    }
-
-    /* If the len is 0, we skip the file. */
-    if (*len)
-    {
-        sfv[curvec].sfv_fd = file->filedes;
-        sfv[curvec].sfv_flag = 0;
-        sfv[curvec].sfv_off = *offset;
-        sfv[curvec].sfv_len = *len; 
-        requested_len += sfv[curvec].sfv_len;
-
-        curvec++;
-    }
-    else {
-        vecs--;
-    }
-
-    /* Add the footers */
-    for (i = 0; i < hdtr->numtrailers; i++, curvec++) {
-        sfv[curvec].sfv_fd = SFV_FD_SELF;
-        sfv[curvec].sfv_flag = 0;
-        sfv[curvec].sfv_off = (off_t)hdtr->trailers[i].iov_base;
-        sfv[curvec].sfv_len = hdtr->trailers[i].iov_len;
-        requested_len += sfv[curvec].sfv_len;
-    }
-
-    /* If the last write couldn't send all the requested data,
-     * wait for the socket to become writable before proceeding
-     */
-    if (sock->netmask & APR_INCOMPLETE_WRITE) {
-        sock->netmask &= ~APR_INCOMPLETE_WRITE;
-        arv = apr_wait_for_io_or_timeout(NULL, sock, 0);
-        if (arv != APR_SUCCESS) {
-            *len = 0;
-            return arv;
-        }
-    }
- 
-    /* Actually do the sendfilev
-     *
-     * Solaris may return -1/EAGAIN even if it sent bytes on a non-block sock.
-     *
-     * If no bytes were originally sent (nbytes == 0) and we are on a TIMEOUT 
-     * socket (which as far as the OS is concerned is a non-blocking socket), 
-     * we want to retry after waiting for the other side to read the data (as 
-     * determined by poll).  Once it is clear to send, we want to retry
-     * sending the sendfilevec_t once more.
-     */
-    arv = 0;
-    do {
-        /* Clear out the repeat */
-        repeat = 0;
-
-        /* socket, vecs, number of vecs, bytes written */
-        rv = sendfilev(sock->socketdes, sfv, vecs, &nbytes);
-
-        if (rv == -1 && errno == EAGAIN) {
-            if (nbytes) {
-                rv = 0;
-            }
-            else if (!arv &&
-                     apr_is_option_set(sock->netmask, APR_SO_TIMEOUT) == 1) {
-                apr_status_t t = apr_wait_for_io_or_timeout(NULL, sock, 0);
-
-                if (t != APR_SUCCESS) {
-                    *len = 0;
-                    return t;
-                }
-
-                arv = 1; 
-                repeat = 1;
-            }
-        }
-    } while ((rv == -1 && errno == EINTR) || repeat);
-
-    if (rv == -1) {
-        *len = 0;
-        return errno;
-    }
-
-    /* Update how much we sent */
-    *len = nbytes;
-    if (apr_is_option_set(sock->netmask, APR_SO_TIMEOUT) &&
-        (*len < requested_len)) {
-        sock->netmask |= APR_INCOMPLETE_WRITE;
-    }
-    return APR_SUCCESS;
-}
-#else
-#error APR has detected sendfile on your system, but nobody has written a
-#error version of it for APR yet.  To get past this, either write apr_sendfile
-#error or change APR_HAS_SENDFILE in apr.h to 0. 
-#endif /* __linux__, __FreeBSD__, __HPUX__, _AIX, __MVS__, Tru64/OSF1 */
-
-/* deprecated */
-apr_status_t apr_sendfile(apr_socket_t *sock, apr_file_t *file,
-                          apr_hdtr_t *hdtr, apr_off_t *offset, apr_size_t *len,
-                          apr_int32_t flags)
-{
-    return apr_socket_sendfile(sock, file, hdtr, offset, len, flags);
-}
-
-#endif /* APR_HAS_SENDFILE */
-
-/* deprecated */
-apr_status_t apr_send(apr_socket_t *sock, const char *buf, apr_size_t *len)
-{
-    return apr_socket_send(sock, buf, len);
-}
-
-/* deprecated */
-#ifdef HAVE_WRITEV
-apr_status_t apr_sendv(apr_socket_t * sock, const struct iovec *vec,
-                       apr_int32_t nvec, apr_size_t *len)
-{
-    return apr_socket_sendv(sock, vec, nvec, len);
-}
-#endif
-
-/* deprecated */
-apr_status_t apr_sendto(apr_socket_t *sock, apr_sockaddr_t *where,
-                        apr_int32_t flags, const char *buf, apr_size_t *len)
-{
-    return apr_socket_sendto(sock, where, flags, buf, len);
-}
-
-/* deprecated */
-apr_status_t apr_recvfrom(apr_sockaddr_t *from, apr_socket_t *sock,
-                          apr_int32_t flags, char *buf, 
-                          apr_size_t *len)
-{
-    return apr_socket_recvfrom(from, sock, flags, buf, len);
-}
-
-/* deprecated */
-apr_status_t apr_recv(apr_socket_t *sock, char *buf, apr_size_t *len)
-{
-    return apr_socket_recv(sock, buf, len);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sendrecv.lo b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sendrecv.lo
deleted file mode 100644
index efa524a6..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sendrecv.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# sendrecv.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/sendrecv.o'
-
-# Name of the non-PIC object.
-non_pic_object='sendrecv.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sendrecv.o b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sendrecv.o
deleted file mode 100644
index 4584807f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sendrecv.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockaddr.c b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockaddr.c
deleted file mode 100644
index 4ac965d7..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockaddr.c
+++ /dev/null
@@ -1,985 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_networkio.h"
-#include "apr_strings.h"
-#include "apr.h"
-#include "apr_lib.h"
-#include "apr_strings.h"
-#include "apr_private.h"
-
-#if APR_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#define APR_WANT_STRFUNC
-#include "apr_want.h"
-
-struct apr_ipsubnet_t {
-    int family;
-#if APR_HAVE_IPV6
-    apr_uint32_t sub[4]; /* big enough for IPv4 and IPv6 addresses */
-    apr_uint32_t mask[4];
-#else
-    apr_uint32_t sub[1];
-    apr_uint32_t mask[1];
-#endif
-};
-
-#if !defined(NETWARE) && !defined(WIN32)
-#ifdef HAVE_SET_H_ERRNO
-#define SET_H_ERRNO(newval) set_h_errno(newval)
-#else
-#define SET_H_ERRNO(newval) h_errno = (newval)
-#endif
-#else
-#define SET_H_ERRNO(newval)
-#endif
-
-#if APR_HAS_THREADS && !defined(GETHOSTBYNAME_IS_THREAD_SAFE) && \
-    defined(HAVE_GETHOSTBYNAME_R)
-/* This is the maximum size that may be returned from the reentrant
- * gethostbyname_r function.  If the system tries to use more, it
- * should return ERANGE.
- */
-#define GETHOSTBYNAME_BUFLEN 512
-#endif
-
-#ifdef _WIN32_WCE
-/* XXX: BS solution.  Need an HAVE_GETSERVBYNAME and actually
- * do something here, to provide the obvious proto mappings.
- */
-static void *getservbyname(const char *name, const char *proto)
-{
-    return NULL;
-}
-#endif
-
-static apr_status_t get_local_addr(apr_socket_t *sock)
-{
-    sock->local_addr->salen = sizeof(sock->local_addr->sa);
-    if (getsockname(sock->socketdes, (struct sockaddr *)&sock->local_addr->sa,
-                    &sock->local_addr->salen) < 0) {
-        return apr_get_netos_error();
-    }
-    else {
-        sock->local_port_unknown = sock->local_interface_unknown = 0;
-        /* XXX assumes sin_port and sin6_port at same offset */
-        sock->local_addr->port = ntohs(sock->local_addr->sa.sin.sin_port);
-        return APR_SUCCESS;
-    }
-}
-
-static apr_status_t get_remote_addr(apr_socket_t *sock)
-{
-    sock->remote_addr->salen = sizeof(sock->remote_addr->sa);
-    if (getpeername(sock->socketdes, (struct sockaddr *)&sock->remote_addr->sa,
-                    &sock->remote_addr->salen) < 0) {
-        return apr_get_netos_error();
-    }
-    else {
-        sock->remote_addr_unknown = 0;
-        /* XXX assumes sin_port and sin6_port at same offset */
-        sock->remote_addr->port = ntohs(sock->remote_addr->sa.sin.sin_port);
-        return APR_SUCCESS;
-    }
-}
-
-APR_DECLARE(apr_status_t) apr_sockaddr_port_set(apr_sockaddr_t *sockaddr,
-                                       apr_port_t port)
-{
-    sockaddr->port = port;
-    /* XXX IPv6: assumes sin_port and sin6_port at same offset */
-    sockaddr->sa.sin.sin_port = htons(port);
-    return APR_SUCCESS;
-}
-
-/* XXX assumes IPv4... I don't think this function is needed anyway
- * since we have apr_sockaddr_info_get(), but we need to clean up Apache's 
- * listen.c a bit more first.
- */
-APR_DECLARE(apr_status_t) apr_sockaddr_ip_set(apr_sockaddr_t *sockaddr,
-                                         const char *addr)
-{
-    apr_uint32_t ipaddr;
-    
-    if (!strcmp(addr, APR_ANYADDR)) {
-        sockaddr->sa.sin.sin_addr.s_addr = htonl(INADDR_ANY);
-        return APR_SUCCESS;
-    }
-    
-    ipaddr = inet_addr(addr);
-    if (ipaddr == (apr_uint32_t)-1) {
-#ifdef WIN32
-        return WSAEADDRNOTAVAIL;
-#else
-        return errno;
-#endif
-    }
-    
-    sockaddr->sa.sin.sin_addr.s_addr = ipaddr;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_sockaddr_port_get(apr_port_t *port,
-                                       apr_sockaddr_t *sockaddr)
-{
-    *port = sockaddr->port;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_sockaddr_ip_get(char **addr,
-                                         apr_sockaddr_t *sockaddr)
-{
-    *addr = apr_palloc(sockaddr->pool, sockaddr->addr_str_len);
-    apr_inet_ntop(sockaddr->family,
-                  sockaddr->ipaddr_ptr,
-                  *addr,
-                  sockaddr->addr_str_len);
-#if APR_HAVE_IPV6
-    if (sockaddr->family == AF_INET6 &&
-        IN6_IS_ADDR_V4MAPPED((struct in6_addr *)sockaddr->ipaddr_ptr)) {
-        /* This is an IPv4-mapped IPv6 address; drop the leading
-         * part of the address string so we're left with the familiar
-         * IPv4 format.
-         */
-        *addr += strlen("::ffff:");
-    }
-#endif
-    return APR_SUCCESS;
-}
-
-void apr_sockaddr_vars_set(apr_sockaddr_t *addr, int family, apr_port_t port)
-{
-    addr->family = family;
-    addr->sa.sin.sin_family = family;
-    if (port) {
-        /* XXX IPv6: assumes sin_port and sin6_port at same offset */
-        addr->sa.sin.sin_port = htons(port);
-        addr->port = port;
-    }
-
-    if (family == APR_INET) {
-        addr->salen = sizeof(struct sockaddr_in);
-        addr->addr_str_len = 16;
-        addr->ipaddr_ptr = &(addr->sa.sin.sin_addr);
-        addr->ipaddr_len = sizeof(struct in_addr);
-    }
-#if APR_HAVE_IPV6
-    else if (family == APR_INET6) {
-        addr->salen = sizeof(struct sockaddr_in6);
-        addr->addr_str_len = 46;
-        addr->ipaddr_ptr = &(addr->sa.sin6.sin6_addr);
-        addr->ipaddr_len = sizeof(struct in6_addr);
-    }
-#endif
-}
-
-APR_DECLARE(apr_status_t) apr_socket_addr_get(apr_sockaddr_t **sa,
-                                           apr_interface_e which,
-                                           apr_socket_t *sock)
-{
-    if (which == APR_LOCAL) {
-        if (sock->local_interface_unknown || sock->local_port_unknown) {
-            apr_status_t rv = get_local_addr(sock);
-
-            if (rv != APR_SUCCESS) {
-                return rv;
-            }
-        }
-        *sa = sock->local_addr;
-    }
-    else if (which == APR_REMOTE) {
-        if (sock->remote_addr_unknown) {
-            apr_status_t rv = get_remote_addr(sock);
-
-            if (rv != APR_SUCCESS) {
-                return rv;
-            }
-        }
-        *sa = sock->remote_addr;
-    }
-    else {
-        *sa = NULL;
-        return APR_EINVAL;
-    }
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_parse_addr_port(char **addr,
-                                              char **scope_id,
-                                              apr_port_t *port,
-                                              const char *str,
-                                              apr_pool_t *p)
-{
-    const char *ch, *lastchar;
-    int big_port;
-    apr_size_t addrlen;
-
-    *addr = NULL;         /* assume not specified */
-    *scope_id = NULL;     /* assume not specified */
-    *port = 0;            /* assume not specified */
-
-    /* First handle the optional port number.  That may be all that
-     * is specified in the string.
-     */
-    ch = lastchar = str + strlen(str) - 1;
-    while (ch >= str && apr_isdigit(*ch)) {
-        --ch;
-    }
-
-    if (ch < str) {       /* Entire string is the port. */
-        big_port = atoi(str);
-        if (big_port < 1 || big_port > 65535) {
-            return APR_EINVAL;
-        }
-        *port = big_port;
-        return APR_SUCCESS;
-    }
-
-    if (*ch == ':' && ch < lastchar) { /* host and port number specified */
-        if (ch == str) {               /* string starts with ':' -- bad */
-            return APR_EINVAL;
-        }
-        big_port = atoi(ch + 1);
-        if (big_port < 1 || big_port > 65535) {
-            return APR_EINVAL;
-        }
-        *port = big_port;
-        lastchar = ch - 1;
-    }
-
-    /* now handle the hostname */
-    addrlen = lastchar - str + 1;
-
-/* XXX we don't really have to require APR_HAVE_IPV6 for this; 
- * just pass char[] for ipaddr (so we don't depend on struct in6_addr)
- * and always define APR_INET6 
- */
-#if APR_HAVE_IPV6
-    if (*str == '[') {
-        const char *end_bracket = memchr(str, ']', addrlen);
-        struct in6_addr ipaddr;
-        const char *scope_delim;
-
-        if (!end_bracket || end_bracket != lastchar) {
-            *port = 0;
-            return APR_EINVAL;
-        }
-
-        /* handle scope id; this is the only context where it is allowed */
-        scope_delim = memchr(str, '%', addrlen);
-        if (scope_delim) {
-            if (scope_delim == end_bracket - 1) { /* '%' without scope id */
-                *port = 0;
-                return APR_EINVAL;
-            }
-            addrlen = scope_delim - str - 1;
-            *scope_id = apr_palloc(p, end_bracket - scope_delim);
-            memcpy(*scope_id, scope_delim + 1, end_bracket - scope_delim - 1);
-            (*scope_id)[end_bracket - scope_delim - 1] = '\0';
-        }
-        else {
-            addrlen = addrlen - 2; /* minus 2 for '[' and ']' */
-        }
-
-        *addr = apr_palloc(p, addrlen + 1);
-        memcpy(*addr,
-               str + 1,
-               addrlen);
-        (*addr)[addrlen] = '\0';
-        if (apr_inet_pton(AF_INET6, *addr, &ipaddr) != 1) {
-            *addr = NULL;
-            *scope_id = NULL;
-            *port = 0;
-            return APR_EINVAL;
-        }
-    }
-    else 
-#endif
-    {
-        /* XXX If '%' is not a valid char in a DNS name, we *could* check 
-         *     for bogus scope ids first.
-         */
-        *addr = apr_palloc(p, addrlen + 1);
-        memcpy(*addr, str, addrlen);
-        (*addr)[addrlen] = '\0';
-    }
-    return APR_SUCCESS;
-}
-
-#if defined(HAVE_GETADDRINFO)
-
-static apr_status_t call_resolver(apr_sockaddr_t **sa,
-                                  const char *hostname, apr_int32_t family,
-                                  apr_port_t port, apr_int32_t flags, 
-                                  apr_pool_t *p)
-{
-    struct addrinfo hints, *ai, *ai_list;
-    apr_sockaddr_t *prev_sa;
-    int error;
-    char *servname = NULL; 
-
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family = family;
-    hints.ai_socktype = SOCK_STREAM;
-    if(hostname == NULL) {
-#ifdef AI_PASSIVE 
-        /* If hostname is NULL, assume we are trying to bind to all
-         * interfaces. */
-        hints.ai_flags |= AI_PASSIVE;
-#endif
-        /* getaddrinfo according to RFC 2553 must have either hostname
-         * or servname non-NULL.
-         */
-#ifdef _AIX
-        /* But current AIX getaddrinfo() doesn't like servname = "0";
-         * the "1" won't hurt since we use the port parameter to fill
-         * in the returned socket addresses later
-         */
-        if (!port) {
-            servname = "1";
-        }
-        else
-#endif
-        servname = apr_itoa(p, port);
-    }
-    error = getaddrinfo(hostname, servname, &hints, &ai_list);
-    if (error) {
-#ifndef WIN32
-        if (error == EAI_SYSTEM) {
-            return errno;
-        }
-        else 
-#endif
-        {
-            /* issues with representing this with APR's error scheme:
-             * glibc uses negative values for these numbers, perhaps so 
-             * they don't conflict with h_errno values...  Tru64 uses 
-             * positive values which conflict with h_errno values
-             */
-#if defined(NEGATIVE_EAI)
-            error = -error;
-#endif
-            return error + APR_OS_START_EAIERR;
-        }
-    }
-
-    prev_sa = NULL;
-    ai = ai_list;
-    while (ai) { /* while more addresses to report */
-        apr_sockaddr_t *new_sa;
-
-        /* Ignore anything bogus: getaddrinfo in some old versions of
-         * glibc will return AF_UNIX entries for AF_UNSPEC+AI_PASSIVE
-         * lookups. */
-        if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6) {
-            ai = ai->ai_next;
-            continue;
-        }
-
-        new_sa = apr_pcalloc(p, sizeof(apr_sockaddr_t));
-
-        new_sa->pool = p;
-        memcpy(&new_sa->sa, ai->ai_addr, ai->ai_addrlen);
-        apr_sockaddr_vars_set(new_sa, ai->ai_family, port);
-
-        if (!prev_sa) { /* first element in new list */
-            if (hostname) {
-                new_sa->hostname = apr_pstrdup(p, hostname);
-            }
-            *sa = new_sa;
-        }
-        else {
-            new_sa->hostname = prev_sa->hostname;
-            prev_sa->next = new_sa;
-        }
-
-        prev_sa = new_sa;
-        ai = ai->ai_next;
-    }
-    freeaddrinfo(ai_list);
-    return APR_SUCCESS;
-}
-
-static apr_status_t find_addresses(apr_sockaddr_t **sa, 
-                                   const char *hostname, apr_int32_t family,
-                                   apr_port_t port, apr_int32_t flags, 
-                                   apr_pool_t *p)
-{
-    if (flags & APR_IPV4_ADDR_OK) {
-        apr_status_t error = call_resolver(sa, hostname, AF_INET, port, flags, p);
-
-#if APR_HAVE_IPV6
-        if (error) {
-            family = AF_INET6; /* try again */
-        }
-        else
-#endif
-        return error;
-    }
-#if APR_HAVE_IPV6
-    else if (flags & APR_IPV6_ADDR_OK) {
-        apr_status_t error = call_resolver(sa, hostname, AF_INET6, port, flags, p);
-
-        if (error) {
-            family = AF_INET; /* try again */
-        }
-        else {
-            return APR_SUCCESS;
-        }
-    }
-#endif
-
-    return call_resolver(sa, hostname, family, port, flags, p);
-}
-
-#else /* end of HAVE_GETADDRINFO code */
-
-static apr_status_t find_addresses(apr_sockaddr_t **sa, 
-                                   const char *hostname, apr_int32_t family,
-                                   apr_port_t port, apr_int32_t flags, 
-                                   apr_pool_t *p)
-{
-    struct hostent *hp;
-    apr_sockaddr_t *prev_sa;
-    int curaddr;
-#if APR_HAS_THREADS && !defined(GETHOSTBYNAME_IS_THREAD_SAFE) && \
-    defined(HAVE_GETHOSTBYNAME_R) && !defined(BEOS)
-#ifdef GETHOSTBYNAME_R_HOSTENT_DATA
-    struct hostent_data hd;
-#else
-    /* If you see ERANGE, that means GETHOSBYNAME_BUFLEN needs to be
-     * bumped. */
-    char tmp[GETHOSTBYNAME_BUFLEN];
-#endif
-    int hosterror;
-#endif
-    struct hostent hs;
-    struct in_addr ipaddr;
-    char *addr_list[2];
-    const char *orig_hostname = hostname;
-
-    if (hostname == NULL) {
-        /* if we are given a NULL hostname, assume '0.0.0.0' */
-        hostname = "0.0.0.0";
-    }
-
-    if (*hostname >= '0' && *hostname <= '9' &&
-        strspn(hostname, "0123456789.") == strlen(hostname)) {
-
-        ipaddr.s_addr = inet_addr(hostname);
-        addr_list[0] = (char *)&ipaddr;
-        addr_list[1] = NULL; /* just one IP in list */
-        hs.h_addr_list = (char **)addr_list;
-        hp = &hs;
-    }
-    else {
-#if APR_HAS_THREADS && !defined(GETHOSTBYNAME_IS_THREAD_SAFE) && \
-    defined(HAVE_GETHOSTBYNAME_R) && !defined(BEOS)
-#if defined(GETHOSTBYNAME_R_HOSTENT_DATA)
-        /* AIX, HP/UX, D/UX et alia */
-        gethostbyname_r(hostname, &hs, &hd);
-        hp = &hs;
-#else
-#if defined(GETHOSTBYNAME_R_GLIBC2)
-        /* Linux glibc2+ */
-        gethostbyname_r(hostname, &hs, tmp, GETHOSTBYNAME_BUFLEN - 1, 
-                        &hp, &hosterror);
-#else
-        /* Solaris, Irix et alia */
-        hp = gethostbyname_r(hostname, &hs, tmp, GETHOSTBYNAME_BUFLEN - 1,
-                             &hosterror);
-#endif /* !defined(GETHOSTBYNAME_R_GLIBC2) */
-        if (!hp) {
-            return (hosterror + APR_OS_START_SYSERR);
-        }
-#endif /* !defined(GETHOSTBYNAME_R_HOSTENT_DATA) */
-#else
-        hp = gethostbyname(hostname);
-#endif
-
-        if (!hp) {
-#ifdef WIN32
-            return apr_get_netos_error();
-#else
-            return (h_errno + APR_OS_START_SYSERR);
-#endif
-        }
-    }
-
-    prev_sa = NULL;
-    curaddr = 0;
-    while (hp->h_addr_list[curaddr]) {
-        apr_sockaddr_t *new_sa = apr_pcalloc(p, sizeof(apr_sockaddr_t));
-
-        new_sa->pool = p;
-        new_sa->sa.sin.sin_addr = *(struct in_addr *)hp->h_addr_list[curaddr];
-        apr_sockaddr_vars_set(new_sa, AF_INET, port);
-
-        if (!prev_sa) { /* first element in new list */
-            if (orig_hostname) {
-                new_sa->hostname = apr_pstrdup(p, orig_hostname);
-            }
-            *sa = new_sa;
-        }
-        else {
-            new_sa->hostname = prev_sa->hostname;
-            prev_sa->next = new_sa;
-        }
-
-        prev_sa = new_sa;
-        ++curaddr;
-    }
-
-    return APR_SUCCESS;
-}
-
-#endif /* end of !HAVE_GETADDRINFO code */
-
-APR_DECLARE(apr_status_t) apr_sockaddr_info_get(apr_sockaddr_t **sa,
-                                                const char *hostname, 
-                                                apr_int32_t family, apr_port_t port,
-                                                apr_int32_t flags, apr_pool_t *p)
-{
-    apr_int32_t masked;
-    *sa = NULL;
-
-    if ((masked = flags & (APR_IPV4_ADDR_OK | APR_IPV6_ADDR_OK))) {
-        if (!hostname ||
-            family != AF_UNSPEC ||
-            masked == (APR_IPV4_ADDR_OK | APR_IPV6_ADDR_OK)) {
-            return APR_EINVAL;
-        }
-#if !APR_HAVE_IPV6
-        if (flags & APR_IPV6_ADDR_OK) {
-            return APR_ENOTIMPL;
-        }
-#endif
-    }
-#if !APR_HAVE_IPV6
-    /* What may happen is that APR is not IPv6-enabled, but we're still
-     * going to call getaddrinfo(), so we have to tell the OS we only
-     * want IPv4 addresses back since we won't know what to do with
-     * IPv6 addresses.
-     */
-    if (family == APR_UNSPEC) {
-        family = APR_INET;
-    }
-#endif
-
-    return find_addresses(sa, hostname, family, port, flags, p);
-}
-
-APR_DECLARE(apr_status_t) apr_getnameinfo(char **hostname,
-                                          apr_sockaddr_t *sockaddr,
-                                          apr_int32_t flags)
-{
-#if defined(HAVE_GETNAMEINFO)
-    int rc;
-#if defined(NI_MAXHOST)
-    char tmphostname[NI_MAXHOST];
-#else
-    char tmphostname[256];
-#endif
-
-    /* don't know if it is portable for getnameinfo() to set h_errno;
-     * clear it then see if it was set */
-    SET_H_ERRNO(0);
-
-    /* default flags are NI_NAMREQD; otherwise, getnameinfo() will return
-     * a numeric address string if it fails to resolve the host name;
-     * that is *not* what we want here
-     *
-     * For IPv4-mapped IPv6 addresses, drop down to IPv4 before calling
-     * getnameinfo() to avoid getnameinfo bugs (MacOS X, glibc).
-     */
-#if APR_HAVE_IPV6
-    if (sockaddr->family == AF_INET6 &&
-        IN6_IS_ADDR_V4MAPPED(&sockaddr->sa.sin6.sin6_addr)) {
-        struct sockaddr_in tmpsa;
-        tmpsa.sin_family = AF_INET;
-        tmpsa.sin_port = 0;
-        tmpsa.sin_addr.s_addr = ((apr_uint32_t *)sockaddr->ipaddr_ptr)[3];
-#ifdef SIN6_LEN
-        tmpsa.sin_len = sizeof(tmpsa);
-#endif
-
-        rc = getnameinfo((const struct sockaddr *)&tmpsa, sizeof(tmpsa),
-                         tmphostname, sizeof(tmphostname), NULL, 0,
-                         flags != 0 ? flags : NI_NAMEREQD);
-    }
-    else
-#endif
-    rc = getnameinfo((const struct sockaddr *)&sockaddr->sa, sockaddr->salen,
-                     tmphostname, sizeof(tmphostname), NULL, 0,
-                     flags != 0 ? flags : NI_NAMEREQD);
-    if (rc != 0) {
-        *hostname = NULL;
-
-#ifndef WIN32
-        /* something went wrong. Look at the EAI_ error code */
-        if (rc == EAI_SYSTEM) {
-            /* EAI_SYSTEM      System error returned in errno. */
-            /* IMHO, Implementations that set h_errno a simply broken. */
-            if (h_errno) { /* for broken implementations which set h_errno */
-                return h_errno + APR_OS_START_SYSERR;
-            }
-            else { /* "normal" case */
-                return errno + APR_OS_START_SYSERR;
-            }
-        }
-        else 
-#endif
-        {
-#if defined(NEGATIVE_EAI)
-            if (rc < 0) rc = -rc;
-#endif
-            return rc + APR_OS_START_EAIERR; /* return the EAI_ error */
-        }
-    }
-    *hostname = sockaddr->hostname = apr_pstrdup(sockaddr->pool, 
-                                                 tmphostname);
-    return APR_SUCCESS;
-#else
-#if APR_HAS_THREADS && !defined(GETHOSTBYADDR_IS_THREAD_SAFE) && \
-    defined(HAVE_GETHOSTBYADDR_R) && !defined(BEOS)
-#ifdef GETHOSTBYNAME_R_HOSTENT_DATA
-    struct hostent_data hd;
-#else
-    char tmp[GETHOSTBYNAME_BUFLEN];
-#endif
-    int hosterror;
-    struct hostent hs, *hptr;
-
-#if defined(GETHOSTBYNAME_R_HOSTENT_DATA)
-    /* AIX, HP/UX, D/UX et alia */
-    gethostbyaddr_r((char *)&sockaddr->sa.sin.sin_addr, 
-                  sizeof(struct in_addr), AF_INET, &hs, &hd);
-    hptr = &hs;
-#else
-#if defined(GETHOSTBYNAME_R_GLIBC2)
-    /* Linux glibc2+ */
-    gethostbyaddr_r((char *)&sockaddr->sa.sin.sin_addr, 
-                    sizeof(struct in_addr), AF_INET,
-                    &hs, tmp, GETHOSTBYNAME_BUFLEN - 1, &hptr, &hosterror);
-#else
-    /* Solaris, Irix et alia */
-    hptr = gethostbyaddr_r((char *)&sockaddr->sa.sin.sin_addr, 
-                           sizeof(struct in_addr), AF_INET,
-                           &hs, tmp, GETHOSTBYNAME_BUFLEN, &hosterror);
-#endif /* !defined(GETHOSTBYNAME_R_GLIBC2) */
-    if (!hptr) {
-        *hostname = NULL;
-        return hosterror + APR_OS_START_SYSERR;
-    }
-#endif /* !defined(GETHOSTBYNAME_R_HOSTENT_DATA) */
-#else
-    struct hostent *hptr;
-    hptr = gethostbyaddr((char *)&sockaddr->sa.sin.sin_addr, 
-                         sizeof(struct in_addr), AF_INET);
-#endif
-
-    if (hptr) {
-        *hostname = sockaddr->hostname = apr_pstrdup(sockaddr->pool, hptr->h_name);
-        return APR_SUCCESS;
-    }
-    *hostname = NULL;
-#if defined(WIN32)
-    return apr_get_netos_error();
-#elif defined(OS2)
-    return h_errno;
-#else
-    return h_errno + APR_OS_START_SYSERR;
-#endif
-#endif
-}
-
-APR_DECLARE(apr_status_t) apr_getservbyname(apr_sockaddr_t *sockaddr,
-                                            const char *servname)
-{
-    struct servent *se;
-
-    if (servname == NULL)
-        return APR_EINVAL;
-
-    if ((se = getservbyname(servname, NULL)) != NULL){
-        sockaddr->port = htons(se->s_port);
-        sockaddr->servname = apr_pstrdup(sockaddr->pool, servname);
-        sockaddr->sa.sin.sin_port = se->s_port;
-        return APR_SUCCESS;
-    }
-    return APR_ENOENT;
-}
-
-#define V4MAPPED_EQUAL(a,b)                                   \
-((a)->sa.sin.sin_family == AF_INET &&                         \
- (b)->sa.sin.sin_family == AF_INET6 &&                        \
- IN6_IS_ADDR_V4MAPPED((struct in6_addr *)(b)->ipaddr_ptr) &&  \
- !memcmp((a)->ipaddr_ptr,                                     \
-         &((struct in6_addr *)(b)->ipaddr_ptr)->s6_addr[12],  \
-         (a)->ipaddr_len))
-
-APR_DECLARE(int) apr_sockaddr_equal(const apr_sockaddr_t *addr1,
-                                    const apr_sockaddr_t *addr2)
-{
-    if (addr1->ipaddr_len == addr2->ipaddr_len &&
-        !memcmp(addr1->ipaddr_ptr, addr2->ipaddr_ptr, addr1->ipaddr_len)) {
-        return 1;
-    }
-#if APR_HAVE_IPV6
-    if (V4MAPPED_EQUAL(addr1, addr2)) {
-        return 1;
-    }
-    if (V4MAPPED_EQUAL(addr2, addr1)) {
-        return 1;
-    }
-#endif
-    return 0; /* not equal */
-}
-
-static apr_status_t parse_network(apr_ipsubnet_t *ipsub, const char *network)
-{
-    /* legacy syntax for ip addrs: a.b.c. ==> a.b.c.0/24 for example */
-    int shift;
-    char *s, *t;
-    int octet;
-    char buf[sizeof "255.255.255.255"];
-
-    if (strlen(network) < sizeof buf) {
-        strcpy(buf, network);
-    }
-    else {
-        return APR_EBADIP;
-    }
-
-    /* parse components */
-    s = buf;
-    ipsub->sub[0] = 0;
-    ipsub->mask[0] = 0;
-    shift = 24;
-    while (*s) {
-        t = s;
-        if (!apr_isdigit(*t)) {
-            return APR_EBADIP;
-        }
-        while (apr_isdigit(*t)) {
-            ++t;
-        }
-        if (*t == '.') {
-            *t++ = 0;
-        }
-        else if (*t) {
-            return APR_EBADIP;
-        }
-        if (shift < 0) {
-            return APR_EBADIP;
-        }
-        octet = atoi(s);
-        if (octet < 0 || octet > 255) {
-            return APR_EBADIP;
-        }
-        ipsub->sub[0] |= octet << shift;
-        ipsub->mask[0] |= 0xFFUL << shift;
-        s = t;
-        shift -= 8;
-    }
-    ipsub->sub[0] = ntohl(ipsub->sub[0]);
-    ipsub->mask[0] = ntohl(ipsub->mask[0]);
-    ipsub->family = AF_INET;
-    return APR_SUCCESS;
-}
-
-/* return values:
- * APR_EINVAL     not an IP address; caller should see if it is something else
- * APR_BADIP      IP address portion is is not valid
- * APR_BADMASK    mask portion is not valid
- */
-
-static apr_status_t parse_ip(apr_ipsubnet_t *ipsub, const char *ipstr, int network_allowed)
-{
-    /* supported flavors of IP:
-     *
-     * . IPv6 numeric address string (e.g., "fe80::1")
-     * 
-     *   IMPORTANT: Don't store IPv4-mapped IPv6 address as an IPv6 address.
-     *
-     * . IPv4 numeric address string (e.g., "127.0.0.1")
-     *
-     * . IPv4 network string (e.g., "9.67")
-     *
-     *   IMPORTANT: This network form is only allowed if network_allowed is on.
-     */
-    int rc;
-
-#if APR_HAVE_IPV6
-    rc = apr_inet_pton(AF_INET6, ipstr, ipsub->sub);
-    if (rc == 1) {
-        if (IN6_IS_ADDR_V4MAPPED((struct in6_addr *)ipsub->sub)) {
-            /* apr_ipsubnet_test() assumes that we don't create IPv4-mapped IPv6
-             * addresses; this of course forces the user to specify IPv4 addresses
-             * in a.b.c.d style instead of ::ffff:a.b.c.d style.
-             */
-            return APR_EBADIP;
-        }
-        ipsub->family = AF_INET6;
-    }
-    else
-#endif
-    {
-        rc = apr_inet_pton(AF_INET, ipstr, ipsub->sub);
-        if (rc == 1) {
-            ipsub->family = AF_INET;
-        }
-    }
-    if (rc != 1) {
-        if (network_allowed) {
-            return parse_network(ipsub, ipstr);
-        }
-        else {
-            return APR_EBADIP;
-        }
-    }
-    return APR_SUCCESS;
-}
-
-static int looks_like_ip(const char *ipstr)
-{
-    if (strchr(ipstr, ':')) {
-        /* definitely not a hostname; assume it is intended to be an IPv6 address */
-        return 1;
-    }
-
-    /* simple IPv4 address string check */
-    while ((*ipstr == '.') || apr_isdigit(*ipstr))
-        ipstr++;
-    return (*ipstr == '\0');
-}
-
-static void fix_subnet(apr_ipsubnet_t *ipsub)
-{
-    /* in case caller specified more bits in network address than are
-     * valid according to the mask, turn off the extra bits
-     */
-    int i;
-
-    for (i = 0; i < sizeof ipsub->mask / sizeof(apr_int32_t); i++) {
-        ipsub->sub[i] &= ipsub->mask[i];
-    }
-}
-
-/* be sure not to store any IPv4 address as a v4-mapped IPv6 address */
-APR_DECLARE(apr_status_t) apr_ipsubnet_create(apr_ipsubnet_t **ipsub, const char *ipstr, 
-                                              const char *mask_or_numbits, apr_pool_t *p)
-{
-    apr_status_t rv;
-    char *endptr;
-    long bits, maxbits = 32;
-
-    /* filter out stuff which doesn't look remotely like an IP address; this helps 
-     * callers like mod_access which have a syntax allowing hostname or IP address;
-     * APR_EINVAL tells the caller that it was probably not intended to be an IP
-     * address
-     */
-    if (!looks_like_ip(ipstr)) {
-        return APR_EINVAL;
-    }
-
-    *ipsub = apr_pcalloc(p, sizeof(apr_ipsubnet_t));
-
-    /* assume ipstr is an individual IP address, not a subnet */
-    memset((*ipsub)->mask, 0xFF, sizeof (*ipsub)->mask);
-
-    rv = parse_ip(*ipsub, ipstr, mask_or_numbits == NULL);
-    if (rv != APR_SUCCESS) {
-        return rv;
-    }
-
-    if (mask_or_numbits) {
-#if APR_HAVE_IPV6
-        if ((*ipsub)->family == AF_INET6) {
-            maxbits = 128;
-        }
-#endif
-        bits = strtol(mask_or_numbits, &endptr, 10);
-        if (*endptr == '\0' && bits > 0 && bits <= maxbits) {
-            /* valid num-bits string; fill in mask appropriately */
-            int cur_entry = 0;
-            apr_int32_t cur_bit_value;
-
-            memset((*ipsub)->mask, 0, sizeof (*ipsub)->mask);
-            while (bits > 32) {
-                (*ipsub)->mask[cur_entry] = 0xFFFFFFFF; /* all 32 bits */
-                bits -= 32;
-                ++cur_entry;
-            }
-            cur_bit_value = 0x80000000;
-            while (bits) {
-                (*ipsub)->mask[cur_entry] |= cur_bit_value;
-                --bits;
-                cur_bit_value /= 2;
-            }
-            (*ipsub)->mask[cur_entry] = htonl((*ipsub)->mask[cur_entry]);
-        }
-        else if (apr_inet_pton(AF_INET, mask_or_numbits, (*ipsub)->mask) == 1 &&
-            (*ipsub)->family == AF_INET) {
-            /* valid IPv4 netmask */
-        }
-        else {
-            return APR_EBADMASK;
-        }
-    }
-
-    fix_subnet(*ipsub);
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(int) apr_ipsubnet_test(apr_ipsubnet_t *ipsub, apr_sockaddr_t *sa)
-{
-#if APR_HAVE_IPV6
-    /* XXX This line will segv on Win32 build with APR_HAVE_IPV6,
-     * but without the IPV6 drivers installed.
-     */
-    if (sa->sa.sin.sin_family == AF_INET) {
-        if (ipsub->family == AF_INET &&
-            ((sa->sa.sin.sin_addr.s_addr & ipsub->mask[0]) == ipsub->sub[0])) {
-            return 1;
-        }
-    }
-    else if (IN6_IS_ADDR_V4MAPPED((struct in6_addr *)sa->ipaddr_ptr)) {
-        if (ipsub->family == AF_INET &&
-            (((apr_uint32_t *)sa->ipaddr_ptr)[3] & ipsub->mask[0]) == ipsub->sub[0]) {
-            return 1;
-        }
-    }
-    else {
-        apr_uint32_t *addr = (apr_uint32_t *)sa->ipaddr_ptr;
-
-        if ((addr[0] & ipsub->mask[0]) == ipsub->sub[0] &&
-            (addr[1] & ipsub->mask[1]) == ipsub->sub[1] &&
-            (addr[2] & ipsub->mask[2]) == ipsub->sub[2] &&
-            (addr[3] & ipsub->mask[3]) == ipsub->sub[3]) {
-            return 1;
-        }
-    }
-#else
-    if ((sa->sa.sin.sin_addr.s_addr & ipsub->mask[0]) == ipsub->sub[0]) {
-        return 1;
-    }
-#endif /* APR_HAVE_IPV6 */
-    return 0; /* no match */
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockaddr.lo b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockaddr.lo
deleted file mode 100644
index e601fa5e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockaddr.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# sockaddr.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/sockaddr.o'
-
-# Name of the non-PIC object.
-non_pic_object='sockaddr.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockaddr.o b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockaddr.o
deleted file mode 100644
index d4bd43ee..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockaddr.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockets.c b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockets.c
deleted file mode 100644
index 6510388e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockets.c
+++ /dev/null
@@ -1,422 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_networkio.h"
-#include "apr_network_io.h"
-#include "apr_strings.h"
-#include "apr_support.h"
-#include "apr_portable.h"
-#include "apr_arch_inherit.h"
-
-#if defined(BEOS) && !defined(BEOS_BONE)
-#define close closesocket
-#endif
-
-static char generic_inaddr_any[16] = {0}; /* big enough for IPv4 or IPv6 */
-
-static apr_status_t socket_cleanup(void *sock)
-{
-    apr_socket_t *thesocket = sock;
-
-    if (close(thesocket->socketdes) == 0) {
-        thesocket->socketdes = -1;
-        return APR_SUCCESS;
-    }
-    else {
-        return errno;
-    }
-}
-
-static void set_socket_vars(apr_socket_t *sock, int family, int type, int protocol)
-{
-    sock->type = type;
-    sock->protocol = protocol;
-    apr_sockaddr_vars_set(sock->local_addr, family, 0);
-    apr_sockaddr_vars_set(sock->remote_addr, family, 0);
-    sock->netmask = 0;
-#if defined(BEOS) && !defined(BEOS_BONE)
-    /* BeOS pre-BONE has TCP_NODELAY on by default and it can't be
-     * switched off!
-     */
-    sock->netmask |= APR_TCP_NODELAY;
-#endif
-}
-
-static void alloc_socket(apr_socket_t **new, apr_pool_t *p)
-{
-    *new = (apr_socket_t *)apr_pcalloc(p, sizeof(apr_socket_t));
-    (*new)->cntxt = p;
-    (*new)->local_addr = (apr_sockaddr_t *)apr_pcalloc((*new)->cntxt,
-                                                       sizeof(apr_sockaddr_t));
-    (*new)->local_addr->pool = p;
-    (*new)->remote_addr = (apr_sockaddr_t *)apr_pcalloc((*new)->cntxt,
-                                                        sizeof(apr_sockaddr_t));
-    (*new)->remote_addr->pool = p;
-}
-
-apr_status_t apr_socket_protocol_get(apr_socket_t *sock, int *protocol)
-{
-    *protocol = sock->protocol;
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_socket_create_ex(apr_socket_t **new, int ofamily, int type,
-                                  int protocol, apr_pool_t *cont)
-{
-    int family = ofamily;
-
-    if (family == APR_UNSPEC) {
-#if APR_HAVE_IPV6
-        family = APR_INET6;
-#else
-        family = APR_INET;
-#endif
-    }
-
-    alloc_socket(new, cont);
-
-    (*new)->socketdes = socket(family, type, protocol);
-
-#if APR_HAVE_IPV6
-    if ((*new)->socketdes < 0 && ofamily == APR_UNSPEC) {
-        family = APR_INET;
-        (*new)->socketdes = socket(family, type, protocol);
-    }
-#endif
-
-    if ((*new)->socketdes < 0) {
-        return errno;
-    }
-    set_socket_vars(*new, family, type, protocol);
-
-    (*new)->timeout = -1;
-    (*new)->inherit = 0;
-    apr_pool_cleanup_register((*new)->cntxt, (void *)(*new), socket_cleanup,
-                              socket_cleanup);
-    return APR_SUCCESS;
-} 
-
-apr_status_t apr_socket_create(apr_socket_t **new, int family, int type,
-                               apr_pool_t *cont)
-{
-    return apr_socket_create_ex(new, family, type, 0, cont);
-}
-
-apr_status_t apr_socket_shutdown(apr_socket_t *thesocket, 
-                                 apr_shutdown_how_e how)
-{
-    return (shutdown(thesocket->socketdes, how) == -1) ? errno : APR_SUCCESS;
-}
-
-apr_status_t apr_socket_close(apr_socket_t *thesocket)
-{
-    return apr_pool_cleanup_run(thesocket->cntxt, thesocket, socket_cleanup);
-}
-
-apr_status_t apr_socket_bind(apr_socket_t *sock, apr_sockaddr_t *sa)
-{
-    if (bind(sock->socketdes, 
-             (struct sockaddr *)&sa->sa, sa->salen) == -1) {
-        return errno;
-    }
-    else {
-        sock->local_addr = sa;
-        /* XXX IPv6 - this assumes sin_port and sin6_port at same offset */
-        if (sock->local_addr->sa.sin.sin_port == 0) { /* no need for ntohs() when comparing w/ 0 */
-            sock->local_port_unknown = 1; /* kernel got us an ephemeral port */
-        }
-        return APR_SUCCESS;
-    }
-}
-
-apr_status_t apr_socket_listen(apr_socket_t *sock, apr_int32_t backlog)
-{
-    if (listen(sock->socketdes, backlog) == -1)
-        return errno;
-    else
-        return APR_SUCCESS;
-}
-
-apr_status_t apr_socket_accept(apr_socket_t **new, apr_socket_t *sock,
-                               apr_pool_t *connection_context)
-{
-    alloc_socket(new, connection_context);
-    set_socket_vars(*new, sock->local_addr->sa.sin.sin_family, SOCK_STREAM, sock->protocol);
-
-#ifndef HAVE_POLL
-    (*new)->connected = 1;
-#endif
-    (*new)->timeout = -1;
-    
-    (*new)->socketdes = accept(sock->socketdes, 
-                               (struct sockaddr *)&(*new)->remote_addr->sa,
-                               &(*new)->remote_addr->salen);
-
-    if ((*new)->socketdes < 0) {
-        return errno;
-    }
-#ifdef TPF
-    if ((*new)->socketdes == 0) { 
-        /* 0 is an invalid socket for TPF */
-        return APR_EINTR;
-    }
-#endif
-
-    *(*new)->local_addr = *sock->local_addr;
-
-    /* The above assignment just overwrote the pool entry. Setting the local_addr 
-       pool for the accepted socket back to what it should be.  Otherwise all 
-       allocations for this socket will come from a server pool that is not
-       freed until the process goes down.*/
-    (*new)->local_addr->pool = connection_context;
-
-    /* fix up any pointers which are no longer valid */
-    if (sock->local_addr->sa.sin.sin_family == AF_INET) {
-        (*new)->local_addr->ipaddr_ptr = &(*new)->local_addr->sa.sin.sin_addr;
-    }
-#if APR_HAVE_IPV6
-    else if (sock->local_addr->sa.sin.sin_family == AF_INET6) {
-        (*new)->local_addr->ipaddr_ptr = &(*new)->local_addr->sa.sin6.sin6_addr;
-    }
-#endif
-    (*new)->remote_addr->port = ntohs((*new)->remote_addr->sa.sin.sin_port);
-    if (sock->local_port_unknown) {
-        /* not likely for a listening socket, but theoretically possible :) */
-        (*new)->local_port_unknown = 1;
-    }
-
-#if APR_TCP_NODELAY_INHERITED
-    if (apr_is_option_set(sock->netmask, APR_TCP_NODELAY) == 1) {
-        apr_set_option(&(*new)->netmask, APR_TCP_NODELAY, 1);
-    }
-#endif /* TCP_NODELAY_INHERITED */
-#if APR_O_NONBLOCK_INHERITED
-    if (apr_is_option_set(sock->netmask, APR_SO_NONBLOCK) == 1) {
-        apr_set_option(&(*new)->netmask, APR_SO_NONBLOCK, 1);
-    }
-#endif /* APR_O_NONBLOCK_INHERITED */
-
-    if (sock->local_interface_unknown ||
-        !memcmp(sock->local_addr->ipaddr_ptr,
-                generic_inaddr_any,
-                sock->local_addr->ipaddr_len)) {
-        /* If the interface address inside the listening socket's local_addr wasn't 
-         * up-to-date, we don't know local interface of the connected socket either.
-         *
-         * If the listening socket was not bound to a specific interface, we
-         * don't know the local_addr of the connected socket.
-         */
-        (*new)->local_interface_unknown = 1;
-    }
-
-    (*new)->inherit = 0;
-    apr_pool_cleanup_register((*new)->cntxt, (void *)(*new), socket_cleanup,
-                              socket_cleanup);
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_socket_connect(apr_socket_t *sock, apr_sockaddr_t *sa)
-{
-    int rc;        
-
-    do {
-        rc = connect(sock->socketdes,
-                     (const struct sockaddr *)&sa->sa.sin,
-                     sa->salen);
-    } while (rc == -1 && errno == EINTR);
-
-    /* we can see EINPROGRESS the first time connect is called on a non-blocking
-     * socket; if called again, we can see EALREADY
-     */
-    if (rc == -1 && (errno == EINPROGRESS || errno == EALREADY) &&
-        apr_is_option_set(sock->netmask, APR_SO_TIMEOUT)) {
-        rc = apr_wait_for_io_or_timeout(NULL, sock, 0);
-        if (rc != APR_SUCCESS) {
-            return rc;
-        }
-
-#ifdef SO_ERROR
-        {
-            int error;
-            apr_socklen_t len = sizeof(error);
-            if ((rc = getsockopt(sock->socketdes, SOL_SOCKET, SO_ERROR, 
-                                 (char *)&error, &len)) < 0) {
-                return errno;
-            }
-            if (error) {
-                return error;
-            }
-        }
-#endif /* SO_ERROR */
-    }
-
-    if (rc == -1 && errno != EISCONN) {
-        return errno;
-    }
-
-    sock->remote_addr = sa;
-    if (sock->local_addr->port == 0) {
-        /* connect() got us an ephemeral port */
-        sock->local_port_unknown = 1;
-    }
-    if (!memcmp(sock->local_addr->ipaddr_ptr,
-                generic_inaddr_any,
-                sock->local_addr->ipaddr_len)) {
-        /* not bound to specific local interface; connect() had to assign
-         * one for the socket
-         */
-        sock->local_interface_unknown = 1;
-    }
-#ifndef HAVE_POLL
-    sock->connected=1;
-#endif
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_socket_data_get(void **data, const char *key, apr_socket_t *sock)
-{
-    sock_userdata_t *cur = sock->userdata;
-
-    *data = NULL;
-
-    while (cur) {
-        if (!strcmp(cur->key, key)) {
-            *data = cur->data;
-            break;
-        }
-        cur = cur->next;
-    }
-
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_socket_data_set(apr_socket_t *sock, void *data, const char *key,
-                                 apr_status_t (*cleanup) (void *))
-{
-    sock_userdata_t *new = apr_palloc(sock->cntxt, sizeof(sock_userdata_t));
-
-    new->key = apr_pstrdup(sock->cntxt, key);
-    new->data = data;
-    new->next = sock->userdata;
-    sock->userdata = new;
-
-    if (cleanup) {
-        apr_pool_cleanup_register(sock->cntxt, data, cleanup, cleanup);
-    }
-
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_os_sock_get(apr_os_sock_t *thesock, apr_socket_t *sock)
-{
-    *thesock = sock->socketdes;
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_os_sock_make(apr_socket_t **apr_sock, 
-                              apr_os_sock_info_t *os_sock_info, 
-                              apr_pool_t *cont)
-{
-    alloc_socket(apr_sock, cont);
-#ifdef APR_ENABLE_FOR_1_0 /* no protocol field yet */
-    set_socket_vars(*apr_sock, os_sock_info->family, os_sock_info->type, os_sock_info->protocol);
-#else
-    set_socket_vars(*apr_sock, os_sock_info->family, os_sock_info->type, 0);
-#endif
-    (*apr_sock)->timeout = -1;
-    (*apr_sock)->socketdes = *os_sock_info->os_sock;
-    if (os_sock_info->local) {
-        memcpy(&(*apr_sock)->local_addr->sa.sin, 
-               os_sock_info->local, 
-               (*apr_sock)->local_addr->salen);
-        /* XXX IPv6 - this assumes sin_port and sin6_port at same offset */
-        (*apr_sock)->local_addr->port = ntohs((*apr_sock)->local_addr->sa.sin.sin_port);
-    }
-    else {
-        (*apr_sock)->local_port_unknown = (*apr_sock)->local_interface_unknown = 1;
-    }
-    if (os_sock_info->remote) {
-#ifndef HAVE_POLL
-        (*apr_sock)->connected = 1;
-#endif
-        memcpy(&(*apr_sock)->remote_addr->sa.sin, 
-               os_sock_info->remote,
-               (*apr_sock)->remote_addr->salen);
-        /* XXX IPv6 - this assumes sin_port and sin6_port at same offset */
-        (*apr_sock)->remote_addr->port = ntohs((*apr_sock)->remote_addr->sa.sin.sin_port);
-    }
-    else {
-        (*apr_sock)->remote_addr_unknown = 1;
-    }
-        
-    (*apr_sock)->inherit = 0;
-    apr_pool_cleanup_register((*apr_sock)->cntxt, (void *)(*apr_sock), 
-                              socket_cleanup, socket_cleanup);
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_os_sock_put(apr_socket_t **sock, apr_os_sock_t *thesock, 
-                           apr_pool_t *cont)
-{
-    /* XXX Bogus assumption that *sock points at anything legit */
-    if ((*sock) == NULL) {
-        alloc_socket(sock, cont);
-        /* XXX IPv6 figure out the family here! */
-        /* XXX figure out the actual socket type here */
-        /* *or* just decide that apr_os_sock_put() has to be told the family and type */
-        set_socket_vars(*sock, APR_INET, SOCK_STREAM, 0);
-        (*sock)->timeout = -1;
-    }
-    (*sock)->local_port_unknown = (*sock)->local_interface_unknown = 1;
-    (*sock)->remote_addr_unknown = 1;
-    (*sock)->socketdes = *thesock;
-    return APR_SUCCESS;
-}
-
-APR_IMPLEMENT_INHERIT_SET(socket, inherit, cntxt, socket_cleanup)
-
-APR_IMPLEMENT_INHERIT_UNSET(socket, inherit, cntxt, socket_cleanup)
-
-/* deprecated */
-apr_status_t apr_shutdown(apr_socket_t *thesocket, apr_shutdown_how_e how)
-{
-    return apr_socket_shutdown(thesocket, how);
-}
-
-/* deprecated */
-apr_status_t apr_bind(apr_socket_t *sock, apr_sockaddr_t *sa)
-{
-    return apr_socket_bind(sock, sa);
-}
-
-/* deprecated */
-apr_status_t apr_listen(apr_socket_t *sock, apr_int32_t backlog)
-{
-    return apr_socket_listen(sock, backlog);
-}
-
-/* deprecated */
-apr_status_t apr_accept(apr_socket_t **new, apr_socket_t *sock,
-                        apr_pool_t *connection_context)
-{
-    return apr_socket_accept(new, sock, connection_context);
-}
-
-/* deprecated */
-apr_status_t apr_connect(apr_socket_t *sock, apr_sockaddr_t *sa)
-{
-    return apr_socket_connect(sock, sa);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockets.lo b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockets.lo
deleted file mode 100644
index 02c9a22e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockets.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# sockets.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/sockets.o'
-
-# Name of the non-PIC object.
-non_pic_object='sockets.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockets.o b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockets.o
deleted file mode 100644
index c4cc3fb7..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockets.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockopt.c b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockopt.c
deleted file mode 100644
index 039fda08..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockopt.c
+++ /dev/null
@@ -1,393 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_networkio.h"
-#include "apr_strings.h"
-
-
-static apr_status_t soblock(int sd)
-{
-/* BeOS uses setsockopt at present for non blocking... */
-#ifndef BEOS
-    int fd_flags;
-
-    fd_flags = fcntl(sd, F_GETFL, 0);
-#if defined(O_NONBLOCK)
-    fd_flags &= ~O_NONBLOCK;
-#elif defined(O_NDELAY)
-    fd_flags &= ~O_NDELAY;
-#elif defined(FNDELAY)
-    fd_flags &= ~FNDELAY;
-#else
-#error Please teach APR how to make sockets blocking on your platform.
-#endif
-    if (fcntl(sd, F_SETFL, fd_flags) == -1) {
-        return errno;
-    }
-#else
-    int on = 0;
-    if (setsockopt(sd, SOL_SOCKET, SO_NONBLOCK, &on, sizeof(int)) < 0)
-        return errno;
-#endif /* BEOS */
-    return APR_SUCCESS;
-}
-
-static apr_status_t sononblock(int sd)
-{
-#ifndef BEOS
-    int fd_flags;
-
-    fd_flags = fcntl(sd, F_GETFL, 0);
-#if defined(O_NONBLOCK)
-    fd_flags |= O_NONBLOCK;
-#elif defined(O_NDELAY)
-    fd_flags |= O_NDELAY;
-#elif defined(FNDELAY)
-    fd_flags |= FNDELAY;
-#else
-#error Please teach APR how to make sockets non-blocking on your platform.
-#endif
-    if (fcntl(sd, F_SETFL, fd_flags) == -1) {
-        return errno;
-    }
-#else
-    int on = 1;
-    if (setsockopt(sd, SOL_SOCKET, SO_NONBLOCK, &on, sizeof(int)) < 0)
-        return errno;
-#endif /* BEOS */
-    return APR_SUCCESS;
-}
-
-
-apr_status_t apr_socket_timeout_set(apr_socket_t *sock, apr_interval_time_t t)
-{
-    apr_status_t stat;
-
-    /* If our timeout is positive or zero and our last timeout was
-     * negative, then we need to ensure that we are non-blocking.
-     * Conversely, if our timeout is negative and we had a positive
-     * or zero timeout, we must make sure our socket is blocking.
-     * We want to avoid calling fcntl more than necessary on the socket,
-     */
-    if (t >= 0 && sock->timeout < 0) {
-        if (apr_is_option_set(sock->netmask, APR_SO_NONBLOCK) != 1) {
-            if ((stat = sononblock(sock->socketdes)) != APR_SUCCESS) {
-                return stat;
-            }
-            apr_set_option(&sock->netmask, APR_SO_NONBLOCK, 1);
-        }
-    } 
-    else if (t < 0 && sock->timeout >= 0) {
-        if (apr_is_option_set(sock->netmask, APR_SO_NONBLOCK) != 0) { 
-            if ((stat = soblock(sock->socketdes)) != APR_SUCCESS) { 
-                return stat; 
-            }
-            apr_set_option(&sock->netmask, APR_SO_NONBLOCK, 0);
-        } 
-    }
-    /* must disable the incomplete read support if we disable
-     * a timeout
-     */
-    if (t <= 0) {
-        sock->netmask &= ~APR_INCOMPLETE_READ;
-    }
-    sock->timeout = t; 
-    apr_set_option(&sock->netmask, APR_SO_TIMEOUT, t > 0);
-    return APR_SUCCESS;
-}
-
-
-apr_status_t apr_socket_opt_set(apr_socket_t *sock, 
-                                apr_int32_t opt, apr_int32_t on)
-{
-    int one;
-    apr_status_t rv;
-
-    if (on)
-        one = 1;
-    else
-        one = 0;
-    switch(opt) {
-    case APR_SO_KEEPALIVE:
-#ifdef SO_KEEPALIVE
-        if (on != apr_is_option_set(sock->netmask, APR_SO_KEEPALIVE)) {
-            if (setsockopt(sock->socketdes, SOL_SOCKET, SO_KEEPALIVE, (void *)&one, sizeof(int)) == -1) {
-                return errno;
-            }
-            apr_set_option(&sock->netmask,APR_SO_KEEPALIVE, on);
-        }
-#else
-        return APR_ENOTIMPL;
-#endif
-        break;
-    case APR_SO_DEBUG:
-        if (on != apr_is_option_set(sock->netmask, APR_SO_DEBUG)) {
-            if (setsockopt(sock->socketdes, SOL_SOCKET, SO_DEBUG, (void *)&one, sizeof(int)) == -1) {
-                return errno;
-            }
-            apr_set_option(&sock->netmask, APR_SO_DEBUG, on);
-        }
-        break;
-    case APR_SO_REUSEADDR:
-        if (on != apr_is_option_set(sock->netmask, APR_SO_REUSEADDR)) {
-            if (setsockopt(sock->socketdes, SOL_SOCKET, SO_REUSEADDR, (void *)&one, sizeof(int)) == -1) {
-                return errno;
-            }
-            apr_set_option(&sock->netmask, APR_SO_REUSEADDR, on);
-        }
-        break;
-    case APR_SO_SNDBUF:
-#ifdef SO_SNDBUF
-        if (setsockopt(sock->socketdes, SOL_SOCKET, SO_SNDBUF, (void *)&on, sizeof(int)) == -1) {
-            return errno;
-        }
-#else
-        return APR_ENOTIMPL;
-#endif
-        break;
-    case APR_SO_RCVBUF:
-#ifdef SO_RCVBUF
-        if (setsockopt(sock->socketdes, SOL_SOCKET, SO_RCVBUF, (void *)&on, sizeof(int)) == -1) {
-            return errno;
-        }
-#else
-        return APR_ENOTIMPL;
-#endif
-        break;
-    case APR_SO_NONBLOCK:
-        if (apr_is_option_set(sock->netmask, APR_SO_NONBLOCK) != on) {
-            if (on) {
-                if ((rv = sononblock(sock->socketdes)) != APR_SUCCESS) 
-                    return rv;
-            }
-            else {
-                if ((rv = soblock(sock->socketdes)) != APR_SUCCESS)
-                    return rv;
-            }
-            apr_set_option(&sock->netmask, APR_SO_NONBLOCK, on);
-        }
-        break;
-    case APR_SO_LINGER:
-#ifdef SO_LINGER
-        if (apr_is_option_set(sock->netmask, APR_SO_LINGER) != on) {
-            struct linger li;
-            li.l_onoff = on;
-            li.l_linger = APR_MAX_SECS_TO_LINGER;
-            if (setsockopt(sock->socketdes, SOL_SOCKET, SO_LINGER, (char *) &li, sizeof(struct linger)) == -1) {
-                return errno;
-            }
-            apr_set_option(&sock->netmask, APR_SO_LINGER, on);
-        }
-#else
-        return APR_ENOTIMPL;
-#endif
-        break;
-    case APR_SO_TIMEOUT:
-        /* XXX: To be deprecated */
-        return apr_socket_timeout_set(sock, on);
-        break;
-    case APR_TCP_NODELAY:
-#if defined(TCP_NODELAY)
-        if (apr_is_option_set(sock->netmask, APR_TCP_NODELAY) != on) {
-            int optlevel = IPPROTO_TCP;
-            int optname = TCP_NODELAY;
-
-#if APR_HAVE_SCTP
-            if (sock->protocol == IPPROTO_SCTP) {
-                optlevel = IPPROTO_SCTP;
-                optname = SCTP_NODELAY;
-            }
-#endif
-            if (setsockopt(sock->socketdes, optlevel, optname, (void *)&on, sizeof(int)) == -1) {
-                return errno;
-            }
-            apr_set_option(&sock->netmask, APR_TCP_NODELAY, on);
-        }
-#else
-        /* BeOS pre-BONE has TCP_NODELAY set by default.
-         * As it can't be turned off we might as well check if they're asking
-         * for it to be turned on!
-         */
-#ifdef BEOS
-        if (on == 1)
-            return APR_SUCCESS;
-        else
-#endif
-        return APR_ENOTIMPL;
-#endif
-        break;
-    case APR_TCP_NOPUSH:
-#if APR_TCP_NOPUSH_FLAG
-        if (apr_is_option_set(sock->netmask, APR_TCP_NOPUSH) != on) {
-            int optlevel = IPPROTO_TCP;
-            int optname = TCP_NODELAY;
-
-#if APR_HAVE_SCTP
-            if (sock->protocol == IPPROTO_SCTP) {
-                optlevel = IPPROTO_SCTP;
-                optname = SCTP_NODELAY;
-            }
-#endif
-            /* OK we're going to change some settings here... */
-            /* TCP_NODELAY is mutually exclusive, so do we have it set? */
-            if (apr_is_option_set(sock->netmask, APR_TCP_NODELAY) == 1 && on) {
-                /* If we want to set NOPUSH then if we have the TCP_NODELAY
-                 * flag set we need to switch it off...
-                 */
-                int tmpflag = 0;
-                if (setsockopt(sock->socketdes, optlevel, optname,
-                               (void*)&tmpflag, sizeof(int)) == -1) {
-                    return errno;
-                }
-                apr_set_option(&sock->netmask, APR_RESET_NODELAY, 1);
-                apr_set_option(&sock->netmask, APR_TCP_NODELAY, 0);
-            } else if (on) {
-                apr_set_option(&sock->netmask, APR_RESET_NODELAY, 0);
-            }
-            /* OK, now we can just set the TCP_NOPUSH flag accordingly...*/
-            if (setsockopt(sock->socketdes, IPPROTO_TCP, APR_TCP_NOPUSH_FLAG,
-                           (void*)&on, sizeof(int)) == -1) {
-                return errno;
-            }
-            apr_set_option(&sock->netmask, APR_TCP_NOPUSH, on);
-            if (!on && apr_is_option_set(sock->netmask, APR_RESET_NODELAY)) {
-                int tmpflag = 1;
-                if (setsockopt(sock->socketdes, optlevel, optname,
-                               (void*)&tmpflag, sizeof(int)) == -1) {
-                    return errno;
-                }
-                apr_set_option(&sock->netmask, APR_RESET_NODELAY,0);
-                apr_set_option(&sock->netmask, APR_TCP_NODELAY, 1);
-            }
-        }
-#else
-        return APR_ENOTIMPL;
-#endif
-        break;
-    case APR_INCOMPLETE_READ:
-        apr_set_option(&sock->netmask, APR_INCOMPLETE_READ, on);
-        break;
-    case APR_IPV6_V6ONLY:
-#if APR_HAVE_IPV6 && defined(IPV6_V6ONLY)
-        /* we don't know the initial setting of this option,
-         * so don't check sock->netmask since that optimization
-         * won't work
-         */
-        if (setsockopt(sock->socketdes, IPPROTO_IPV6, IPV6_V6ONLY,
-                       (void *)&on, sizeof(int)) == -1) {
-            return errno;
-        }
-        apr_set_option(&sock->netmask, APR_IPV6_V6ONLY, on);
-#else
-        return APR_ENOTIMPL;
-#endif
-        break;
-    default:
-        return APR_EINVAL;
-    }
-
-    return APR_SUCCESS; 
-}         
-
-
-apr_status_t apr_socket_timeout_get(apr_socket_t *sock, apr_interval_time_t *t)
-{
-    *t = sock->timeout;
-    return APR_SUCCESS;
-}
-
-
-apr_status_t apr_socket_opt_get(apr_socket_t *sock, 
-                                apr_int32_t opt, apr_int32_t *on)
-{
-    switch(opt) {
-        case APR_SO_TIMEOUT:
-            /* XXX: To be deprecated */
-            *on = (apr_int32_t)sock->timeout;
-            break;
-        default:
-            *on = apr_is_option_set(sock->netmask, opt);
-    }
-    return APR_SUCCESS;
-}
-
-
-apr_status_t apr_socket_atmark(apr_socket_t *sock, int *atmark)
-{
-/* In 1.0 we rely on compile failure to assure all platforms grabbed
- * the correct header file support for SIOCATMARK, but we don't want 
- * to fail the build of 0.9.  Keep things good for the released branch.
- */
-#ifdef SIOCATMARK
-    int oobmark;
-
-    if (ioctl(sock->socketdes, SIOCATMARK, (void*) &oobmark) < 0)
-        return apr_get_netos_error();
-
-    *atmark = (oobmark != 0);
-
-    return APR_SUCCESS;
-#else
-    return APR_ENOTIMPL;
-#endif
-}
-
-
-/* deprecated */
-apr_status_t apr_setsocketopt(apr_socket_t *sock,
-                              apr_int32_t opt, apr_int32_t on)
-{
-    return apr_socket_opt_set(sock, opt, on);
-}
-
-apr_status_t apr_getsocketopt(apr_socket_t *sock,
-                              apr_int32_t opt, apr_int32_t *on)
-{
-    return apr_socket_opt_get(sock, opt, on);
-}
-                                           
-
-apr_status_t apr_gethostname(char *buf, apr_int32_t len, apr_pool_t *cont)
-{
-    if (gethostname(buf, len) == -1) {
-        buf[0] = '\0';
-        return errno;
-    }
-    else if (!memchr(buf, '\0', len)) { /* buffer too small */
-        /* note... most platforms just truncate in this condition
-         *         linux+glibc return an error
-         */
-        buf[0] = '\0';
-        return APR_ENAMETOOLONG;
-    }
-    return APR_SUCCESS;
-}
-
-#if APR_HAS_SO_ACCEPTFILTER
-apr_status_t apr_socket_accept_filter(apr_socket_t *sock, char *name, 
-                                      char *args)
-{
-    struct accept_filter_arg af;
-    strncpy(af.af_name, name, 16);
-    strncpy(af.af_arg, args, 256 - 16);
-
-    if ((setsockopt(sock->socketdes, SOL_SOCKET, SO_ACCEPTFILTER,
-          &af, sizeof(af))) < 0) {
-        return errno;
-    }
-    return APR_SUCCESS;
-}
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockopt.lo b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockopt.lo
deleted file mode 100644
index e61510cc..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockopt.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# sockopt.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/sockopt.o'
-
-# Name of the non-PIC object.
-non_pic_object='sockopt.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockopt.o b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockopt.o
deleted file mode 100644
index cc6db787..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/unix/sockopt.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/win32/sendrecv.c b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/win32/sendrecv.c
deleted file mode 100644
index 99470c82..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/win32/sendrecv.c
+++ /dev/null
@@ -1,460 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_networkio.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_network_io.h"
-#include "apr_lib.h"
-#include "apr_arch_file_io.h"
-#if APR_HAVE_TIME_H
-#include <time.h>
-#endif
-
-/* MAX_SEGMENT_SIZE is the maximum amount of data that will be sent to a client
- * in one call of TransmitFile. This number must be small enough to give the 
- * slowest client time to receive the data before the socket timeout triggers.
- * The same problem can exist with apr_socket_send(). In that case, we rely on
- * the application to adjust socket timeouts and max send segment 
- * sizes appropriately.
- * For example, Apache will in most cases call apr_socket_send() with less
- * than 8193 bytes.
- */
-#define MAX_SEGMENT_SIZE 65536
-#define WSABUF_ON_STACK 50
-
-APR_DECLARE(apr_status_t) apr_socket_send(apr_socket_t *sock, const char *buf,
-                                          apr_size_t *len)
-{
-    apr_ssize_t rv;
-    WSABUF wsaData;
-    int lasterror;
-    DWORD dwBytes = 0;
-
-    wsaData.len = *len;
-    wsaData.buf = (char*) buf;
-
-#ifndef _WIN32_WCE
-    rv = WSASend(sock->socketdes, &wsaData, 1, &dwBytes, 0, NULL, NULL);
-#else
-    rv = send(sock->socketdes, wsaData.buf, wsaData.len, 0);
-    dwBytes = rv;
-#endif
-    if (rv == SOCKET_ERROR) {
-        lasterror = apr_get_netos_error();
-        *len = 0;
-        return lasterror;
-    }
-
-    *len = dwBytes;
-
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_socket_recv(apr_socket_t *sock, char *buf,
-                                          apr_size_t *len) 
-{
-    apr_ssize_t rv;
-    WSABUF wsaData;
-    int lasterror;
-    DWORD dwBytes = 0;
-    DWORD flags = 0;
-
-    wsaData.len = *len;
-    wsaData.buf = (char*) buf;
-
-#ifndef _WIN32_WCE
-    rv = WSARecv(sock->socketdes, &wsaData, 1, &dwBytes, &flags, NULL, NULL);
-#else
-    rv = recv(sock->socketdes, wsaData.buf, wsaData.len, 0);
-    dwBytes = rv;
-#endif
-    if (rv == SOCKET_ERROR) {
-        lasterror = apr_get_netos_error();
-        *len = 0;
-        return lasterror;
-    }
-
-    *len = dwBytes;
-    return dwBytes == 0 ? APR_EOF : APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_socket_sendv(apr_socket_t *sock,
-                                           const struct iovec *vec,
-                                           apr_int32_t nvec, apr_size_t *nbytes)
-{
-    apr_status_t rc = APR_SUCCESS;
-    apr_ssize_t rv;
-    int i;
-    DWORD dwBytes = 0;
-    WSABUF *pWsaBuf = (nvec <= WSABUF_ON_STACK) ? _alloca(sizeof(WSABUF) * (nvec))
-                                                : malloc(sizeof(WSABUF) * (nvec));
-
-    if (!pWsaBuf)
-        return APR_ENOMEM;
-
-    for (i = 0; i < nvec; i++) {
-        pWsaBuf[i].buf = vec[i].iov_base;
-        pWsaBuf[i].len = vec[i].iov_len;
-    }
-#ifndef _WIN32_WCE
-    rv = WSASend(sock->socketdes, pWsaBuf, nvec, &dwBytes, 0, NULL, NULL);
-    if (rv == SOCKET_ERROR) {
-        rc = apr_get_netos_error();
-    }
-#else
-    for (i = 0; i < nvec; i++) {
-        rv = send(sock->socketdes, pWsaBuf[i].buf, pWsaBuf[i].len, 0);
-        if (rv == SOCKET_ERROR) {
-            rc = apr_get_netos_error();
-            break;
-        }
-        dwBytes += rv;
-    }
-#endif
-    if (nvec > WSABUF_ON_STACK) 
-        free(pWsaBuf);
-
-    *nbytes = dwBytes;
-    return rc;
-}
-
-
-APR_DECLARE(apr_status_t) apr_socket_sendto(apr_socket_t *sock,
-                                            apr_sockaddr_t *where,
-                                            apr_int32_t flags, const char *buf, 
-                                            apr_size_t *len)
-{
-    apr_ssize_t rv;
-
-    rv = sendto(sock->socketdes, buf, (*len), flags, 
-                (const struct sockaddr*)&where->sa, 
-                where->salen);
-    if (rv == SOCKET_ERROR) {
-        *len = 0;
-        return apr_get_netos_error();
-    }
-
-    *len = rv;
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_socket_recvfrom(apr_sockaddr_t *from, 
-                                              apr_socket_t *sock,
-                                              apr_int32_t flags, 
-                                              char *buf, apr_size_t *len)
-{
-    apr_ssize_t rv;
-
-    rv = recvfrom(sock->socketdes, buf, (*len), flags, 
-                  (struct sockaddr*)&from->sa, &from->salen);
-    if (rv == SOCKET_ERROR) {
-        (*len) = 0;
-        return apr_get_netos_error();
-    }
-    (*len) = rv;
-    if (rv == 0 && sock->type == SOCK_STREAM)
-        return APR_EOF;
-
-    return APR_SUCCESS;
-}
-
-
-static apr_status_t collapse_iovec(char **off, apr_size_t *len, 
-                                   struct iovec *iovec, int numvec, 
-                                   char *buf, apr_size_t buflen)
-{
-    if (numvec == 1) {
-        *off = iovec[0].iov_base;
-        *len = iovec[0].iov_len;
-    }
-    else {
-        int i;
-        for (i = 0; i < numvec; i++) {
-            *len += iovec[i].iov_len;
-        }
-
-        if (*len > buflen) {
-            *len = 0;
-            return APR_INCOMPLETE;
-        }
-
-        *off = buf;
-
-        for (i = 0; i < numvec; i++) {
-            memcpy(buf, iovec[i].iov_base, iovec[i].iov_len);
-            buf += iovec[i].iov_len;
-        }
-    }
-    return APR_SUCCESS;
-}
-
-
-#if APR_HAS_SENDFILE
-/*
- * apr_status_t apr_socket_sendfile(apr_socket_t *, apr_file_t *, apr_hdtr_t *, 
- *                                 apr_off_t *, apr_size_t *, apr_int32_t flags)
- *    Send a file from an open file descriptor to a socket, along with 
- *    optional headers and trailers
- * arg 1) The socket to which we're writing
- * arg 2) The open file from which to read
- * arg 3) A structure containing the headers and trailers to send
- * arg 4) Offset into the file where we should begin writing
- * arg 5) Number of bytes to send out of the file
- * arg 6) APR flags that are mapped to OS specific flags
- */
-APR_DECLARE(apr_status_t) apr_socket_sendfile(apr_socket_t *sock, 
-                                              apr_file_t *file,
-                                              apr_hdtr_t *hdtr,
-                                              apr_off_t *offset,
-                                              apr_size_t *len,
-                                              apr_int32_t flags) 
-{
-    apr_status_t status = APR_SUCCESS;
-    apr_ssize_t rv;
-    apr_off_t curoff = *offset;
-    DWORD dwFlags = 0;
-    DWORD nbytes;
-    TRANSMIT_FILE_BUFFERS tfb, *ptfb = NULL;
-    int ptr = 0;
-    int bytes_to_send;   /* Bytes to send out of the file (not including headers) */
-    int disconnected = 0;
-    int sendv_trailers = 0;
-    char hdtrbuf[4096];
-
-    if (apr_os_level < APR_WIN_NT) {
-        return APR_ENOTIMPL;
-    }
-
-    /* Use len to keep track of number of total bytes sent (including headers) */
-    bytes_to_send = *len;
-    *len = 0;
-
-    /* Handle the goofy case of sending headers/trailers and a zero byte file */
-    if (!bytes_to_send && hdtr) {
-        if (hdtr->numheaders) {
-            rv = apr_socket_sendv(sock, hdtr->headers, hdtr->numheaders, 
-                                  &nbytes);
-            if (rv != APR_SUCCESS)
-                return rv;
-            *len += nbytes;
-        }
-        if (hdtr->numtrailers) {
-            rv = apr_socket_sendv(sock, hdtr->trailers, hdtr->numtrailers,
-                                  &nbytes);
-            if (rv != APR_SUCCESS)
-                return rv;
-            *len += nbytes;
-        }
-        return APR_SUCCESS;
-    }
-
-    memset(&tfb, '\0', sizeof (tfb));
-    /* Collapse the headers into a single buffer */
-    if (hdtr && hdtr->numheaders) {
-        ptfb = &tfb;
-        nbytes = 0;
-        rv = collapse_iovec((char **)&ptfb->Head, &ptfb->HeadLength, 
-                            hdtr->headers, hdtr->numheaders, 
-                            hdtrbuf, sizeof(hdtrbuf));
-        /* If not enough buffer, punt to sendv */
-        if (rv == APR_INCOMPLETE) {
-            rv = apr_sendv(sock, hdtr->headers, hdtr->numheaders, &nbytes);
-            if (rv != APR_SUCCESS)
-                return rv;
-            *len += nbytes;
-            ptfb = NULL;
-        }
-    }
-
-    /* Initialize the overlapped structure used on TransmitFile 
-     */
-    if (!sock->overlapped) {
-        sock->overlapped = apr_pcalloc(sock->cntxt, sizeof(OVERLAPPED));
-        sock->overlapped->hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
-    }
-    while (bytes_to_send) {
-        if (bytes_to_send > MAX_SEGMENT_SIZE) {
-            nbytes = MAX_SEGMENT_SIZE;
-        }
-        else {
-            /* Last call to TransmitFile() */
-            nbytes = bytes_to_send;
-            /* Collapse the trailers into a single buffer */
-            if (hdtr && hdtr->numtrailers) {
-                ptfb = &tfb;
-                rv = collapse_iovec((char**) &ptfb->Tail, &ptfb->TailLength,
-                                    hdtr->trailers, hdtr->numtrailers,
-                                    hdtrbuf + ptfb->HeadLength,
-                                    sizeof(hdtrbuf) - ptfb->HeadLength);
-                if (rv == APR_INCOMPLETE) {
-                    /* If not enough buffer, punt to sendv, later */
-                    sendv_trailers = 1;
-                }
-            }
-            /* Disconnect the socket after last send */
-            if ((flags & APR_SENDFILE_DISCONNECT_SOCKET)
-                    && !sendv_trailers) {
-                dwFlags |= TF_REUSE_SOCKET;
-                dwFlags |= TF_DISCONNECT;
-                disconnected = 1;
-            }
-        }
-
-        sock->overlapped->Offset = (DWORD)(curoff);
-#if APR_HAS_LARGE_FILES
-        sock->overlapped->OffsetHigh = (DWORD)(curoff >> 32);
-#endif  
-        /* XXX BoundsChecker claims dwFlags must not be zero. */
-        rv = TransmitFile(sock->socketdes,  /* socket */
-                          file->filehand, /* open file descriptor of the file to be sent */
-                          nbytes,         /* number of bytes to send. 0=send all */
-                          0,              /* Number of bytes per send. 0=use default */
-                          sock->overlapped,    /* OVERLAPPED structure */
-                          ptfb,           /* header and trailer buffers */
-                          dwFlags);       /* flags to control various aspects of TransmitFile */
-        if (!rv) {
-            status = apr_get_netos_error();
-            if ((status == APR_FROM_OS_ERROR(ERROR_IO_PENDING)) ||
-                (status == APR_FROM_OS_ERROR(WSA_IO_PENDING))) 
-            {
-                rv = WaitForSingleObject(sock->overlapped->hEvent, 
-                                         (DWORD)(sock->timeout >= 0 
-                                                 ? sock->timeout_ms : INFINITE));
-                if (rv == WAIT_OBJECT_0) {
-                    status = APR_SUCCESS;
-                    if (!disconnected) {
-                        if (!WSAGetOverlappedResult(sock->socketdes,
-                                                    sock->overlapped,
-                                                    &nbytes,
-                                                    FALSE,
-                                                    &dwFlags)) {
-                            status = apr_get_netos_error();
-                        }
-                                               
-                        /* Ugly code alert: WSAGetOverlappedResult returns
-                         * a count of all bytes sent. This loop only
-                         * tracks bytes sent out of the file.
-                         */
-                        else if (ptfb) {
-                            nbytes -= (ptfb->HeadLength + ptfb->TailLength);
-                        }
-                    }
-                }
-                else if (rv == WAIT_TIMEOUT) {
-                    status = APR_FROM_OS_ERROR(WAIT_TIMEOUT);
-                }
-                else if (rv == WAIT_ABANDONED) {
-                    /* Hummm... WAIT_ABANDONDED is not an error code. It is
-                     * a return specific to the Win32 WAIT functions that
-                     * indicates that a thread exited while holding a
-                     * mutex. Should consider triggering an assert
-                     * to detect the condition...
-                     */
-                    status = APR_FROM_OS_ERROR(WAIT_TIMEOUT);
-                }
-                else
-                    status = apr_get_os_error();
-            }
-        }
-        if (status != APR_SUCCESS)
-            break;
-
-        bytes_to_send -= nbytes;
-        curoff += nbytes;
-        *len += nbytes;
-        /* Adjust len for any headers/trailers sent */
-        if (ptfb) {
-            *len += (ptfb->HeadLength + ptfb->TailLength);
-            memset(&tfb, '\0', sizeof (tfb));
-            ptfb = NULL;
-        }
-    }
-
-    if (status == APR_SUCCESS) {
-        if (sendv_trailers) {
-            rv = apr_sendv(sock, hdtr->trailers, hdtr->numtrailers, &nbytes);
-            if (rv != APR_SUCCESS)
-                return rv;
-            *len += nbytes;
-        }
-
-    
-        /* Mark the socket as disconnected, but do not close it.
-         * Note: The application must have stored the socket prior to making
-         * the call to apr_socket_sendfile in order to either reuse it 
-         * or close it.
-         */
-        if (disconnected) {
-            sock->disconnected = 1;
-            sock->socketdes = INVALID_SOCKET;
-        }
-    }
-
-    return status;
-}
-
-/* Deprecated */
-APR_DECLARE(apr_status_t) apr_sendfile(apr_socket_t *sock, apr_file_t *file,
-                                       apr_hdtr_t *hdtr, apr_off_t *offset,
-                                       apr_size_t *len, apr_int32_t flags) 
-{
-    return apr_socket_sendfile(sock, file, hdtr, offset, len, flags);
-}
-
-#endif
-
-/* Deprecated */
-APR_DECLARE(apr_status_t) apr_send(apr_socket_t *sock, const char *buf,
-                                   apr_size_t *len)
-{
-    return apr_socket_send(sock, buf, len);
-}
-
-/* Deprecated */
-APR_DECLARE(apr_status_t) apr_sendv(apr_socket_t *sock,
-                                    const struct iovec *vec,
-                                    apr_int32_t nvec, apr_size_t *nbytes)
-{
-    return apr_socket_sendv(sock, vec, nvec, nbytes);
-}
-
-/* Deprecated */
-APR_DECLARE(apr_status_t) apr_sendto(apr_socket_t *sock, apr_sockaddr_t *where,
-                                     apr_int32_t flags, const char *buf, 
-                                     apr_size_t *len)
-{
-    return apr_socket_sendto(sock, where, flags, buf, len);
-}
-
-/* Deprecated */
-APR_DECLARE(apr_status_t) apr_recvfrom(apr_sockaddr_t *from, 
-                                       apr_socket_t *sock,
-                                       apr_int32_t flags, 
-                                       char *buf, apr_size_t *len)
-{
-    return apr_socket_recvfrom(from, sock, flags, buf, len);
-}
-
-/* Deprecated */
-APR_DECLARE(apr_status_t) apr_recv(apr_socket_t *sock, char *buf,
-                                   apr_size_t *len) 
-{
-    return apr_socket_recv(sock, buf, len);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/win32/sockets.c b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/win32/sockets.c
deleted file mode 100644
index fc2bcb73..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/win32/sockets.c
+++ /dev/null
@@ -1,532 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_networkio.h"
-#include "apr_network_io.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_portable.h"
-#include "apr_strings.h"
-#include <string.h>
-#include "apr_arch_inherit.h"
-#include "apr_arch_misc.h"
-
-static char generic_inaddr_any[16] = {0}; /* big enough for IPv4 or IPv6 */
-
-static apr_status_t socket_cleanup(void *sock)
-{
-    apr_socket_t *thesocket = sock;
-
-    if (thesocket->socketdes != INVALID_SOCKET) {
-        if (closesocket(thesocket->socketdes) == SOCKET_ERROR) {
-            return apr_get_netos_error();
-        }
-        thesocket->socketdes = INVALID_SOCKET;
-    }
-#if APR_HAS_SENDFILE
-    if (thesocket->overlapped) {
-        CloseHandle(thesocket->overlapped->hEvent);
-        thesocket->overlapped = NULL;
-    }
-#endif
-    return APR_SUCCESS;
-}
-
-static void set_socket_vars(apr_socket_t *sock, int family, int type, int protocol)
-{
-    sock->type = type;
-    sock->protocol = protocol;
-    apr_sockaddr_vars_set(sock->local_addr, family, 0);
-    apr_sockaddr_vars_set(sock->remote_addr, family, 0);
-}                                                                                                  
-static void alloc_socket(apr_socket_t **new, apr_pool_t *p)
-{
-    *new = (apr_socket_t *)apr_pcalloc(p, sizeof(apr_socket_t));
-    (*new)->cntxt = p;
-    (*new)->local_addr = (apr_sockaddr_t *)apr_pcalloc((*new)->cntxt,
-                                                       sizeof(apr_sockaddr_t));
-    (*new)->local_addr->pool = p;
-    (*new)->remote_addr = (apr_sockaddr_t *)apr_pcalloc((*new)->cntxt,
-                                                        sizeof(apr_sockaddr_t));
-    (*new)->remote_addr->pool = p;
-}
-
-APR_DECLARE(apr_status_t) apr_socket_protocol_get(apr_socket_t *sock,
-                                                  int *protocol)
-{
-    *protocol = sock->protocol;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_socket_create_ex(apr_socket_t **new, int family,
-                                               int type, int protocol, 
-                                               apr_pool_t *cont)
-{
-    int downgrade = (family == AF_UNSPEC);
-
-    if (family == AF_UNSPEC) {
-#if APR_HAVE_IPV6
-        family = AF_INET6;
-#else
-        family = AF_INET;
-#endif
-    }
-
-    alloc_socket(new, cont);
-
-    /* For right now, we are not using socket groups.  We may later.
-     * No flags to use when creating a socket, so use 0 for that parameter as well.
-     */
-    (*new)->socketdes = socket(family, type, protocol);
-#if APR_HAVE_IPV6
-    if ((*new)->socketdes == INVALID_SOCKET && downgrade) {
-        family = AF_INET;
-        (*new)->socketdes = socket(family, type, protocol);
-    }
-#endif
-
-    if ((*new)->socketdes == INVALID_SOCKET) {
-        return apr_get_netos_error();
-    }
-
-#ifdef WIN32
-    /* Socket handles are never truly inheritable, there are too many
-     * bugs associated.  WSADuplicateSocket will copy them, but for our
-     * purposes, always transform the socket() created as a non-inherited
-     * handle
-     */
-#if APR_HAS_UNICODE_FS && !defined(_WIN32_WCE)
-    IF_WIN_OS_IS_UNICODE {
-        /* A different approach.  Many users report errors such as 
-         * (32538)An operation was attempted on something that is not 
-         * a socket.  : Parent: WSADuplicateSocket failed...
-         *
-         * This appears that the duplicated handle is no longer recognized
-         * as a socket handle.  SetHandleInformation should overcome that
-         * problem by not altering the handle identifier.  But this won't
-         * work on 9x - it's unsupported.
-         */
-        SetHandleInformation((HANDLE) (*new)->socketdes, 
-                             HANDLE_FLAG_INHERIT, 0);
-    }
-#endif
-#if APR_HAS_ANSI_FS || defined(_WIN32_WCE)
-    ELSE_WIN_OS_IS_ANSI {
-        HANDLE hProcess = GetCurrentProcess();
-        HANDLE dup;
-        if (DuplicateHandle(hProcess, (HANDLE) (*new)->socketdes, hProcess, 
-                            &dup, 0, FALSE, DUPLICATE_SAME_ACCESS)) {
-            closesocket((*new)->socketdes);
-            (*new)->socketdes = (SOCKET) dup;
-        }
-    }
-#endif
-
-#endif /* def WIN32 */
-
-    set_socket_vars(*new, family, type, protocol);
-
-    (*new)->timeout = -1;
-    (*new)->disconnected = 0;
-
-    apr_pool_cleanup_register((*new)->cntxt, (void *)(*new), 
-                        socket_cleanup, apr_pool_cleanup_null);
-
-    return APR_SUCCESS;
-} 
-
-APR_DECLARE(apr_status_t) apr_socket_create(apr_socket_t **new, int family,
-                                            int type, apr_pool_t *cont)
-{
-    return apr_socket_create_ex(new, family, type, 0, cont);
-}
-
-APR_DECLARE(apr_status_t) apr_socket_shutdown(apr_socket_t *thesocket,
-                                              apr_shutdown_how_e how)
-{
-    int winhow = 0;
-
-#ifdef SD_RECEIVE
-    switch (how) {
-        case APR_SHUTDOWN_READ: {
-            winhow = SD_RECEIVE;
-            break;
-        }
-        case APR_SHUTDOWN_WRITE: {
-            winhow = SD_SEND;
-            break;
-        }
-        case APR_SHUTDOWN_READWRITE: {
-            winhow = SD_BOTH;
-            break;
-        }
-        default:
-            return APR_BADARG;
-    }
-#endif
-    if (shutdown(thesocket->socketdes, winhow) == 0) {
-        return APR_SUCCESS;
-    }
-    else {
-        return apr_get_netos_error();
-    }
-}
-
-APR_DECLARE(apr_status_t) apr_socket_close(apr_socket_t *thesocket)
-{
-    apr_pool_cleanup_kill(thesocket->cntxt, thesocket, socket_cleanup);
-    return socket_cleanup(thesocket);
-}
-
-APR_DECLARE(apr_status_t) apr_socket_bind(apr_socket_t *sock,
-                                          apr_sockaddr_t *sa)
-{
-    if (bind(sock->socketdes, 
-             (struct sockaddr *)&sa->sa, 
-             sa->salen) == -1) {
-        return apr_get_netos_error();
-    }
-    else {
-        sock->local_addr = sa;
-        if (sock->local_addr->sa.sin.sin_port == 0) {
-            sock->local_port_unknown = 1; /* ephemeral port */
-        }
-        return APR_SUCCESS;
-    }
-}
-
-APR_DECLARE(apr_status_t) apr_socket_listen(apr_socket_t *sock,
-                                            apr_int32_t backlog)
-{
-    if (listen(sock->socketdes, backlog) == SOCKET_ERROR)
-        return apr_get_netos_error();
-    else
-        return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_socket_accept(apr_socket_t **new, 
-                                            apr_socket_t *sock, apr_pool_t *p)
-{
-    SOCKET s;
-    struct sockaddr sa;
-    int salen = sizeof(sock->remote_addr->sa);
-
-    /* Don't allocate the memory until after we call accept. This allows
-       us to work with nonblocking sockets. */
-    s = accept(sock->socketdes, (struct sockaddr *)&sa, &salen);
-    if (s == INVALID_SOCKET) {
-        return apr_get_netos_error();
-    }
-
-    alloc_socket(new, p);
-    set_socket_vars(*new, sock->local_addr->sa.sin.sin_family, SOCK_STREAM, 
-                    sock->protocol);
-
-    (*new)->timeout = -1;   
-    (*new)->disconnected = 0;
-
-    (*new)->socketdes = s;
-    /* XXX next line looks bogus w.r.t. AF_INET6 support */
-    (*new)->remote_addr->salen = sizeof((*new)->remote_addr->sa);
-    memcpy (&(*new)->remote_addr->sa, &sa, salen);
-    *(*new)->local_addr = *sock->local_addr;
-
-    /* The above assignment just overwrote the pool entry. Setting the local_addr 
-       pool for the accepted socket back to what it should be.  Otherwise all 
-       allocations for this socket will come from a server pool that is not
-       freed until the process goes down.*/
-    (*new)->local_addr->pool = p;
-
-    /* fix up any pointers which are no longer valid */
-    if (sock->local_addr->sa.sin.sin_family == AF_INET) {
-        (*new)->local_addr->ipaddr_ptr = &(*new)->local_addr->sa.sin.sin_addr;
-    }
-#if APR_HAVE_IPV6
-    else if (sock->local_addr->sa.sin.sin_family == AF_INET6) {
-        (*new)->local_addr->ipaddr_ptr = &(*new)->local_addr->sa.sin6.sin6_addr;
-    }
-#endif
-    (*new)->remote_addr->port = ntohs((*new)->remote_addr->sa.sin.sin_port);
-    if (sock->local_port_unknown) {
-        /* not likely for a listening socket, but theoretically possible :) */
-        (*new)->local_port_unknown = 1;
-    }
-
-#if APR_TCP_NODELAY_INHERITED
-    if (apr_is_option_set(sock->netmask, APR_TCP_NODELAY) == 1) {
-        apr_set_option(&(*new)->netmask, APR_TCP_NODELAY, 1);
-    }
-#endif /* TCP_NODELAY_INHERITED */
-#if APR_O_NONBLOCK_INHERITED
-    if (apr_is_option_set(sock->netmask, APR_SO_NONBLOCK) == 1) {
-        apr_set_option(&(*new)->netmask, APR_SO_NONBLOCK, 1);
-    }
-#endif /* APR_O_NONBLOCK_INHERITED */
-
-    if (sock->local_interface_unknown ||
-        !memcmp(sock->local_addr->ipaddr_ptr,
-                generic_inaddr_any,
-                sock->local_addr->ipaddr_len)) {
-        /* If the interface address inside the listening socket's local_addr wasn't
-         * up-to-date, we don't know local interface of the connected socket either.
-         *
-         * If the listening socket was not bound to a specific interface, we
-         * don't know the local_addr of the connected socket.
-         */
-        (*new)->local_interface_unknown = 1;
-    }
-
-    apr_pool_cleanup_register((*new)->cntxt, (void *)(*new), 
-                        socket_cleanup, apr_pool_cleanup_null);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_socket_connect(apr_socket_t *sock, 
-                                             apr_sockaddr_t *sa)
-{
-    apr_status_t rv;
-
-    if ((sock->socketdes == INVALID_SOCKET) || (!sock->local_addr)) {
-        return APR_ENOTSOCK;
-    }
-
-    if (connect(sock->socketdes, (const struct sockaddr *)&sa->sa.sin,
-                sa->salen) == SOCKET_ERROR) {
-        int rc;
-        struct timeval tv, *tvptr;
-        fd_set wfdset, efdset;
-
-        rv = apr_get_netos_error();
-        if (rv != APR_FROM_OS_ERROR(WSAEWOULDBLOCK)) {
-            return rv;
-        }
-
-        if (sock->timeout == 0) {
-            /* Tell the app that the connect is in progress...
-             * Gotta play some games here.  connect on Unix will return 
-             * EINPROGRESS under the same circumstances that Windows 
-             * returns WSAEWOULDBLOCK. Do some adhoc canonicalization...
-             */
-            return APR_FROM_OS_ERROR(WSAEINPROGRESS);
-        }
-
-        /* wait for the connect to complete or timeout */
-        FD_ZERO(&wfdset);
-        FD_SET(sock->socketdes, &wfdset);
-        FD_ZERO(&efdset);
-        FD_SET(sock->socketdes, &efdset);
-
-        if (sock->timeout < 0) {
-            tvptr = NULL;
-        }
-        else {
-            /* casts for winsock/timeval definition */
-            tv.tv_sec =  (long)apr_time_sec(sock->timeout);
-            tv.tv_usec = (int)apr_time_usec(sock->timeout);
-            tvptr = &tv;
-        }
-        rc = select(FD_SETSIZE+1, NULL, &wfdset, &efdset, tvptr);
-        if (rc == SOCKET_ERROR) {
-            return apr_get_netos_error();
-        }
-        else if (!rc) {
-            return APR_FROM_OS_ERROR(WSAETIMEDOUT);
-        }
-        /* Evaluate the efdset */
-        if (FD_ISSET(sock->socketdes, &efdset)) {
-            /* The connect failed. */
-            int rclen = sizeof(rc);
-            if (getsockopt(sock->socketdes, SOL_SOCKET, SO_ERROR, (char*) &rc, &rclen)) {
-                return apr_get_netos_error();
-            }
-            return APR_FROM_OS_ERROR(rc);
-        }
-    }
-    /* connect was OK .. amazing */
-    sock->remote_addr = sa;
-    if (sock->local_addr->sa.sin.sin_port == 0) {
-        sock->local_port_unknown = 1;
-    }
-    if (!memcmp(sock->local_addr->ipaddr_ptr,
-                generic_inaddr_any,
-                sock->local_addr->ipaddr_len)) {
-        /* not bound to specific local interface; connect() had to assign
-         * one for the socket
-         */
-        sock->local_interface_unknown = 1;
-    }
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_socket_data_get(void **data, const char *key,
-                                             apr_socket_t *sock)
-{
-    sock_userdata_t *cur = sock->userdata;
-
-    *data = NULL;
-
-    while (cur) {
-        if (!strcmp(cur->key, key)) {
-            *data = cur->data;
-            break;
-        }
-        cur = cur->next;
-    }
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_socket_data_set(apr_socket_t *sock, void *data,
-                                             const char *key,
-                                             apr_status_t (*cleanup)(void *))
-{
-    sock_userdata_t *new = apr_palloc(sock->cntxt, sizeof(sock_userdata_t));
-
-    new->key = apr_pstrdup(sock->cntxt, key);
-    new->data = data;
-    new->next = sock->userdata;
-    sock->userdata = new;
-
-    if (cleanup) {
-        apr_pool_cleanup_register(sock->cntxt, data, cleanup, cleanup);
-    }
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_sock_get(apr_os_sock_t *thesock,
-                                          apr_socket_t *sock)
-{
-    *thesock = sock->socketdes;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_sock_make(apr_socket_t **apr_sock,
-                                           apr_os_sock_info_t *os_sock_info,
-                                           apr_pool_t *cont)
-{
-    alloc_socket(apr_sock, cont);
-#ifdef APR_ENABLE_FOR_1_0 /* no protocol field yet */
-    set_socket_vars(*apr_sock, os_sock_info->family, os_sock_info->type, os_sock_info->protocol);
-#else
-    set_socket_vars(*apr_sock, os_sock_info->family, os_sock_info->type, 0);
-#endif
-    (*apr_sock)->timeout = -1;
-    (*apr_sock)->disconnected = 0;
-    (*apr_sock)->socketdes = *os_sock_info->os_sock;
-    if (os_sock_info->local) {
-        memcpy(&(*apr_sock)->local_addr->sa.sin, 
-               os_sock_info->local, 
-               (*apr_sock)->local_addr->salen);
-        (*apr_sock)->local_addr->pool = cont;
-        /* XXX IPv6 - this assumes sin_port and sin6_port at same offset */
-        (*apr_sock)->local_addr->port = ntohs((*apr_sock)->local_addr->sa.sin.sin_port);
-    }
-    else {
-        (*apr_sock)->local_port_unknown = (*apr_sock)->local_interface_unknown = 1;
-    }
-    if (os_sock_info->remote) {
-        memcpy(&(*apr_sock)->remote_addr->sa.sin, 
-               os_sock_info->remote,
-               (*apr_sock)->remote_addr->salen);
-        (*apr_sock)->remote_addr->pool = cont;
-        /* XXX IPv6 - this assumes sin_port and sin6_port at same offset */
-        (*apr_sock)->remote_addr->port = ntohs((*apr_sock)->remote_addr->sa.sin.sin_port);
-    }
-    else {
-        (*apr_sock)->remote_addr_unknown = 1;
-    }
-        
-    apr_pool_cleanup_register((*apr_sock)->cntxt, (void *)(*apr_sock), 
-                        socket_cleanup, apr_pool_cleanup_null);
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_sock_put(apr_socket_t **sock,
-                                          apr_os_sock_t *thesock,
-                                          apr_pool_t *cont)
-{
-    if ((*sock) == NULL) {
-        alloc_socket(sock, cont);
-        /* XXX figure out the actual socket type here */
-        /* *or* just decide that apr_os_sock_put() has to be told the family and type */
-        set_socket_vars(*sock, AF_INET, SOCK_STREAM, 0);
-        (*sock)->timeout = -1;
-        (*sock)->disconnected = 0;
-    }
-    (*sock)->local_port_unknown = (*sock)->local_interface_unknown = 1;
-    (*sock)->remote_addr_unknown = 1;
-    (*sock)->socketdes = *thesock;
-    return APR_SUCCESS;
-}
-
-
-/* Sockets cannot be inherited through the standard sockets
- * inheritence.  WSADuplicateSocket must be used.
- * This is not trivial to implement.
- */
-
-APR_DECLARE(apr_status_t) apr_socket_inherit_set(apr_socket_t *socket)    
-{    
-    return APR_ENOTIMPL;
-}    
-/* Deprecated */    
-APR_DECLARE(void) apr_socket_set_inherit(apr_socket_t *socket)    
-{    
-    apr_socket_inherit_set(socket);    
-}
-
-APR_DECLARE(apr_status_t) apr_socket_inherit_unset(apr_socket_t *socket)    
-{    
-    return APR_ENOTIMPL;
-}    
-/* Deprecated */    
-APR_DECLARE(void) apr_socket_unset_inherit(apr_socket_t *socket)    
-{    
-    apr_socket_inherit_unset(socket);    
-}
-/* Deprecated */
-APR_DECLARE(apr_status_t) apr_shutdown(apr_socket_t *thesocket,
-                                       apr_shutdown_how_e how)
-{
-    return apr_socket_shutdown(thesocket, how);
-}
-
-/* Deprecated */
-APR_DECLARE(apr_status_t) apr_bind(apr_socket_t *sock, apr_sockaddr_t *sa)
-{
-    return apr_socket_bind(sock, sa);
-}
-
-/* Deprecated */
-APR_DECLARE(apr_status_t) apr_listen(apr_socket_t *sock, apr_int32_t backlog)
-{
-    return apr_socket_listen(sock, backlog);
-}
-
-/* Deprecated */
-APR_DECLARE(apr_status_t) apr_accept(apr_socket_t **new, apr_socket_t *sock,
-                                     apr_pool_t *p)
-{
-    return apr_socket_accept(new, sock, p);
-}
-
-/* Deprecated */
-APR_DECLARE(apr_status_t) apr_connect(apr_socket_t *sock, apr_sockaddr_t *sa)
-{
-    return apr_socket_connect(sock, sa);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/win32/sockopt.c b/rubbos/app/httpd-2.0.64/srclib/apr/network_io/win32/sockopt.c
deleted file mode 100644
index ab5dafd1..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/network_io/win32/sockopt.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_networkio.h"
-#include "apr_network_io.h"
-#include "apr_general.h"
-#include "apr_strings.h"
-#include <string.h>
-
-apr_status_t soblock(SOCKET sd)
-{
-    u_long zero = 0;
-
-    if (ioctlsocket(sd, FIONBIO, &zero) == SOCKET_ERROR) {
-        return apr_get_netos_error();
-    }
-    return APR_SUCCESS;
-}
-
-apr_status_t sononblock(SOCKET sd)
-{
-    u_long one = 1;
-
-    if (ioctlsocket(sd, FIONBIO, &one) == SOCKET_ERROR) {
-        return apr_get_netos_error();
-    }
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_socket_timeout_set(apr_socket_t *sock, apr_interval_time_t t)
-{
-    apr_status_t stat;
-
-    if (t == 0) {
-        /* Set the socket non-blocking if it was previously blocking */
-        if (sock->timeout != 0) {
-            if ((stat = sononblock(sock->socketdes)) != APR_SUCCESS)
-                return stat;
-        }
-    }
-    else if (t > 0) {
-        /* Set the socket to blocking if it was previously non-blocking */
-        if (sock->timeout == 0) {
-            if ((stat = soblock(sock->socketdes)) != APR_SUCCESS)
-                return stat;
-        }
-        /* Reset socket timeouts if the new timeout differs from the old timeout */
-        if (sock->timeout != t) 
-        {
-            /* Win32 timeouts are in msec, represented as int */
-            sock->timeout_ms = (int)apr_time_as_msec(t);
-            setsockopt(sock->socketdes, SOL_SOCKET, SO_RCVTIMEO, 
-                       (char *) &sock->timeout_ms, 
-                       sizeof(sock->timeout_ms));
-            setsockopt(sock->socketdes, SOL_SOCKET, SO_SNDTIMEO, 
-                       (char *) &sock->timeout_ms, 
-                       sizeof(sock->timeout_ms));
-        }
-    }
-    else if (t < 0) {
-        int zero = 0;
-        /* Set the socket to blocking with infinite timeouts */
-        if ((stat = soblock(sock->socketdes)) != APR_SUCCESS)
-            return stat;
-        setsockopt(sock->socketdes, SOL_SOCKET, SO_RCVTIMEO, 
-                   (char *) &zero, sizeof(zero));
-        setsockopt(sock->socketdes, SOL_SOCKET, SO_SNDTIMEO, 
-                   (char *) &zero, sizeof(zero));
-    }
-    sock->timeout = t;
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_socket_opt_set(apr_socket_t *sock,
-                                             apr_int32_t opt, apr_int32_t on)
-{
-    int one;
-    apr_status_t stat;
-
-    one = on ? 1 : 0;
-
-    switch (opt) {
-    case APR_SO_TIMEOUT: 
-    {
-        /* XXX: To be deprecated */
-        return apr_socket_timeout_set(sock, on);
-    }
-    case APR_SO_KEEPALIVE:
-        if (on != apr_is_option_set(sock->netmask, APR_SO_KEEPALIVE)) {
-            if (setsockopt(sock->socketdes, SOL_SOCKET, SO_KEEPALIVE, 
-                           (void *)&one, sizeof(int)) == -1) {
-                return apr_get_netos_error();
-            }
-            apr_set_option(&sock->netmask,APR_SO_KEEPALIVE, on);
-        }
-        break;
-    case APR_SO_DEBUG:
-        if (on != apr_is_option_set(sock->netmask, APR_SO_DEBUG)) {
-            if (setsockopt(sock->socketdes, SOL_SOCKET, SO_DEBUG, 
-                           (void *)&one, sizeof(int)) == -1) {
-                return apr_get_netos_error();
-            }
-            apr_set_option(&sock->netmask, APR_SO_DEBUG, on);
-        }
-        break;
-    case APR_SO_SNDBUF:
-        if (setsockopt(sock->socketdes, SOL_SOCKET, SO_SNDBUF,
-                       (void *)&on, sizeof(int)) == -1) {
-            return apr_get_netos_error();
-        }
-        break;
-    case APR_SO_RCVBUF:
-        if (setsockopt(sock->socketdes, SOL_SOCKET, SO_RCVBUF,
-                       (void *)&on, sizeof(int)) == -1) {
-            return apr_get_netos_error();
-        }
-        break;
-    case APR_SO_REUSEADDR:
-        if (on != apr_is_option_set(sock->netmask, APR_SO_REUSEADDR)) {
-            if (setsockopt(sock->socketdes, SOL_SOCKET, SO_REUSEADDR, 
-                           (void *)&one, sizeof(int)) == -1) {
-                return apr_get_netos_error();
-            }
-            apr_set_option(&sock->netmask, APR_SO_REUSEADDR, on);
-        }
-        break;
-    case APR_SO_NONBLOCK:
-        if (apr_is_option_set(sock->netmask, APR_SO_NONBLOCK) != on) {
-            if (on) {
-                if ((stat = sononblock(sock->socketdes)) != APR_SUCCESS) 
-                    return stat;
-            }
-            else {
-                if ((stat = soblock(sock->socketdes)) != APR_SUCCESS)
-                    return stat;
-            }
-            apr_set_option(&sock->netmask, APR_SO_NONBLOCK, on);
-        }
-        break;
-    case APR_SO_LINGER:
-    {
-        if (apr_is_option_set(sock->netmask, APR_SO_LINGER) != on) {
-            struct linger li;
-            li.l_onoff = on;
-            li.l_linger = APR_MAX_SECS_TO_LINGER;
-            if (setsockopt(sock->socketdes, SOL_SOCKET, SO_LINGER, 
-                           (char *) &li, sizeof(struct linger)) == -1) {
-                return apr_get_netos_error();
-            }
-            apr_set_option(&sock->netmask, APR_SO_LINGER, on);
-        }
-        break;
-    }
-    case APR_TCP_NODELAY:
-        if (apr_is_option_set(sock->netmask, APR_TCP_NODELAY) != on) {
-            int optlevel = IPPROTO_TCP;
-            int optname = TCP_NODELAY;
-
-#if APR_HAVE_SCTP
-            if (sock->protocol == IPPROTO_SCTP) {
-                optlevel = IPPROTO_SCTP;
-                optname = SCTP_NODELAY;
-            }
-#endif
-            if (setsockopt(sock->socketdes, optlevel, optname,
-                           (void *)&on, sizeof(int)) == -1) {
-                return apr_get_netos_error();
-            }
-            apr_set_option(&sock->netmask, APR_TCP_NODELAY, on);
-        }
-        break;
-    case APR_IPV6_V6ONLY:
-#if APR_HAVE_IPV6 && defined(IPV6_V6ONLY)
-        /* we don't know the initial setting of this option,
-         * so don't check sock->netmask since that optimization
-         * won't work
-         */
-        if (setsockopt(sock->socketdes, IPPROTO_IPV6, IPV6_V6ONLY,
-                       (void *)&on, sizeof(int)) == -1) {
-            return apr_get_netos_error();
-        }
-        apr_set_option(&sock->netmask, APR_IPV6_V6ONLY, on);
-#else
-        return APR_ENOTIMPL;
-#endif
-        break;
-    default:
-        return APR_EINVAL;
-        break;
-    }
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_socket_timeout_get(apr_socket_t *sock, apr_interval_time_t *t)
-{
-    *t = sock->timeout;
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_socket_opt_get(apr_socket_t *sock,
-                                             apr_int32_t opt, apr_int32_t *on)
-{
-    switch (opt) {
-    case APR_SO_TIMEOUT: 
-        /* XXX: to be deprecated */
-        *on = (apr_int32_t)sock->timeout;
-        break;
-    case APR_SO_DISCONNECTED:
-        *on = sock->disconnected;
-        break;
-    case APR_SO_KEEPALIVE:
-    case APR_SO_DEBUG:
-    case APR_SO_REUSEADDR:
-    case APR_SO_NONBLOCK:
-    case APR_SO_LINGER:
-    default:
-        *on = apr_is_option_set(sock->netmask, opt);
-    }
-    return APR_SUCCESS;
-}
-
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_setsocketopt(apr_socket_t *sock,
-                                           apr_int32_t opt, apr_int32_t on)
-{
-    return apr_socket_opt_set(sock, opt, on);
-}
-
-APR_DECLARE(apr_status_t) apr_getsocketopt(apr_socket_t *sock,
-                                           apr_int32_t opt, apr_int32_t *on)
-{
-    return apr_socket_opt_get(sock, opt, on);
-}
-                                           
-
-APR_DECLARE(apr_status_t) apr_socket_atmark(apr_socket_t *sock, int *atmark)
-{
-    u_long oobmark;
-
-    if (ioctlsocket(sock->socketdes, SIOCATMARK, (void*) &oobmark) < 0)
-        return apr_get_netos_error();
-
-    *atmark = (oobmark != 0);
-
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_gethostname(char *buf, int len,
-                                          apr_pool_t *cont)
-{
-    if (gethostname(buf, len) == -1) {
-        buf[0] = '\0';
-        return apr_get_netos_error();
-    }
-    else if (!memchr(buf, '\0', len)) { /* buffer too small */
-        buf[0] = '\0';
-        return APR_ENAMETOOLONG;
-    }
-    return APR_SUCCESS;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/passwd/.libs/apr_getpass.o b/rubbos/app/httpd-2.0.64/srclib/apr/passwd/.libs/apr_getpass.o
deleted file mode 100644
index 08254349..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/passwd/.libs/apr_getpass.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/passwd/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/passwd/Makefile
deleted file mode 100644
index 8b7361b2..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/passwd/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-srcdir = .
-
-
-TARGETS = apr_getpass.lo
-
-# bring in rules.mk for standard functionality
-include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
-
-INCDIR=../include
-DEFOSDIR=$(INCDIR)/arch/unix
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/passwd/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/passwd/Makefile.in
deleted file mode 100644
index 162d415e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/passwd/Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = apr_getpass.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../include
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/passwd/apr_getpass.c b/rubbos/app/httpd-2.0.64/srclib/apr/passwd/apr_getpass.c
deleted file mode 100644
index 3bc5cd93..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/passwd/apr_getpass.c
+++ /dev/null
@@ -1,231 +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.
- */
-
-/* apr_password_get.c: abstraction to provide for obtaining a password from the
- * command line in whatever way the OS supports.  In the best case, it's a
- * wrapper for the system library's getpass() routine; otherwise, we
- * use one we define ourselves.
- */
-#include "apr_private.h"
-#include "apr_strings.h"
-#include "apr_lib.h"
-#include "apr_errno.h"
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if APR_HAVE_ERRNO_H
-#include <errno.h>
-#endif
-
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#if APR_HAVE_CONIO_H
-#pragma warning(disable: 4032)
-#include <conio.h>
-#pragma warning(default: 4032)
-#endif
-#if APR_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#if APR_HAVE_STRING_H
-#include <string.h>
-#endif
-#if APR_HAVE_STRINGS_H
-#include <strings.h>
-#endif
-
-#if defined(HAVE_TERMIOS_H) && !defined(HAVE_GETPASS)
-#include <termios.h>
-#endif
-
-#if !APR_CHARSET_EBCDIC
-#define LF 10
-#define CR 13
-#else /* APR_CHARSET_EBCDIC */
-#define LF '\n'
-#define CR '\r'
-#endif /* APR_CHARSET_EBCDIC */
-
-#define MAX_STRING_LEN 256
-
-#define ERR_OVERFLOW 5
-
-#ifndef HAVE_GETPASS
-
-/* MPE, Win32, NetWare and BeOS all lack a native getpass() */
-
-#if !defined(HAVE_TERMIOS_H) && !defined(WIN32) && !defined(NETWARE)
-/*
- * MPE lacks getpass() and a way to suppress stdin echo.  So for now, just
- * issue the prompt and read the results with echo.  (Ugh).
- */
-
-static char *getpass(const char *prompt)
-{
-    static char password[MAX_STRING_LEN];
-
-    fputs(prompt, stderr);
-    fgets((char *) &password, sizeof(password), stdin);
-
-    return (char *) &password;
-}
-
-#elif defined (HAVE_TERMIOS_H)
-#include <stdio.h>
-
-static char *getpass(const char *prompt)
-{
-    struct termios attr;
-    static char password[MAX_STRING_LEN];
-    int n=0;
-    fputs(prompt, stderr);
-    fflush(stderr);
-	
-    if (tcgetattr(STDIN_FILENO, &attr) != 0)
-        return NULL;
-    attr.c_lflag &= ~(ECHO);
-
-    if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &attr) != 0)
-	    return NULL;
-    while ((password[n] = getchar()) != '\n') {
-        if (n < sizeof(password) - 1 && password[n] >= ' ' && password[n] <= '~') {
-            n++;
-        } else {
-            fprintf(stderr,"\n");
-            fputs(prompt, stderr);
-            fflush(stderr);
-            n = 0;
-        }
-    }
- 
-    password[n] = '\0';
-    printf("\n");
-    if (n > (MAX_STRING_LEN - 1)) {
-        password[MAX_STRING_LEN - 1] = '\0';
-    }
-
-    attr.c_lflag |= ECHO;
-    tcsetattr(STDIN_FILENO, TCSANOW, &attr);
-    return (char*) &password;
-}
-
-#else
-
-/*
- * Windows lacks getpass().  So we'll re-implement it here.
- */
-
-static char *getpass(const char *prompt)
-{
-/* WCE lacks console. So the getpass is unsuported
- * The only way is to use the GUI so the getpass should be implemented
- * on per-application basis.
- */ 
-#ifdef _WIN32_WCE
-    return NULL;
-#else
-    static char password[128];
-    int n = 0;
-    int ch;
-
-    fputs(prompt, stderr);
-    
-    while ((ch = _getch()) != '\r') {
-        if (ch == EOF) /* EOF */ {
-            fputs("[EOF]\n", stderr);
-            return NULL;
-        }
-        else if (ch == 0 || ch == 0xE0) {
-            /* FN Keys (0 or E0) are a sentinal for a FN code */ 
-            ch = (ch << 4) | _getch();
-            /* Catch {DELETE}, {<--}, Num{DEL} and Num{<--} */
-            if ((ch == 0xE53 || ch == 0xE4B || ch == 0x053 || ch == 0x04b) && n) {
-                password[--n] = '\0';
-                fputs("\b \b", stderr);
-            }
-            else {
-                fputc('\a', stderr);
-            }
-        }
-        else if ((ch == '\b' || ch == 127) && n) /* BS/DEL */ {
-            password[--n] = '\0';
-            fputs("\b \b", stderr);
-        }
-        else if (ch == 3) /* CTRL+C */ {
-            /* _getch() bypasses Ctrl+C but not Ctrl+Break detection! */
-            fputs("^C\n", stderr);
-            exit(-1);
-        }
-        else if (ch == 26) /* CTRL+Z */ {
-            fputs("^Z\n", stderr);
-            return NULL;
-        }
-	else if (ch == 27) /* ESC */ {
-            fputc('\n', stderr);
-            fputs(prompt, stderr);
-            n = 0;
-        }
-        else if ((n < sizeof(password) - 1) && !apr_iscntrl(ch)) {
-            password[n++] = ch;
-            fputc('*', stderr);
-        }
-	else {
-            fputc('\a', stderr);
-        }
-    }
- 
-    fputc('\n', stderr);
-    password[n] = '\0';
-    return password;
-#endif
-}
-
-#endif /* no getchar or _getch */
-
-#endif /* no getpass */
-
-/*
- * Use the OS getpass() routine (or our own) to obtain a password from
- * the input stream.
- *
- * Exit values:
- *  0: Success
- *  5: Partial success; entered text truncated to the size of the
- *     destination buffer
- *
- * Restrictions: Truncation also occurs according to the host system's
- * getpass() semantics, or at position 255 if our own version is used,
- * but the caller is *not* made aware of it unless their own buffer is
- * smaller than our own.
- */
-
-APR_DECLARE(apr_status_t) apr_password_get(const char *prompt, char *pwbuf, apr_size_t *bufsiz)
-{
-#ifdef HAVE_GETPASSPHRASE
-    char *pw_got = getpassphrase(prompt);
-#else
-    char *pw_got = getpass(prompt);
-#endif
-    if (!pw_got)
-        return APR_EINVAL;
-    apr_cpystrn(pwbuf, pw_got, *bufsiz);
-    memset(pw_got, 0, strlen(pw_got));
-    if (strlen(pw_got) >= *bufsiz) {
-        return APR_ENAMETOOLONG;
-    }
-    return APR_SUCCESS; 
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/passwd/apr_getpass.lo b/rubbos/app/httpd-2.0.64/srclib/apr/passwd/apr_getpass.lo
deleted file mode 100644
index 9bf0f5e0..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/passwd/apr_getpass.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# apr_getpass.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/apr_getpass.o'
-
-# Name of the non-PIC object.
-non_pic_object='apr_getpass.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/passwd/apr_getpass.o b/rubbos/app/httpd-2.0.64/srclib/apr/passwd/apr_getpass.o
deleted file mode 100644
index 534e01fe..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/passwd/apr_getpass.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/poll/os2/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/poll/os2/Makefile.in
deleted file mode 100644
index 96fc006f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/poll/os2/Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = \
-	poll.lo \
-	pollset.lo \
-	pollacc.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/@OSDIR@
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/poll/os2/poll.c b/rubbos/app/httpd-2.0.64/srclib/apr/poll/os2/poll.c
deleted file mode 100644
index 3c36e5e6..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/poll/os2/poll.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_poll.h"
-#include "apr_arch_networkio.h"
-
-APR_DECLARE(apr_status_t) apr_poll(apr_pollfd_t *aprset, apr_int32_t num,
-                      apr_int32_t *nsds, apr_interval_time_t timeout)
-{
-    int *pollset;
-    int i;
-    int num_read = 0, num_write = 0, num_except = 0, num_total;
-    int pos_read, pos_write, pos_except;
-
-    for (i = 0; i < num; i++) {
-        if (aprset[i].desc_type == APR_POLL_SOCKET) {
-            num_read += (aprset[i].reqevents & APR_POLLIN) != 0;
-            num_write += (aprset[i].reqevents & APR_POLLOUT) != 0;
-            num_except += (aprset[i].reqevents & APR_POLLPRI) != 0;
-        }
-    }
-
-    num_total = num_read + num_write + num_except;
-    pollset = alloca(sizeof(int) * num_total);
-    memset(pollset, 0, sizeof(int) * num_total);
-
-    pos_read = 0;
-    pos_write = num_read;
-    pos_except = pos_write + num_write;
-
-    for (i = 0; i < num; i++) {
-        if (aprset[i].desc_type == APR_POLL_SOCKET) {
-            if (aprset[i].reqevents & APR_POLLIN) {
-                pollset[pos_read++] = aprset[i].desc.s->socketdes;
-            }
-
-            if (aprset[i].reqevents & APR_POLLOUT) {
-                pollset[pos_write++] = aprset[i].desc.s->socketdes;
-            }
-
-            if (aprset[i].reqevents & APR_POLLPRI) {
-                pollset[pos_except++] = aprset[i].desc.s->socketdes;
-            }
-
-            aprset[i].rtnevents = 0;
-        }
-    }
-
-    if (timeout > 0) {
-        timeout /= 1000; /* convert microseconds to milliseconds */
-    }
-
-    i = select(pollset, num_read, num_write, num_except, timeout);
-    (*nsds) = i;
-
-    if ((*nsds) < 0) {
-        return APR_FROM_OS_ERROR(sock_errno());
-    }
-
-    if ((*nsds) == 0) {
-        return APR_TIMEUP;
-    }
-
-    pos_read = 0;
-    pos_write = num_read;
-    pos_except = pos_write + num_write;
-
-    for (i = 0; i < num; i++) {
-        if (aprset[i].desc_type == APR_POLL_SOCKET) {
-            if (aprset[i].reqevents & APR_POLLIN) {
-                if (pollset[pos_read++] > 0) {
-                    aprset[i].rtnevents |= APR_POLLIN;
-                }
-            }
-
-            if (aprset[i].reqevents & APR_POLLOUT) {
-                if (pollset[pos_write++] > 0) {
-                    aprset[i].rtnevents |= APR_POLLOUT;
-                }
-            }
-
-            if (aprset[i].reqevents & APR_POLLPRI) {
-                if (pollset[pos_except++] > 0) {
-                    aprset[i].rtnevents |= APR_POLLPRI;
-                }
-            }
-        }
-    }
-
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/poll/os2/pollacc.c b/rubbos/app/httpd-2.0.64/srclib/apr/poll/os2/pollacc.c
deleted file mode 100644
index ac87d0aa..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/poll/os2/pollacc.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../unix/pollacc.c"
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/poll/os2/pollset.c b/rubbos/app/httpd-2.0.64/srclib/apr/poll/os2/pollset.c
deleted file mode 100644
index 872571f8..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/poll/os2/pollset.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_poll.h"
-#include "apr_arch_networkio.h"
-
-
-
-struct apr_pollset_t {
-    apr_pool_t *pool;
-    apr_uint32_t nelts;
-    apr_uint32_t nalloc;
-    int *pollset;
-    int num_read;
-    int num_write;
-    int num_except;
-    int num_total;
-    apr_pollfd_t *query_set;
-    apr_pollfd_t *result_set;
-};
-
-
-
-APR_DECLARE(apr_status_t) apr_pollset_create(apr_pollset_t **pollset,
-                                             apr_uint32_t size,
-                                             apr_pool_t *p,
-                                             apr_uint32_t flags)
-{
-    *pollset = apr_palloc(p, sizeof(**pollset));
-    (*pollset)->pool = p;
-    (*pollset)->nelts = 0;
-    (*pollset)->nalloc = size;
-    (*pollset)->pollset = apr_palloc(p, size * sizeof(int) * 3);
-    (*pollset)->query_set = apr_palloc(p, size * sizeof(apr_pollfd_t));
-    (*pollset)->result_set = apr_palloc(p, size * sizeof(apr_pollfd_t));
-    (*pollset)->num_read = -1;
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_pollset_destroy(apr_pollset_t *pollset)
-{
-    /* A no-op function for now.  If we later implement /dev/poll
-     * support, we'll need to close the /dev/poll fd here
-     */
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_pollset_add(apr_pollset_t *pollset,
-                                          const apr_pollfd_t *descriptor)
-{
-    if (pollset->nelts == pollset->nalloc) {
-        return APR_ENOMEM;
-    }
-
-    pollset->query_set[pollset->nelts] = *descriptor;
-
-    if (descriptor->desc_type != APR_POLL_SOCKET) {
-        return APR_EBADF;
-    }
-
-    pollset->nelts++;
-    pollset->num_read = -1;
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_pollset_remove(apr_pollset_t *pollset,
-                                             const apr_pollfd_t *descriptor)
-{
-    apr_uint32_t i;
-
-    for (i = 0; i < pollset->nelts; i++) {
-        if (descriptor->desc.s == pollset->query_set[i].desc.s) {
-            /* Found an instance of the fd: remove this and any other copies */
-            apr_uint32_t dst = i;
-            apr_uint32_t old_nelts = pollset->nelts;
-            pollset->nelts--;
-
-            for (i++; i < old_nelts; i++) {
-                if (descriptor->desc.s == pollset->query_set[i].desc.s) {
-                    pollset->nelts--;
-                }
-                else {
-                    pollset->pollset[dst] = pollset->pollset[i];
-                    pollset->query_set[dst] = pollset->query_set[i];
-                    dst++;
-                }
-            }
-
-            pollset->num_read = -1;
-            return APR_SUCCESS;
-        }
-    }
-
-    return APR_NOTFOUND;
-}
-
-
-
-static void make_pollset(apr_pollset_t *pollset)
-{
-    int i;
-    int pos = 0;
-
-    pollset->num_read = 0;
-    pollset->num_write = 0;
-    pollset->num_except = 0;
-
-    for (i = 0; i < pollset->nelts; i++) {
-        if (pollset->query_set[i].reqevents & APR_POLLIN) {
-            pollset->pollset[pos++] = pollset->query_set[i].desc.s->socketdes;
-            pollset->num_read++;
-        }
-    }
-
-    for (i = 0; i < pollset->nelts; i++) {
-        if (pollset->query_set[i].reqevents & APR_POLLOUT) {
-            pollset->pollset[pos++] = pollset->query_set[i].desc.s->socketdes;
-            pollset->num_write++;
-        }
-    }
-
-    for (i = 0; i < pollset->nelts; i++) {
-        if (pollset->query_set[i].reqevents & APR_POLLPRI) {
-            pollset->pollset[pos++] = pollset->query_set[i].desc.s->socketdes;
-            pollset->num_except++;
-        }
-    }
-
-    pollset->num_total = pollset->num_read + pollset->num_write + pollset->num_except;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset,
-                                           apr_interval_time_t timeout,
-                                           apr_int32_t *num,
-                                           const apr_pollfd_t **descriptors)
-{
-    int rv;
-    apr_uint32_t i;
-    int *pollresult;
-    int read_pos, write_pos, except_pos;
-
-    if (pollset->num_read < 0) {
-        make_pollset(pollset);
-    }
-
-    pollresult = alloca(sizeof(int) * pollset->num_total);
-    memcpy(pollresult, pollset->pollset, sizeof(int) * pollset->num_total);
-    (*num) = 0;
-
-    if (timeout > 0) {
-        timeout /= 1000;
-    }
-
-    rv = select(pollresult, pollset->num_read, pollset->num_write, pollset->num_except, timeout);
-
-    if (rv < 0) {
-        return APR_FROM_OS_ERROR(sock_errno());
-    }
-
-    if (rv == 0) {
-        return APR_TIMEUP;
-    }
-
-    read_pos = 0;
-    write_pos = pollset->num_read;
-    except_pos = pollset->num_read + pollset->num_write;
-
-    for (i = 0; i < pollset->nelts; i++) {
-        int rtnevents = 0;
-
-        if (pollset->query_set[i].reqevents & APR_POLLIN) {
-            if (pollresult[read_pos++] != -1) {
-                rtnevents |= APR_POLLIN;
-            }
-        }
-
-        if (pollset->query_set[i].reqevents & APR_POLLOUT) {
-            if (pollresult[write_pos++] != -1) {
-                rtnevents |= APR_POLLOUT;
-            }
-        }
-
-        if (pollset->query_set[i].reqevents & APR_POLLPRI) {
-            if (pollresult[except_pos++] != -1) {
-                rtnevents |= APR_POLLPRI;
-            }
-        }
-
-        if (rtnevents) {
-            pollset->result_set[*num] = pollset->query_set[i];
-            pollset->result_set[*num].rtnevents = rtnevents;
-            (*num)++;
-        }
-    }
-
-    *descriptors = pollset->result_set;
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/.libs/poll.o b/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/.libs/poll.o
deleted file mode 100644
index 3b0e57b9..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/.libs/poll.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/.libs/pollacc.o b/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/.libs/pollacc.o
deleted file mode 100644
index d5a506db..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/.libs/pollacc.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/Makefile
deleted file mode 100644
index 35ad9b16..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-srcdir = .
-
-
-TARGETS = \
-	poll.lo \
-	pollacc.lo 
-
-
-# bring in rules.mk for standard functionality
-include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/unix
-DEFOSDIR=$(INCDIR)/arch/unix
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/Makefile.in
deleted file mode 100644
index d9ab2219..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = \
-	poll.lo \
-	pollacc.lo 
-
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/@OSDIR@
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/poll.c b/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/poll.c
deleted file mode 100644
index dffda771..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/poll.c
+++ /dev/null
@@ -1,605 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_poll.h"
-#include "apr_time.h"
-#include "apr_portable.h"
-#include "apr_arch_networkio.h"
-#include "apr_arch_file_io.h"
-#if HAVE_POLL_H
-#include <poll.h>
-#endif
-#if HAVE_SYS_POLL_H
-#include <sys/poll.h>
-#endif
-#if HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
-#ifdef NETWARE
-#define HAS_SOCKETS(dt) (dt == APR_POLL_SOCKET) ? 1 : 0
-#define HAS_PIPES(dt) (dt == APR_POLL_FILE) ? 1 : 0
-#endif
-
-#ifdef HAVE_POLL    /* We can just use poll to do our socket polling. */
-
-static apr_int16_t get_event(apr_int16_t event)
-{
-    apr_int16_t rv = 0;
-
-    if (event & APR_POLLIN)
-        rv |= POLLIN;        
-    if (event & APR_POLLPRI)
-        rv |= POLLPRI;        
-    if (event & APR_POLLOUT)
-        rv |= POLLOUT;       
-    if (event & APR_POLLERR)
-        rv |= POLLERR;        
-    if (event & APR_POLLHUP)
-        rv |= POLLHUP;        
-    if (event & APR_POLLNVAL)
-        rv |= POLLNVAL;        
-
-    return rv;
-}
-
-static apr_int16_t get_revent(apr_int16_t event)
-{
-    apr_int16_t rv = 0;
-
-    if (event & POLLIN)
-        rv |= APR_POLLIN;
-    if (event & POLLPRI)
-        rv |= APR_POLLPRI;
-    if (event & POLLOUT)
-        rv |= APR_POLLOUT;
-    if (event & POLLERR)
-        rv |= APR_POLLERR;
-    if (event & POLLHUP)
-        rv |= APR_POLLHUP;
-    if (event & POLLNVAL)
-        rv |= APR_POLLNVAL;
-
-    return rv;
-}        
-
-#define SMALL_POLLSET_LIMIT  8
-
-APR_DECLARE(apr_status_t) apr_poll(apr_pollfd_t *aprset, apr_int32_t num,
-                      apr_int32_t *nsds, apr_interval_time_t timeout)
-{
-    int i, num_to_poll;
-#ifdef HAVE_VLA
-    /* XXX: I trust that this is a segv when insufficient stack exists? */
-    struct pollfd pollset[num];
-#elif defined(HAVE_ALLOCA)
-    struct pollfd *pollset = alloca(sizeof(struct pollfd) * num);
-    if (!pollset)
-        return APR_ENOMEM;
-#else
-    struct pollfd tmp_pollset[SMALL_POLLSET_LIMIT];
-    struct pollfd *pollset;
-
-    if (num <= SMALL_POLLSET_LIMIT) {
-        pollset = tmp_pollset;
-    }
-    else {
-        /* This does require O(n) to copy the descriptors to the internal
-         * mapping.
-         */
-        pollset = malloc(sizeof(struct pollfd) * num);
-        /* The other option is adding an apr_pool_abort() fn to invoke
-         * the pool's out of memory handler
-         */
-        if (!pollset)
-            return APR_ENOMEM;
-    }
-#endif
-    for (i = 0; i < num; i++) {
-        if (aprset[i].desc_type == APR_POLL_SOCKET) {
-            pollset[i].fd = aprset[i].desc.s->socketdes;
-        }
-        else if (aprset[i].desc_type == APR_POLL_FILE) {
-            pollset[i].fd = aprset[i].desc.f->filedes;
-        }
-        else {
-            break;
-        }
-        pollset[i].events = get_event(aprset[i].reqevents);
-    }
-    num_to_poll = i;
-
-    if (timeout > 0) {
-        timeout /= 1000; /* convert microseconds to milliseconds */
-    }
-
-    i = poll(pollset, num_to_poll, timeout);
-    (*nsds) = i;
-
-    for (i = 0; i < num; i++) {
-        aprset[i].rtnevents = get_revent(pollset[i].revents);
-    }
-    
-#if !defined(HAVE_VLA) && !defined(HAVE_ALLOCA)
-    if (num > SMALL_POLLSET_LIMIT) {
-        free(pollset);
-    }
-#endif
-
-    if ((*nsds) < 0) {
-        return apr_get_netos_error();
-    }
-    if ((*nsds) == 0) {
-        return APR_TIMEUP;
-    }
-    return APR_SUCCESS;
-}
-
-
-#else    /* Use select to mimic poll */
-
-APR_DECLARE(apr_status_t) apr_poll(apr_pollfd_t *aprset, int num, apr_int32_t *nsds, 
-		    apr_interval_time_t timeout)
-{
-    fd_set readset, writeset, exceptset;
-    int rv, i;
-    int maxfd = -1;
-    struct timeval tv, *tvptr;
-#ifdef NETWARE
-    apr_datatype_e set_type = APR_NO_DESC;
-#endif
-
-    if (timeout < 0) {
-        tvptr = NULL;
-    }
-    else {
-        tv.tv_sec = (long)apr_time_sec(timeout);
-        tv.tv_usec = (long)apr_time_usec(timeout);
-        tvptr = &tv;
-    }
-
-    FD_ZERO(&readset);
-    FD_ZERO(&writeset);
-    FD_ZERO(&exceptset);
-
-    for (i = 0; i < num; i++) {
-        apr_os_sock_t fd;
-
-        aprset[i].rtnevents = 0;
-
-        if (aprset[i].desc_type == APR_POLL_SOCKET) {
-#ifdef NETWARE
-            if (HAS_PIPES(set_type)) {
-                return APR_EBADF;
-            }
-            else {
-                set_type = APR_POLL_SOCKET;
-            }
-#endif
-            fd = aprset[i].desc.s->socketdes;
-        }
-        else if (aprset[i].desc_type == APR_POLL_FILE) {
-#if !APR_FILES_AS_SOCKETS
-            return APR_EBADF;
-#else
-#ifdef NETWARE
-            if (aprset[i].desc.f->is_pipe && !HAS_SOCKETS(set_type)) {
-                set_type = APR_POLL_FILE;
-            }
-            else
-                return APR_EBADF;
-#endif /* NETWARE */
-
-            fd = aprset[i].desc.f->filedes;
-
-#endif /* APR_FILES_AS_SOCKETS */
-        }
-        else {
-            break;
-        }
-#if !defined(WIN32) && !defined(NETWARE) /* socket sets handled with array of handles */
-        if (fd >= FD_SETSIZE) {
-            /* XXX invent new error code so application has a clue */
-            return APR_EBADF;
-        }
-#endif
-        if (aprset[i].reqevents & APR_POLLIN) {
-            FD_SET(fd, &readset);
-        }
-        if (aprset[i].reqevents & APR_POLLOUT) {
-            FD_SET(fd, &writeset);
-        }
-        if (aprset[i].reqevents & 
-            (APR_POLLPRI | APR_POLLERR | APR_POLLHUP | APR_POLLNVAL)) {
-            FD_SET(fd, &exceptset);
-        }
-        if ((int)fd > maxfd) {
-            maxfd = (int)fd;
-        }
-    }
-
-#ifdef NETWARE
-    if (HAS_PIPES(set_type)) {
-        rv = pipe_select(maxfd + 1, &readset, &writeset, &exceptset, tvptr);
-    }
-    else {
-#endif
-
-    rv = select(maxfd + 1, &readset, &writeset, &exceptset, tvptr);
-
-#ifdef NETWARE
-    }
-#endif
-
-    (*nsds) = rv;
-    if ((*nsds) == 0) {
-        return APR_TIMEUP;
-    }
-    if ((*nsds) < 0) {
-        return apr_get_netos_error();
-    }
-
-    for (i = 0; i < num; i++) {
-        apr_os_sock_t fd;
-
-        if (aprset[i].desc_type == APR_POLL_SOCKET) {
-            fd = aprset[i].desc.s->socketdes;
-        }
-        else if (aprset[i].desc_type == APR_POLL_FILE) {
-#if !APR_FILES_AS_SOCKETS
-            return APR_EBADF;
-#else
-            fd = aprset[i].desc.f->filedes;
-#endif
-        }
-        else {
-            break;
-        }
-        if (FD_ISSET(fd, &readset)) {
-            aprset[i].rtnevents |= APR_POLLIN;
-        }
-        if (FD_ISSET(fd, &writeset)) {
-            aprset[i].rtnevents |= APR_POLLOUT;
-        }
-        if (FD_ISSET(fd, &exceptset)) {
-            aprset[i].rtnevents |= APR_POLLERR;
-        }
-    }
-
-    return APR_SUCCESS;
-}
-
-#endif 
-
-
-struct apr_pollset_t {
-    apr_uint32_t nelts;
-    apr_uint32_t nalloc;
-#ifdef HAVE_POLL
-    struct pollfd *pollset;
-#else
-    fd_set readset, writeset, exceptset;
-    int maxfd;
-#endif
-    apr_pollfd_t *query_set;
-    apr_pollfd_t *result_set;
-    apr_pool_t *pool;
-#ifdef NETWARE
-    int set_type;
-#endif
-};
-
-APR_DECLARE(apr_status_t) apr_pollset_create(apr_pollset_t **pollset,
-                                             apr_uint32_t size,
-                                             apr_pool_t *p,
-                                             apr_uint32_t flags)
-{
-#if !defined(HAVE_POLL) && defined(FD_SETSIZE)
-    if (size > FD_SETSIZE) {
-        *pollset = NULL;
-        return APR_EINVAL;
-    }
-#endif
-    *pollset = apr_palloc(p, sizeof(**pollset));
-    (*pollset)->nelts = 0;
-    (*pollset)->nalloc = size;
-#ifdef HAVE_POLL
-    (*pollset)->pollset = apr_palloc(p, size * sizeof(struct pollfd));
-#else
-    FD_ZERO(&((*pollset)->readset));
-    FD_ZERO(&((*pollset)->writeset));
-    FD_ZERO(&((*pollset)->exceptset));
-    (*pollset)->maxfd = 0;
-#ifdef NETWARE
-    (*pollset)->set_type = APR_NO_DESC;
-#endif
-#endif
-    (*pollset)->query_set = apr_palloc(p, size * sizeof(apr_pollfd_t));
-    (*pollset)->result_set = apr_palloc(p, size * sizeof(apr_pollfd_t));
-    (*pollset)->pool = p;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_pollset_destroy(apr_pollset_t *pollset)
-{
-    /* A no-op function for now.  If we later implement /dev/poll
-     * support, we'll need to close the /dev/poll fd here
-     */
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_pollset_add(apr_pollset_t *pollset,
-                                          const apr_pollfd_t *descriptor)
-{
-#ifndef HAVE_POLL
-    apr_os_sock_t fd;
-#endif
-
-    if (pollset->nelts == pollset->nalloc) {
-        return APR_ENOMEM;
-    }
-
-    pollset->query_set[pollset->nelts] = *descriptor;
-#ifdef HAVE_POLL
-
-    if (descriptor->desc_type == APR_POLL_SOCKET) {
-        pollset->pollset[pollset->nelts].fd = descriptor->desc.s->socketdes;
-    }
-    else {
-        pollset->pollset[pollset->nelts].fd = descriptor->desc.f->filedes;
-    }
-
-    pollset->pollset[pollset->nelts].events = get_event(descriptor->reqevents);
-#else
-    if (descriptor->desc_type == APR_POLL_SOCKET) {
-#ifdef NETWARE
-        /* NetWare can't handle mixed descriptor types in select() */
-        if (HAS_PIPES(pollset->set_type)) {
-            return APR_EBADF;
-        }
-        else {
-            pollset->set_type = APR_POLL_SOCKET;
-        }
-#endif
-        fd = descriptor->desc.s->socketdes;
-    }
-    else {
-#if !APR_FILES_AS_SOCKETS
-        return APR_EBADF;
-#else
-#ifdef NETWARE
-        /* NetWare can't handle mixed descriptor types in select() */
-        if (descriptor->desc.f->is_pipe && !HAS_SOCKETS(pollset->set_type)) {
-            pollset->set_type = APR_POLL_FILE;
-            fd = descriptor->desc.f->filedes;
-        }
-        else {
-            return APR_EBADF;
-        }
-#else
-        fd = descriptor->desc.f->filedes;
-#endif
-#endif
-    }
-#if !defined(WIN32) && !defined(NETWARE) /* socket sets handled with array of handles */
-    if (fd >= FD_SETSIZE) {
-        /* XXX invent new error code so application has a clue */
-        return APR_EBADF;
-    }
-#endif
-    if (descriptor->reqevents & APR_POLLIN) {
-        FD_SET(fd, &(pollset->readset));
-    }
-    if (descriptor->reqevents & APR_POLLOUT) {
-        FD_SET(fd, &(pollset->writeset));
-    }
-    if (descriptor->reqevents &
-        (APR_POLLPRI | APR_POLLERR | APR_POLLHUP | APR_POLLNVAL)) {
-        FD_SET(fd, &(pollset->exceptset));
-    }
-    if ((int)fd > pollset->maxfd) {
-        pollset->maxfd = (int)fd;
-    }
-#endif
-    pollset->nelts++;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_pollset_remove(apr_pollset_t *pollset,
-                                             const apr_pollfd_t *descriptor)
-{
-    apr_uint32_t i;
-#ifndef HAVE_POLL
-    apr_os_sock_t fd;
-#endif
-
-#ifdef HAVE_POLL
-    for (i = 0; i < pollset->nelts; i++) {
-        if (descriptor->desc.s == pollset->query_set[i].desc.s) {
-            /* Found an instance of the fd: remove this and any other copies */
-            apr_uint32_t dst = i;
-            apr_uint32_t old_nelts = pollset->nelts;
-            pollset->nelts--;
-            for (i++; i < old_nelts; i++) {
-                if (descriptor->desc.s == pollset->query_set[i].desc.s) {
-                    pollset->nelts--;
-                }
-                else {
-                    pollset->pollset[dst] = pollset->pollset[i];
-                    pollset->query_set[dst] = pollset->query_set[i];
-                    dst++;
-                }
-            }
-            return APR_SUCCESS;
-        }
-    }
-
-#else /* no poll */
-    if (descriptor->desc_type == APR_POLL_SOCKET) {
-        fd = descriptor->desc.s->socketdes;
-    }
-    else {
-#if !APR_FILES_AS_SOCKETS
-        return APR_EBADF;
-#else
-        fd = descriptor->desc.f->filedes;
-#endif
-    }
-
-    for (i = 0; i < pollset->nelts; i++) {
-        if (descriptor->desc.s == pollset->query_set[i].desc.s) {
-            /* Found an instance of the fd: remove this and any other copies */
-            apr_uint32_t dst = i;
-            apr_uint32_t old_nelts = pollset->nelts;
-            pollset->nelts--;
-            for (i++; i < old_nelts; i++) {
-                if (descriptor->desc.s == pollset->query_set[i].desc.s) {
-                    pollset->nelts--;
-                }
-                else {
-                    pollset->query_set[dst] = pollset->query_set[i];
-                    dst++;
-                }
-            }
-            FD_CLR(fd, &(pollset->readset));
-            FD_CLR(fd, &(pollset->writeset));
-            FD_CLR(fd, &(pollset->exceptset));
-            if (((int)fd == pollset->maxfd) && (pollset->maxfd > 0)) {
-                pollset->maxfd--;
-            }
-            return APR_SUCCESS;
-        }
-    }
-#endif /* no poll */
-
-    return APR_NOTFOUND;
-}
-
-#ifdef HAVE_POLL
-APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset,
-                                           apr_interval_time_t timeout,
-                                           apr_int32_t *num,
-                                           const apr_pollfd_t **descriptors)
-{
-    int rv;
-    apr_uint32_t i, j;
-
-    if (timeout > 0) {
-        timeout /= 1000;
-    }
-    rv = poll(pollset->pollset, pollset->nelts, timeout);
-    (*num) = rv;
-    if (rv < 0) {
-        return apr_get_netos_error();
-    }
-    if (rv == 0) {
-        return APR_TIMEUP;
-    }
-    j = 0;
-    for (i = 0; i < pollset->nelts; i++) {
-        if (pollset->pollset[i].revents != 0) {
-            pollset->result_set[j] = pollset->query_set[i];
-            pollset->result_set[j].rtnevents =
-                get_revent(pollset->pollset[i].revents);
-            j++;
-        }
-    }
-    *descriptors = pollset->result_set;
-    return APR_SUCCESS;
-}
-
-#else /* no poll */
-
-APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset,
-                                           apr_interval_time_t timeout,
-                                           apr_int32_t *num,
-                                           const apr_pollfd_t **descriptors)
-{
-    int rv;
-    apr_uint32_t i, j;
-    struct timeval tv, *tvptr;
-    fd_set readset, writeset, exceptset;
-
-    if (timeout < 0) {
-        tvptr = NULL;
-    }
-    else {
-        tv.tv_sec = (long)apr_time_sec(timeout);
-        tv.tv_usec = (long)apr_time_usec(timeout);
-        tvptr = &tv;
-    }
-
-    memcpy(&readset, &(pollset->readset), sizeof(fd_set));
-    memcpy(&writeset, &(pollset->writeset), sizeof(fd_set));
-    memcpy(&exceptset, &(pollset->exceptset), sizeof(fd_set));
-
-#ifdef NETWARE
-    if (HAS_PIPES(pollset->set_type)) {
-        rv = pipe_select(pollset->maxfd + 1, &readset, &writeset, &exceptset, tvptr);
-    }
-    else
-#endif
-    rv = select(pollset->maxfd + 1, &readset, &writeset, &exceptset, tvptr);
-
-    /* Set initial *num now for expected -1 / 0 failures, or errors below */
-    (*num) = rv;
-    if (rv < 0) {
-        return apr_get_netos_error();
-    }
-    if (rv == 0) {
-        return APR_TIMEUP;
-    }
-    j = 0;
-    for (i = 0; i < pollset->nelts; i++) {
-        apr_os_sock_t fd;
-        if (pollset->query_set[i].desc_type == APR_POLL_SOCKET) {
-            fd = pollset->query_set[i].desc.s->socketdes;
-        }
-        else {
-#if !APR_FILES_AS_SOCKETS
-            return APR_EBADF;
-#else
-            fd = pollset->query_set[i].desc.f->filedes;
-#endif
-        }
-        if (FD_ISSET(fd, &readset) || FD_ISSET(fd, &writeset) ||
-            FD_ISSET(fd, &exceptset)) {
-            pollset->result_set[j] = pollset->query_set[i];
-            pollset->result_set[j].rtnevents = 0;
-            if (FD_ISSET(fd, &readset)) {
-                pollset->result_set[j].rtnevents |= APR_POLLIN;
-            }
-            if (FD_ISSET(fd, &writeset)) {
-                pollset->result_set[j].rtnevents |= APR_POLLOUT;
-            }
-            if (FD_ISSET(fd, &exceptset)) {
-                pollset->result_set[j].rtnevents |= APR_POLLERR;
-            }
-            j++;
-        }
-    }
-
-    /* Reset computed *num to account for multiply-polled fd's which
-     * select() - on some platforms, treats as a single fd result.
-     * The *num returned must match the size of result_set[]
-     */
-    (*num) = j;
-    *descriptors = pollset->result_set;
-    return APR_SUCCESS;
-}
-
-#endif /* no poll */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/poll.lo b/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/poll.lo
deleted file mode 100644
index ee53f816..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/poll.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# poll.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/poll.o'
-
-# Name of the non-PIC object.
-non_pic_object='poll.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/poll.o b/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/poll.o
deleted file mode 100644
index d47744fd..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/poll.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/pollacc.c b/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/pollacc.c
deleted file mode 100644
index 3b1e3eb8..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/pollacc.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_poll.h"
-#include "apr_arch_networkio.h"
-#include "apr_arch_file_io.h"
-#if HAVE_POLL_H
-#include <poll.h>
-#endif
-#if HAVE_SYS_POLL_H
-#include <sys/poll.h>
-#endif
-
-APR_DECLARE(apr_status_t) apr_poll_setup(apr_pollfd_t **new, apr_int32_t num, apr_pool_t *cont)
-{
-    (*new) = (apr_pollfd_t *)apr_pcalloc(cont, sizeof(apr_pollfd_t) * (num + 1));
-    if ((*new) == NULL) {
-        return APR_ENOMEM;
-    }
-    (*new)[num].desc_type = APR_POLL_LASTDESC;
-    (*new)[0].p = cont;
-    return APR_SUCCESS;
-}
-
-static apr_pollfd_t *find_poll_sock(apr_pollfd_t *aprset, apr_socket_t *sock)
-{
-    apr_pollfd_t *curr = aprset;
-    
-    while (curr->desc.s != sock) {
-        if (curr->desc_type == APR_POLL_LASTDESC) {
-            return NULL;
-        }
-        curr++;
-    }
-
-    return curr;
-}
-
-APR_DECLARE(apr_status_t) apr_poll_socket_add(apr_pollfd_t *aprset, 
-			       apr_socket_t *sock, apr_int16_t event)
-{
-    apr_pollfd_t *curr = aprset;
-    
-    while (curr->desc_type != APR_NO_DESC) {
-        if (curr->desc_type == APR_POLL_LASTDESC) {
-            return APR_ENOMEM;
-        }
-        curr++;
-    }
-    curr->desc.s = sock;
-    curr->desc_type = APR_POLL_SOCKET;
-    curr->reqevents = event;
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_poll_revents_get(apr_int16_t *event, apr_socket_t *sock, apr_pollfd_t *aprset)
-{
-    apr_pollfd_t *curr = find_poll_sock(aprset, sock);
-    if (curr == NULL) {
-        return APR_NOTFOUND;
-    }
-
-    (*event) = curr->rtnevents;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_poll_socket_mask(apr_pollfd_t *aprset, 
-                                  apr_socket_t *sock, apr_int16_t events)
-{
-    apr_pollfd_t *curr = find_poll_sock(aprset, sock);
-    if (curr == NULL) {
-        return APR_NOTFOUND;
-    }
-    
-    if (curr->reqevents & events) {
-        curr->reqevents ^= events;
-    }
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_poll_socket_remove(apr_pollfd_t *aprset, apr_socket_t *sock)
-{
-    apr_pollfd_t *match = NULL;
-    apr_pollfd_t *curr;
-
-    for (curr = aprset; (curr->desc_type != APR_POLL_LASTDESC) &&
-             (curr->desc_type != APR_NO_DESC); curr++) {
-        if (curr->desc.s == sock) {
-            match = curr;
-        }
-    }
-    if (match == NULL) {
-        return APR_NOTFOUND;
-    }
-
-    /* Remove this entry by swapping the last entry into its place.
-     * This ensures that the non-APR_NO_DESC entries are all at the
-     * start of the array, so that apr_poll() doesn't have to worry
-     * about invalid entries in the middle of the pollset.
-     */
-    curr--;
-    if (curr != match) {
-        *match = *curr;
-    }
-    curr->desc_type = APR_NO_DESC;
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_poll_socket_clear(apr_pollfd_t *aprset, apr_int16_t events)
-{
-    apr_pollfd_t *curr = aprset;
-
-    while (curr->desc_type != APR_POLL_LASTDESC) {
-        if (curr->reqevents & events) {
-            curr->reqevents &= ~events;
-        }
-        curr++;
-    }
-    return APR_SUCCESS;
-}
-
-#if APR_FILES_AS_SOCKETS
-/* I'm not sure if this needs to return an apr_status_t or not, but
- * for right now, we'll leave it this way, and change it later if
- * necessary.
- */
-APR_DECLARE(apr_status_t) apr_socket_from_file(apr_socket_t **newsock, apr_file_t *file)
-{
-    (*newsock) = apr_pcalloc(file->pool, sizeof(**newsock));
-    (*newsock)->socketdes = file->filedes;
-    (*newsock)->cntxt = file->pool;
-    (*newsock)->timeout = file->timeout;
-    return APR_SUCCESS;
-}
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/pollacc.lo b/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/pollacc.lo
deleted file mode 100644
index d418c174..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/pollacc.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# pollacc.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/pollacc.o'
-
-# Name of the non-PIC object.
-non_pic_object='pollacc.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/pollacc.o b/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/pollacc.o
deleted file mode 100644
index 18458749..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/poll/unix/pollacc.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/beos/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/shmem/beos/Makefile.in
deleted file mode 100644
index 52447d8b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/beos/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = shm.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/@OSDIR@
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/beos/shm.c b/rubbos/app/httpd-2.0.64/srclib/apr/shmem/beos/shm.c
deleted file mode 100644
index f4b5ab83..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/beos/shm.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_general.h"
-#include "apr_shm.h"
-#include "apr_errno.h"
-#include "apr_lib.h"
-#include "apr_strings.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <kernel/OS.h>
-#include "apr_portable.h"
-
-struct apr_shm_t {
-    apr_pool_t *pool;
-    void *memblock;
-    void *ptr;
-    apr_size_t reqsize;
-    apr_size_t avail;
-    area_id aid;
-};
-
-APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m, 
-                                         apr_size_t reqsize, 
-                                         const char *file, 
-                                         apr_pool_t *p)
-{
-    apr_size_t pagesize;
-    area_id newid;
-    char *addr;
-    
-    (*m) = (apr_shm_t *)apr_pcalloc(p, sizeof(apr_shm_t));
-    /* we MUST allocate in pages, so calculate how big an area we need... */
-    pagesize = ((reqsize + B_PAGE_SIZE - 1) / B_PAGE_SIZE) * B_PAGE_SIZE;
-     
-    newid = create_area("apr_shmem", (void*)&addr, B_ANY_ADDRESS,
-                        pagesize, B_CONTIGUOUS, B_READ_AREA|B_WRITE_AREA);
-
-    if (newid < 0)
-        return errno;
-
-    (*m)->pool = p;
-    (*m)->aid = newid;
-    (*m)->memblock = addr;
-    (*m)->ptr = (void*)addr;
-    (*m)->avail = pagesize; /* record how big an area we actually created... */
-    (*m)->reqsize = reqsize;
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_shm_destroy(apr_shm_t *m)
-{
-    delete_area(m->aid);
-    m->avail = 0;
-    m->memblock = NULL;
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_shm_attach(apr_shm_t **m,
-                                         const char *filename,
-                                         apr_pool_t *pool)
-{
-    area_info ai;
-    thread_info ti;
-    area_id deleteme;
-    apr_shm_t *new_m;
-    
-    deleteme = find_area(filename);
-    if (deleteme == B_NAME_NOT_FOUND)
-        return APR_EINVAL;
-
-    new_m = (apr_shm_t*)apr_palloc(pool, sizeof(apr_shm_t*));
-    if (new_m == NULL)
-        return APR_ENOMEM;
-    new_m->pool = pool;
-
-    get_area_info(deleteme, &ai);
-    get_thread_info(find_thread(NULL), &ti);
-
-    if (ti.team != ai.team) {
-        area_id narea;
-        
-        narea = clone_area(ai.name, &(ai.address), B_CLONE_ADDRESS,
-                           B_READ_AREA|B_WRITE_AREA, ai.area);
-
-        if (narea < B_OK)
-            return narea;
-            
-        get_area_info(narea, &ai);
-        new_m->aid = narea;
-        new_m->memblock = ai.address;
-        new_m->ptr = (void*)ai.address;
-        new_m->avail = ai.size;
-        new_m->reqsize = ai.size;
-    }
-
-    (*m) = new_m;
-    
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_shm_detach(apr_shm_t *m)
-{
-    delete_area(m->aid);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(void *) apr_shm_baseaddr_get(const apr_shm_t *m)
-{
-    return m->memblock;
-}
-
-APR_DECLARE(apr_size_t) apr_shm_size_get(const apr_shm_t *m)
-{
-    return m->reqsize;
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(shm)
-
-APR_DECLARE(apr_status_t) apr_os_shm_get(apr_os_shm_t *osshm,
-                                         apr_shm_t *shm)
-{
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_os_shm_put(apr_shm_t **m,
-                                         apr_os_shm_t *osshm,
-                                         apr_pool_t *pool)
-{
-    return APR_ENOTIMPL;
-}    
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/os2/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/shmem/os2/Makefile.in
deleted file mode 100644
index 52447d8b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/os2/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = shm.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/@OSDIR@
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/os2/shm.c b/rubbos/app/httpd-2.0.64/srclib/apr/shmem/os2/shm.c
deleted file mode 100644
index 8f41d821..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/os2/shm.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_general.h"
-#include "apr_shm.h"
-#include "apr_errno.h"
-#include "apr_lib.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-
-struct apr_shm_t {
-    apr_pool_t *pool;
-    void *memblock;
-};
-
-APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
-                                         apr_size_t reqsize,
-                                         const char *filename,
-                                         apr_pool_t *pool)
-{
-    int rc;
-    apr_shm_t *newm = (apr_shm_t *)apr_palloc(pool, sizeof(apr_shm_t));
-    char *name = NULL;
-    ULONG flags = PAG_COMMIT|PAG_READ|PAG_WRITE;
-
-    newm->pool = pool;
-
-    if (filename) {
-        name = apr_pstrcat(pool, "\\SHAREMEM\\", filename, NULL);
-    }
-
-    if (name == NULL) {
-        flags |= OBJ_GETTABLE;
-    }
-
-    rc = DosAllocSharedMem(&(newm->memblock), name, reqsize, flags);
-
-    if (rc) {
-        return APR_OS2_STATUS(rc);
-    }
-
-    *m = newm;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_shm_destroy(apr_shm_t *m)
-{
-    DosFreeMem(m->memblock);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_shm_attach(apr_shm_t **m,
-                                         const char *filename,
-                                         apr_pool_t *pool)
-{
-    int rc;
-    apr_shm_t *newm = (apr_shm_t *)apr_palloc(pool, sizeof(apr_shm_t));
-    char *name = NULL;
-    ULONG flags = PAG_READ|PAG_WRITE;
-
-    newm->pool = pool;
-    name = apr_pstrcat(pool, "\\SHAREMEM\\", filename, NULL);
-
-    rc = DosGetNamedSharedMem(&(newm->memblock), name, flags);
-
-    if (rc) {
-        return APR_FROM_OS_ERROR(rc);
-    }
-
-    *m = newm;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_shm_detach(apr_shm_t *m)
-{
-    int rc = 0;
-
-    if (m->memblock) {
-        rc = DosFreeMem(m->memblock);
-    }
-
-    return APR_FROM_OS_ERROR(rc);
-}
-
-APR_DECLARE(void *) apr_shm_baseaddr_get(const apr_shm_t *m)
-{
-    return m->memblock;
-}
-
-APR_DECLARE(apr_size_t) apr_shm_size_get(const apr_shm_t *m)
-{
-    ULONG flags, size = 0x1000000;
-    DosQueryMem(m->memblock, &size, &flags);
-    return size;
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(shm)
-
-APR_DECLARE(apr_status_t) apr_os_shm_get(apr_os_shm_t *osshm,
-                                         apr_shm_t *shm)
-{
-    *osshm = shm->memblock;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_shm_put(apr_shm_t **m,
-                                         apr_os_shm_t *osshm,
-                                         apr_pool_t *pool)
-{
-    int rc;
-    apr_shm_t *newm = (apr_shm_t *)apr_palloc(pool, sizeof(apr_shm_t));
-    ULONG flags = PAG_COMMIT|PAG_READ|PAG_WRITE;
-
-    newm->pool = pool;
-
-    rc = DosGetSharedMem(&(newm->memblock), flags);
-
-    if (rc) {
-        return APR_FROM_OS_ERROR(rc);
-    }
-
-    *m = newm;
-    return APR_SUCCESS;
-}    
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/unix/.libs/shm.o b/rubbos/app/httpd-2.0.64/srclib/apr/shmem/unix/.libs/shm.o
deleted file mode 100644
index 354fe508..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/unix/.libs/shm.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/unix/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/shmem/unix/Makefile
deleted file mode 100644
index 3acd6980..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/unix/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-srcdir = .
-
-
-TARGETS = shm.lo
-
-# bring in rules.mk for standard functionality
-include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
-
-INCDIR=../../include
-INCDIR2=$(INCDIR)/arch
-INCDIR3=$(INCDIR)/arch/unix
-INCLUDES=-I$(INCDIR) -I$(INCDIR2) -I$(INCDIR3)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/unix/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/shmem/unix/Makefile.in
deleted file mode 100644
index b155d75b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/unix/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = shm.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-INCDIR2=$(INCDIR)/arch
-INCDIR3=$(INCDIR)/arch/unix
-INCLUDES=-I$(INCDIR) -I$(INCDIR2) -I$(INCDIR3)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/unix/shm.c b/rubbos/app/httpd-2.0.64/srclib/apr/shmem/unix/shm.c
deleted file mode 100644
index 9af33fa4..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/unix/shm.c
+++ /dev/null
@@ -1,568 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_shm.h"
-
-#include "apr_general.h"
-#include "apr_errno.h"
-#include "apr_user.h"
-#include "apr_strings.h"
-
-static apr_status_t shm_cleanup_owner(void *m_)
-{
-    apr_shm_t *m = (apr_shm_t *)m_;
-
-    /* anonymous shared memory */
-    if (m->filename == NULL) {
-#if APR_USE_SHMEM_MMAP_ZERO || APR_USE_SHMEM_MMAP_ANON
-        if (munmap(m->base, m->realsize) == -1) {
-            return errno;
-        }
-        return APR_SUCCESS;
-#endif
-#if APR_USE_SHMEM_SHMGET_ANON
-        if (shmdt(m->base) == -1) {
-            return errno;
-        }
-        /* This segment will automatically remove itself after all
-         * references have detached. */
-        return APR_SUCCESS;
-#endif
-    }
-
-    /* name-based shared memory */
-    else {
-#if APR_USE_SHMEM_MMAP_TMP
-        apr_status_t rv;
-
-        if (munmap(m->base, m->realsize) == -1) {
-            return errno;
-        }
-        rv = apr_file_remove(m->filename, m->pool);
-        if (rv != APR_SUCCESS) {
-            return rv;
-        }
-        return APR_SUCCESS;
-#endif
-#if APR_USE_SHMEM_MMAP_SHM
-        if (munmap(m->base, m->realsize) == -1) {
-            return errno;
-        }
-        if (shm_unlink(m->filename) == -1) {
-            return errno;
-        }
-        return APR_SUCCESS;
-#endif
-#if APR_USE_SHMEM_SHMGET
-        apr_status_t rv;
-
-        /* Indicate that the segment is to be destroyed as soon
-         * as all processes have detached. This also disallows any
-         * new attachments to the segment. */
-        if (shmctl(m->shmid, IPC_RMID, NULL) == -1) {
-            return errno;
-        }
-        if (shmdt(m->base) == -1) {
-            return errno;
-        }
-        rv = apr_file_remove(m->filename, m->pool);
-        if (rv != APR_SUCCESS) {
-            return rv;
-        }
-        return APR_SUCCESS;
-#endif
-    }
-
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
-                                         apr_size_t reqsize, 
-                                         const char *filename,
-                                         apr_pool_t *pool)
-{
-    apr_shm_t *new_m;
-    apr_status_t status;
-#if APR_USE_SHMEM_SHMGET || APR_USE_SHMEM_SHMGET_ANON
-    struct shmid_ds shmbuf;
-    apr_uid_t uid;
-    apr_gid_t gid;
-#endif
-#if APR_USE_SHMEM_MMAP_TMP || APR_USE_SHMEM_MMAP_SHM || \
-    APR_USE_SHMEM_MMAP_ZERO
-    int tmpfd;
-#endif
-#if APR_USE_SHMEM_SHMGET
-    apr_size_t nbytes;
-    key_t shmkey;
-#endif
-#if APR_USE_SHMEM_MMAP_ZERO || APR_USE_SHMEM_SHMGET || \
-    APR_USE_SHMEM_MMAP_TMP || APR_USE_SHMEM_MMAP_SHM
-    apr_file_t *file;   /* file where metadata is stored */
-#endif
-
-    /* Check if they want anonymous or name-based shared memory */
-    if (filename == NULL) {
-#if APR_USE_SHMEM_MMAP_ZERO || APR_USE_SHMEM_MMAP_ANON
-        new_m = apr_palloc(pool, sizeof(apr_shm_t));
-        if (!new_m) {
-            return APR_ENOMEM;
-        }
-        new_m->pool = pool;
-        new_m->reqsize = reqsize;
-        new_m->realsize = reqsize + 
-            APR_ALIGN_DEFAULT(sizeof(apr_size_t)); /* room for metadata */
-        new_m->filename = NULL;
-    
-#if APR_USE_SHMEM_MMAP_ZERO
-        status = apr_file_open(&file, "/dev/zero", APR_READ | APR_WRITE, 
-                               APR_OS_DEFAULT, pool);
-        if (status != APR_SUCCESS) {
-            return status;
-        }
-        status = apr_os_file_get(&tmpfd, file);
-        if (status != APR_SUCCESS) {
-            return status;
-        }
-
-        new_m->base = mmap(NULL, new_m->realsize, PROT_READ|PROT_WRITE,
-                           MAP_SHARED, tmpfd, 0);
-        if (new_m->base == (void *)MAP_FAILED) {
-            return errno;
-        }
-
-        status = apr_file_close(file);
-        if (status != APR_SUCCESS) {
-            return status;
-        }
-
-        /* store the real size in the metadata */
-        *(apr_size_t*)(new_m->base) = new_m->realsize;
-        /* metadata isn't usable */
-        new_m->usable = (char *)new_m->base + APR_ALIGN_DEFAULT(sizeof(apr_size_t));
-
-        apr_pool_cleanup_register(new_m->pool, new_m, shm_cleanup_owner,
-                                  apr_pool_cleanup_null);
-        *m = new_m;
-        return APR_SUCCESS;
-
-#elif APR_USE_SHMEM_MMAP_ANON
-        new_m->base = mmap(NULL, new_m->realsize, PROT_READ|PROT_WRITE,
-                           MAP_ANON|MAP_SHARED, -1, 0);
-        if (new_m->base == (void *)MAP_FAILED) {
-            return errno;
-        }
-
-        /* store the real size in the metadata */
-        *(apr_size_t*)(new_m->base) = new_m->realsize;
-        /* metadata isn't usable */
-        new_m->usable = (char *)new_m->base + APR_ALIGN_DEFAULT(sizeof(apr_size_t));
-
-        apr_pool_cleanup_register(new_m->pool, new_m, shm_cleanup_owner,
-                                  apr_pool_cleanup_null);
-        *m = new_m;
-        return APR_SUCCESS;
-
-#endif /* APR_USE_SHMEM_MMAP_ZERO */
-#endif /* APR_USE_SHMEM_MMAP_ZERO || APR_USE_SHMEM_MMAP_ANON */
-#if APR_USE_SHMEM_SHMGET_ANON
-
-        new_m = apr_palloc(pool, sizeof(apr_shm_t));
-        if (!new_m) {
-            return APR_ENOMEM;
-        }
-        new_m->pool = pool;
-        new_m->reqsize = reqsize;
-        new_m->realsize = reqsize;
-        new_m->filename = NULL;
-
-        if ((new_m->shmid = shmget(IPC_PRIVATE, new_m->realsize,
-                                   SHM_R | SHM_W | IPC_CREAT)) < 0) {
-            return errno;
-        }
-
-        if ((new_m->base = shmat(new_m->shmid, NULL, 0)) == (void *)-1) {
-            return errno;
-        }
-        new_m->usable = new_m->base;
-
-        if (shmctl(new_m->shmid, IPC_STAT, &shmbuf) == -1) {
-            return errno;
-        }
-        apr_uid_current(&uid, &gid, pool);
-        shmbuf.shm_perm.uid = uid;
-        shmbuf.shm_perm.gid = gid;
-        if (shmctl(new_m->shmid, IPC_SET, &shmbuf) == -1) {
-            return errno;
-        }
-
-        /* Remove the segment once use count hits zero.
-         * We will not attach to this segment again, since it is
-         * anonymous memory, so it is ok to mark it for deletion.
-         */
-        if (shmctl(new_m->shmid, IPC_RMID, NULL) == -1) {
-            return errno;
-        }
-
-        apr_pool_cleanup_register(new_m->pool, new_m, shm_cleanup_owner,
-                                  apr_pool_cleanup_null);
-        *m = new_m;
-        return APR_SUCCESS;
-#endif /* APR_USE_SHMEM_SHMGET_ANON */
-        /* It is an error if they want anonymous memory but we don't have it. */
-        return APR_ENOTIMPL; /* requested anonymous but we don't have it */
-    }
-
-    /* Name-based shared memory */
-    else {
-        new_m = apr_palloc(pool, sizeof(apr_shm_t));
-        if (!new_m) {
-            return APR_ENOMEM;
-        }
-        new_m->pool = pool;
-        new_m->reqsize = reqsize;
-        new_m->filename = apr_pstrdup(pool, filename);
-
-#if APR_USE_SHMEM_MMAP_TMP || APR_USE_SHMEM_MMAP_SHM
-        new_m->realsize = reqsize + 
-            APR_ALIGN_DEFAULT(sizeof(apr_size_t)); /* room for metadata */
-        /* FIXME: Ignore error for now. *
-         * status = apr_file_remove(file, pool);*/
-        status = APR_SUCCESS;
-    
-#if APR_USE_SHMEM_MMAP_TMP
-        /* FIXME: Is APR_OS_DEFAULT sufficient? */
-        status = apr_file_open(&file, filename, 
-                               APR_READ | APR_WRITE | APR_CREATE | APR_EXCL,
-                               APR_OS_DEFAULT, pool);
-        if (status != APR_SUCCESS) {
-            return status;
-        }
-
-        status = apr_os_file_get(&tmpfd, file);
-        if (status != APR_SUCCESS) {
-            apr_file_close(file); /* ignore errors, we're failing */
-            apr_file_remove(new_m->filename, new_m->pool);
-            return status;
-        }
-
-        status = apr_file_trunc(file, new_m->realsize);
-        if (status != APR_SUCCESS) {
-            apr_file_close(file); /* ignore errors, we're failing */
-            apr_file_remove(new_m->filename, new_m->pool);
-            return status;
-        }
-
-        new_m->base = mmap(NULL, new_m->realsize, PROT_READ | PROT_WRITE,
-                           MAP_SHARED, tmpfd, 0);
-        /* FIXME: check for errors */
-
-        status = apr_file_close(file);
-        if (status != APR_SUCCESS) {
-            return status;
-        }
-#endif /* APR_USE_SHMEM_MMAP_TMP */
-#if APR_USE_SHMEM_MMAP_SHM
-        /* FIXME: Is APR_OS_DEFAULT sufficient? */
-        tmpfd = shm_open(filename, O_RDWR | O_CREAT | O_EXCL, APR_OS_DEFAULT);
-        if (tmpfd == -1) {
-            return errno;
-        }
-
-        status = apr_os_file_put(&file, &tmpfd,
-                                 APR_READ | APR_WRITE | APR_CREATE | APR_EXCL,
-                                 pool); 
-        if (status != APR_SUCCESS) {
-            return status;
-        }
-
-        status = apr_file_trunc(file, new_m->realsize);
-        if (status != APR_SUCCESS) {
-            shm_unlink(filename); /* we're failing, remove the object */
-            return status;
-        }
-        new_m->base = mmap(NULL, reqsize, PROT_READ | PROT_WRITE,
-                           MAP_SHARED, tmpfd, 0);
-
-        /* FIXME: check for errors */
-
-        /* FIXME: Is it ok to close this file when using shm_open?? */
-        status = apr_file_close(file);
-        if (status != APR_SUCCESS) {
-            return status;
-        }
-#endif /* APR_USE_SHMEM_MMAP_SHM */
-
-        /* store the real size in the metadata */
-        *(apr_size_t*)(new_m->base) = new_m->realsize;
-        /* metadata isn't usable */
-        new_m->usable = (char *)new_m->base + APR_ALIGN_DEFAULT(sizeof(apr_size_t));
-
-        apr_pool_cleanup_register(new_m->pool, new_m, shm_cleanup_owner,
-                                  apr_pool_cleanup_null);
-        *m = new_m;
-        return APR_SUCCESS;
-
-#endif /* APR_USE_SHMEM_MMAP_TMP || APR_USE_SHMEM_MMAP_SHM */
-
-#if APR_USE_SHMEM_SHMGET
-        new_m->realsize = reqsize;
-
-        /* FIXME: APR_OS_DEFAULT is too permissive, switch to 600 I think. */
-        status = apr_file_open(&file, filename, 
-                               APR_WRITE | APR_CREATE | APR_EXCL,
-                               APR_OS_DEFAULT, pool);
-        if (status != APR_SUCCESS) {
-            return status;
-        }
-
-        /* ftok() (on solaris at least) requires that the file actually
-         * exist before calling ftok(). */
-        shmkey = ftok(filename, 1);
-        if (shmkey == (key_t)-1) {
-            return errno;
-        }
-
-        if ((new_m->shmid = shmget(shmkey, new_m->realsize,
-                                   SHM_R | SHM_W | IPC_CREAT | IPC_EXCL)) < 0) {
-            return errno;
-        }
-
-        if ((new_m->base = shmat(new_m->shmid, NULL, 0)) == (void *)-1) {
-            return errno;
-        }
-        new_m->usable = new_m->base;
-
-        if (shmctl(new_m->shmid, IPC_STAT, &shmbuf) == -1) {
-            return errno;
-        }
-        apr_uid_current(&uid, &gid, pool);
-        shmbuf.shm_perm.uid = uid;
-        shmbuf.shm_perm.gid = gid;
-        if (shmctl(new_m->shmid, IPC_SET, &shmbuf) == -1) {
-            return errno;
-        }
-
-        nbytes = sizeof(reqsize);
-        status = apr_file_write(file, (const void *)&reqsize,
-                                &nbytes);
-        if (status != APR_SUCCESS) {
-            return status;
-        }
-        status = apr_file_close(file);
-        if (status != APR_SUCCESS) {
-            return status;
-        }
-
-        apr_pool_cleanup_register(new_m->pool, new_m, shm_cleanup_owner,
-                                  apr_pool_cleanup_null);
-        *m = new_m; 
-        return APR_SUCCESS;
-
-#endif /* APR_USE_SHMEM_SHMGET */
-    }
-
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_shm_destroy(apr_shm_t *m)
-{
-    return apr_pool_cleanup_run(m->pool, m, shm_cleanup_owner);
-}
-
-static apr_status_t shm_cleanup_attach(void *m_)
-{
-    apr_shm_t *m = (apr_shm_t *)m_;
-
-    if (m->filename == NULL) {
-        /* It doesn't make sense to detach from an anonymous memory segment. */
-        return APR_EINVAL;
-    }
-    else {
-#if APR_USE_SHMEM_MMAP_TMP || APR_USE_SHMEM_MMAP_SHM
-        if (munmap(m->base, m->realsize) == -1) {
-            return errno;
-        }
-        return APR_SUCCESS;
-#endif /* APR_USE_SHMEM_MMAP_TMP || APR_USE_SHMEM_MMAP_SHM */
-#if APR_USE_SHMEM_SHMGET
-        if (shmdt(m->base) == -1) {
-            return errno;
-        }
-        return APR_SUCCESS;
-#endif
-    }
-
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_shm_attach(apr_shm_t **m,
-                                         const char *filename,
-                                         apr_pool_t *pool)
-{
-    if (filename == NULL) {
-        /* It doesn't make sense to attach to a segment if you don't know
-         * the filename. */
-        return APR_EINVAL;
-    }
-    else {
-#if APR_USE_SHMEM_MMAP_TMP || APR_USE_SHMEM_MMAP_SHM
-        apr_shm_t *new_m;
-        apr_status_t status;
-        int tmpfd;
-        apr_file_t *file;   /* file where metadata is stored */
-        apr_size_t nbytes;
-
-        new_m = apr_palloc(pool, sizeof(apr_shm_t));
-        if (!new_m) {
-            return APR_ENOMEM;
-        }
-        new_m->pool = pool;
-        new_m->filename = apr_pstrdup(pool, filename);
-
-        status = apr_file_open(&file, filename, 
-                               APR_READ | APR_WRITE,
-                               APR_OS_DEFAULT, pool);
-        if (status != APR_SUCCESS) {
-            return status;
-        }
-        status = apr_os_file_get(&tmpfd, file);
-        if (status != APR_SUCCESS) {
-            return status;
-        }
-
-        nbytes = sizeof(new_m->realsize);
-        status = apr_file_read(file, (void *)&(new_m->realsize),
-                               &nbytes);
-        if (status != APR_SUCCESS) {
-            return status;
-        }
-
-        status = apr_os_file_get(&tmpfd, file);
-        if (status != APR_SUCCESS) {
-            apr_file_close(file); /* ignore errors, we're failing */
-            apr_file_remove(new_m->filename, new_m->pool);
-            return status;
-        }
-
-        new_m->reqsize = new_m->realsize - sizeof(apr_size_t);
-
-        new_m->base = mmap(NULL, new_m->realsize, PROT_READ | PROT_WRITE,
-                           MAP_SHARED, tmpfd, 0);
-        /* FIXME: check for errors */
-        
-        status = apr_file_close(file);
-        if (status != APR_SUCCESS) {
-            return status;
-        }
-
-        /* metadata isn't part of the usable segment */
-        new_m->usable = (char *)new_m->base + APR_ALIGN_DEFAULT(sizeof(apr_size_t));
-
-        apr_pool_cleanup_register(new_m->pool, new_m, shm_cleanup_attach,
-                                  apr_pool_cleanup_null);
-        *m = new_m;
-        return APR_SUCCESS;
-
-#endif /* APR_USE_SHMEM_MMAP_TMP || APR_USE_SHMEM_MMAP_SHM */
-#if APR_USE_SHMEM_SHMGET
-        apr_shm_t *new_m;
-        apr_status_t status;
-        apr_file_t *file;   /* file where metadata is stored */
-        apr_size_t nbytes;
-        key_t shmkey;
-
-        new_m = apr_palloc(pool, sizeof(apr_shm_t));
-        if (!new_m) {
-            return APR_ENOMEM;
-        }
-
-        /* FIXME: does APR_OS_DEFAULT matter for reading? */
-        status = apr_file_open(&file, filename, 
-                               APR_READ, APR_OS_DEFAULT, pool);
-        if (status != APR_SUCCESS) {
-            return status;
-        }
-
-        nbytes = sizeof(new_m->reqsize);
-        status = apr_file_read(file, (void *)&(new_m->reqsize),
-                               &nbytes);
-        if (status != APR_SUCCESS) {
-            return status;
-        }
-        status = apr_file_close(file);
-        if (status != APR_SUCCESS) {
-            return status;
-        }
-
-        new_m->filename = apr_pstrdup(pool, filename);
-        new_m->pool = pool;
-        shmkey = ftok(filename, 1);
-        if (shmkey == (key_t)-1) {
-            return errno;
-        }
-        if ((new_m->shmid = shmget(shmkey, 0, SHM_R | SHM_W)) == -1) {
-            return errno;
-        }
-        if ((new_m->base = shmat(new_m->shmid, NULL, 0)) == (void *)-1) {
-            return errno;
-        }
-        new_m->usable = new_m->base;
-        new_m->realsize = new_m->reqsize;
-
-        apr_pool_cleanup_register(new_m->pool, new_m, shm_cleanup_attach,
-                                  apr_pool_cleanup_null);
-        *m = new_m;
-        return APR_SUCCESS;
-
-#endif /* APR_USE_SHMEM_SHMGET */
-    }
-
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_shm_detach(apr_shm_t *m)
-{
-    apr_status_t rv = shm_cleanup_attach(m);
-    apr_pool_cleanup_kill(m->pool, m, shm_cleanup_attach);
-    return rv;
-}
-
-APR_DECLARE(void *) apr_shm_baseaddr_get(const apr_shm_t *m)
-{
-    return m->usable;
-}
-
-APR_DECLARE(apr_size_t) apr_shm_size_get(const apr_shm_t *m)
-{
-    return m->reqsize;
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(shm)
-
-APR_DECLARE(apr_status_t) apr_os_shm_get(apr_os_shm_t *osshm,
-                                         apr_shm_t *shm)
-{
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_os_shm_put(apr_shm_t **m,
-                                         apr_os_shm_t *osshm,
-                                         apr_pool_t *pool)
-{
-    return APR_ENOTIMPL;
-}    
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/unix/shm.lo b/rubbos/app/httpd-2.0.64/srclib/apr/shmem/unix/shm.lo
deleted file mode 100644
index ebc6464d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/unix/shm.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# shm.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/shm.o'
-
-# Name of the non-PIC object.
-non_pic_object='shm.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/unix/shm.o b/rubbos/app/httpd-2.0.64/srclib/apr/shmem/unix/shm.o
deleted file mode 100644
index a10a59ff..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/unix/shm.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/win32/shm.c b/rubbos/app/httpd-2.0.64/srclib/apr/shmem/win32/shm.c
deleted file mode 100644
index 2db04c0b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/shmem/win32/shm.c
+++ /dev/null
@@ -1,294 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_general.h"
-#include "apr_errno.h"
-#include "apr_file_io.h"
-#include "apr_shm.h"
-#include "apr_arch_file_io.h"
-
-typedef struct memblock_t {
-    apr_size_t size;
-    apr_size_t length;
-} memblock_t;
-
-struct apr_shm_t {
-    apr_pool_t *pool;
-    memblock_t *memblk;
-    void       *usrmem;
-    apr_size_t  size;
-    apr_size_t  length;
-    HANDLE      hMap;
-};
-
-static apr_status_t shm_cleanup(void* shm)
-{
-    apr_status_t rv = APR_SUCCESS;
-    apr_shm_t *m = shm;
-    
-    if (UnmapViewOfFile(m->memblk)) {
-        rv = apr_get_os_error();
-    }
-    if (CloseHandle(m->hMap)) {
-        return (rv != APR_SUCCESS) ? rv : apr_get_os_error();
-    }
-    /* ### Do we want to make a point of unlinking m->file here? 
-     * Need to add the fname to the apr_shm_t, in that case.
-     */
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
-                                         apr_size_t reqsize,
-                                         const char *file,
-                                         apr_pool_t *pool)
-{
-    static apr_size_t memblock = 0;
-    HANDLE hMap, hFile;
-    apr_status_t rv;
-    apr_size_t size;
-    apr_file_t *f;
-    void *base;
-    void *mapkey;
-    DWORD err;
-
-    reqsize += sizeof(memblock_t);
-
-    if (!memblock)
-    {
-        SYSTEM_INFO si;
-        GetSystemInfo(&si);
-        memblock = si.dwAllocationGranularity;
-    }   
-
-    /* Compute the granualar multiple of the pagesize */
-    size = memblock * (1 + (reqsize - 1) / memblock);
-
-    if (!file) {
-        /* Do Anonymous, which must be passed as a duplicated handle */
-#ifndef _WIN32_WCE
-        hFile = INVALID_HANDLE_VALUE;
-#endif
-        mapkey = NULL;
-    }
-    else {
-        /* Do file backed, which is not an inherited handle 
-         * While we could open APR_EXCL, it doesn't seem that Unix
-         * ever did.  Ignore that error here, but fail later when
-         * we discover we aren't the creator of the file map object.
-         */
-        rv = apr_file_open(&f, file,
-                           APR_READ | APR_WRITE | APR_BINARY | APR_CREATE,
-                           APR_UREAD | APR_UWRITE, pool);
-        if ((rv != APR_SUCCESS)
-                || ((rv = apr_os_file_get(&hFile, f)) != APR_SUCCESS)) {
-            return rv;
-        }
-        rv = apr_file_trunc(f, size);
-
-        /* res_name_from_filename turns file into a pseudo-name
-         * without slashes or backslashes, and prepends the \global
-         * prefix on Win2K and later
-         */
-        mapkey = res_name_from_filename(file, 1, pool);
-    }
-
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        hMap = CreateFileMappingW(hFile, NULL, PAGE_READWRITE, 0, size, mapkey);
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-    {
-        hMap = CreateFileMappingA(hFile, NULL, PAGE_READWRITE, 0, size, mapkey);
-    }
-#endif
-    err = apr_get_os_error();
-
-    if (file) {
-        apr_file_close(f);
-    }
-
-    if (hMap && APR_STATUS_IS_EEXIST(err)) {
-        CloseHandle(hMap);
-        return APR_EEXIST;
-    }
-    if (!hMap) {
-        return err;
-    }
-    
-    base = MapViewOfFile(hMap, FILE_MAP_READ | FILE_MAP_WRITE,
-                         0, 0, size);
-    if (!base) {
-        CloseHandle(hMap);
-        return apr_get_os_error();
-    }
-    
-    *m = (apr_shm_t *) apr_palloc(pool, sizeof(apr_shm_t));
-    (*m)->pool = pool;
-    (*m)->hMap = hMap;
-    (*m)->memblk = base;
-    (*m)->size = size;
-
-    (*m)->usrmem = (char*)base + sizeof(memblock_t);
-    (*m)->length = reqsize - sizeof(memblock_t);;
-    
-    (*m)->memblk->length = (*m)->length;
-    (*m)->memblk->size = (*m)->size;
-
-    apr_pool_cleanup_register((*m)->pool, *m, 
-                              shm_cleanup, apr_pool_cleanup_null);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_shm_destroy(apr_shm_t *m) 
-{
-    apr_status_t rv = shm_cleanup(m);
-    apr_pool_cleanup_kill(m->pool, m, shm_cleanup);
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_shm_attach(apr_shm_t **m,
-                                         const char *file,
-                                         apr_pool_t *pool)
-{
-    HANDLE hMap;
-    void *mapkey;
-    void *base;
-
-    if (!file) {
-        return APR_EINVAL;
-    }
-    else {
-        /* res_name_from_filename turns file into a pseudo-name
-         * without slashes or backslashes, and prepends the \global
-         * prefix on Win2K and later
-         */
-        mapkey = res_name_from_filename(file, 1, pool);
-    }
-
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-#ifndef _WIN32_WCE
-        hMap = OpenFileMappingW(FILE_MAP_READ | FILE_MAP_WRITE, FALSE, mapkey);
-#else
-        /* The WCE 3.0 lacks OpenFileMapping. So we emulate one with
-         * opening the existing shmem and reading its size from the header 
-         */
-        hMap = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, 
-                                  PAGE_READWRITE, 0, sizeof(apr_shm_t), mapkey);
-#endif
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-    {
-        hMap = OpenFileMappingA(FILE_MAP_READ | FILE_MAP_WRITE, FALSE, mapkey);
-    }
-#endif
-
-    if (!hMap) {
-        return apr_get_os_error();
-    }
-    
-    base = MapViewOfFile(hMap, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0);
-    if (!base) {
-        CloseHandle(hMap);
-        return apr_get_os_error();
-    }
-    
-    *m = (apr_shm_t *) apr_palloc(pool, sizeof(apr_shm_t));
-    (*m)->pool = pool;
-    (*m)->memblk = base;
-    /* Real (*m)->mem->size could be recovered with VirtualQuery */
-    (*m)->size = (*m)->memblk->size;
-#if _WIN32_WCE
-    /* Reopen with real size  */
-    UnmapViewOfFile(base);
-    CloseHandle(hMap);
-
-    hMap = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, 
-                              PAGE_READWRITE, 0, (*m)->size, mapkey);
-    if (!hMap) {
-        return apr_get_os_error();
-    }
-    base = MapViewOfFile(hMap, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0);
-    if (!base) {
-        CloseHandle(hMap);
-        return apr_get_os_error();
-    }    
-#endif
-    (*m)->hMap = hMap;
-    (*m)->length = (*m)->memblk->length;
-    (*m)->usrmem = (char*)base + sizeof(memblock_t);
-    apr_pool_cleanup_register((*m)->pool, *m, 
-                              shm_cleanup, apr_pool_cleanup_null);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_shm_detach(apr_shm_t *m)
-{
-    apr_status_t rv = shm_cleanup(m);
-    apr_pool_cleanup_kill(m->pool, m, shm_cleanup);
-    return rv;
-}
-
-APR_DECLARE(void *) apr_shm_baseaddr_get(const apr_shm_t *m)
-{
-    return m->usrmem;
-}
-
-APR_DECLARE(apr_size_t) apr_shm_size_get(const apr_shm_t *m)
-{
-    return m->length;
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(shm)
-
-APR_DECLARE(apr_status_t) apr_os_shm_get(apr_os_shm_t *osshm,
-                                         apr_shm_t *shm)
-{
-    *osshm = shm->hMap;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_shm_put(apr_shm_t **m,
-                                         apr_os_shm_t *osshm,
-                                         apr_pool_t *pool)
-{
-    void* base;
-    base = MapViewOfFile(*osshm, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0);
-    if (!base) {
-        return apr_get_os_error();
-    }
-    
-    *m = (apr_shm_t *) apr_palloc(pool, sizeof(apr_shm_t));
-    (*m)->pool = pool;
-    (*m)->hMap = *osshm;
-    (*m)->memblk = base;
-    (*m)->usrmem = (char*)base + sizeof(memblock_t);
-    /* Real (*m)->mem->size could be recovered with VirtualQuery */
-    (*m)->size = (*m)->memblk->size;
-    (*m)->length = (*m)->memblk->length;
-
-    apr_pool_cleanup_register((*m)->pool, *m, 
-                              shm_cleanup, apr_pool_cleanup_null);
-    return APR_SUCCESS;
-}    
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/.libs/apr_cpystrn.o b/rubbos/app/httpd-2.0.64/srclib/apr/strings/.libs/apr_cpystrn.o
deleted file mode 100644
index 1fdff6c6..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/.libs/apr_cpystrn.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/.libs/apr_fnmatch.o b/rubbos/app/httpd-2.0.64/srclib/apr/strings/.libs/apr_fnmatch.o
deleted file mode 100644
index 099a0e90..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/.libs/apr_fnmatch.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/.libs/apr_snprintf.o b/rubbos/app/httpd-2.0.64/srclib/apr/strings/.libs/apr_snprintf.o
deleted file mode 100644
index 5f12d9bf..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/.libs/apr_snprintf.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/.libs/apr_strings.o b/rubbos/app/httpd-2.0.64/srclib/apr/strings/.libs/apr_strings.o
deleted file mode 100644
index a8b5f40c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/.libs/apr_strings.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/.libs/apr_strnatcmp.o b/rubbos/app/httpd-2.0.64/srclib/apr/strings/.libs/apr_strnatcmp.o
deleted file mode 100644
index aceab98d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/.libs/apr_strnatcmp.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/.libs/apr_strtok.o b/rubbos/app/httpd-2.0.64/srclib/apr/strings/.libs/apr_strtok.o
deleted file mode 100644
index a772c0f5..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/.libs/apr_strtok.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/strings/Makefile
deleted file mode 100644
index 8356451d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-srcdir = .
-
-
-TARGETS = \
-	apr_cpystrn.lo \
-	apr_snprintf.lo \
-	apr_strnatcmp.lo \
-	apr_strings.lo \
-	apr_fnmatch.lo \
-	apr_strtok.lo
-
-# bring in rules.mk for standard functionality
-include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
-
-DEFOSDIR=$(INCDIR)/arch/unix
-INCDIR=../include
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/strings/Makefile.in
deleted file mode 100644
index aa1e1ee0..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = \
-	apr_cpystrn.lo \
-	apr_snprintf.lo \
-	apr_strnatcmp.lo \
-	apr_strings.lo \
-	apr_fnmatch.lo \
-	apr_strtok.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCDIR=../include
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_cpystrn.c b/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_cpystrn.c
deleted file mode 100644
index 19eb3905..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_cpystrn.c
+++ /dev/null
@@ -1,317 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_strings.h"
-#include "apr_private.h"
-#include "apr_lib.h"
-
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if APR_HAVE_STRING_H
-#include <string.h>
-#endif
-#if APR_HAVE_CTYPE_H
-#include <ctype.h>
-#endif
-
-/*
- * Apache's "replacement" for the strncpy() function. We roll our
- * own to implement these specific changes:
- *   (1) strncpy() doesn't always null terminate and we want it to.
- *   (2) strncpy() null fills, which is bogus, esp. when copy 8byte
- *       strings into 8k blocks.
- *   (3) Instead of returning the pointer to the beginning of
- *       the destination string, we return a pointer to the
- *       terminating '\0' to allow us to "check" for truncation
- *
- * apr_cpystrn() follows the same call structure as strncpy().
- */
-
-APR_DECLARE(char *) apr_cpystrn(char *dst, const char *src, apr_size_t dst_size)
-{
-
-    char *d, *end;
-
-    if (dst_size == 0) {
-        return (dst);
-    }
-
-    d = dst;
-    end = dst + dst_size - 1;
-
-    for (; d < end; ++d, ++src) {
-	if (!(*d = *src)) {
-	    return (d);
-	}
-    }
-
-    *d = '\0';	/* always null terminate */
-
-    return (d);
-}
-
-
-/*
- * This function provides a way to parse a generic argument string
- * into a standard argv[] form of argument list. It respects the 
- * usual "whitespace" and quoteing rules. In the future this could
- * be expanded to include support for the apr_call_exec command line
- * string processing (including converting '+' to ' ' and doing the 
- * url processing. It does not currently support this function.
- *
- *    token_context: Context from which pool allocations will occur.
- *    arg_str:       Input argument string for conversion to argv[].
- *    argv_out:      Output location. This is a pointer to an array
- *                   of pointers to strings (ie. &(char *argv[]).
- *                   This value will be allocated from the contexts
- *                   pool and filled in with copies of the tokens
- *                   found during parsing of the arg_str. 
- */
-APR_DECLARE(apr_status_t) apr_tokenize_to_argv(const char *arg_str, 
-                                            char ***argv_out,
-                                            apr_pool_t *token_context)
-{
-    const char *cp;
-    const char *ct;
-    char *cleaned, *dirty;
-    int escaped;
-    int isquoted, numargs = 0, argnum;
-
-#define SKIP_WHITESPACE(cp) \
-    for ( ; *cp == ' ' || *cp == '\t'; ) { \
-        cp++; \
-    };
-
-#define CHECK_QUOTATION(cp,isquoted) \
-    isquoted = 0; \
-    if (*cp == '"') { \
-        isquoted = 1; \
-        cp++; \
-    } \
-    else if (*cp == '\'') { \
-        isquoted = 2; \
-        cp++; \
-    }
-
-/* DETERMINE_NEXTSTRING:
- * At exit, cp will point to one of the following:  NULL, SPACE, TAB or QUOTE.
- * NULL implies the argument string has been fully traversed.
- */
-#define DETERMINE_NEXTSTRING(cp,isquoted) \
-    for ( ; *cp != '\0'; cp++) { \
-        if (   (*cp == '\\' && (*(cp+1) == ' ' || *(cp+1) == '\t' || \
-                                *(cp+1) == '"' || *(cp+1) == '\''))) { \
-            cp++; \
-            continue; \
-        } \
-        if (   (!isquoted && (*cp == ' ' || *cp == '\t')) \
-            || (isquoted == 1 && *cp == '"') \
-            || (isquoted == 2 && *cp == '\'')                 ) { \
-            break; \
-        } \
-    }
- 
-/* REMOVE_ESCAPE_CHARS:
- * Compresses the arg string to remove all of the '\' escape chars.
- * The final argv strings should not have any extra escape chars in it.
- */
-#define REMOVE_ESCAPE_CHARS(cleaned, dirty, escaped) \
-    escaped = 0; \
-    while(*dirty) { \
-        if (!escaped && *dirty == '\\') { \
-            escaped = 1; \
-        } \
-        else { \
-            escaped = 0; \
-            *cleaned++ = *dirty; \
-        } \
-        ++dirty; \
-    } \
-    *cleaned = 0;        /* last line of macro... */
-
-    cp = arg_str;
-    SKIP_WHITESPACE(cp);
-    ct = cp;
-
-    /* This is ugly and expensive, but if anyone wants to figure a
-     * way to support any number of args without counting and 
-     * allocating, please go ahead and change the code.
-     *
-     * Must account for the trailing NULL arg.
-     */
-    numargs = 1;
-    while (*ct != '\0') {
-        CHECK_QUOTATION(ct, isquoted);
-        DETERMINE_NEXTSTRING(ct, isquoted);
-        if (*ct != '\0') {
-            ct++;
-        }
-        numargs++;
-        SKIP_WHITESPACE(ct);
-    }
-    *argv_out = apr_palloc(token_context, numargs * sizeof(char*));
-
-    /*  determine first argument */
-    for (argnum = 0; argnum < (numargs-1); argnum++) {
-        SKIP_WHITESPACE(cp);
-        CHECK_QUOTATION(cp, isquoted);
-        ct = cp;
-        DETERMINE_NEXTSTRING(cp, isquoted);
-        cp++;
-        (*argv_out)[argnum] = apr_palloc(token_context, cp - ct);
-        apr_cpystrn((*argv_out)[argnum], ct, cp - ct);
-        cleaned = dirty = (*argv_out)[argnum];
-        REMOVE_ESCAPE_CHARS(cleaned, dirty, escaped);
-    }
-    (*argv_out)[argnum] = NULL;
-
-    return APR_SUCCESS;
-}
-
-/* Filepath_name_get returns the final element of the pathname.
- * Using the current platform's filename syntax.
- *   "/foo/bar/gum" -> "gum"
- *   "/foo/bar/gum/" -> ""
- *   "gum" -> "gum"
- *   "wi\\n32\\stuff" -> "stuff
- *
- * Corrected Win32 to accept "a/b\\stuff", "a:stuff"
- */
-
-APR_DECLARE(const char *) apr_filepath_name_get(const char *pathname)
-{
-    const char path_separator = '/';
-    const char *s = strrchr(pathname, path_separator);
-
-#ifdef WIN32
-    const char path_separator_win = '\\';
-    const char drive_separator_win = ':';
-    const char *s2 = strrchr(pathname, path_separator_win);
-
-    if (s2 > s) s = s2;
-
-    if (!s) s = strrchr(pathname, drive_separator_win);
-#endif
-
-    return s ? ++s : pathname;
-}
-
-/* deprecated */
-APR_DECLARE(const char *) apr_filename_of_pathname(const char *pathname)
-{
-        return apr_filepath_name_get(pathname);
-}
-
-/* length of dest assumed >= length of src
- * collapse in place (src == dest) is legal.
- * returns terminating null ptr to dest string.
- */
-APR_DECLARE(char *) apr_collapse_spaces(char *dest, const char *src)
-{
-    while (*src) {
-        if (!apr_isspace(*src)) 
-            *dest++ = *src;
-        ++src;
-    }
-    *dest = 0;
-    return (dest);
-}
-
-#if !APR_HAVE_STRDUP
-char *strdup(const char *str)
-{
-    char *sdup;
-    size_t len = strlen(str) + 1;
-
-    sdup = (char *) malloc(len);
-    memcpy(sdup, str, len);
-
-    return sdup;
-}
-#endif
-
-/* The following two routines were donated for SVR4 by Andreas Vogel */
-#if (!APR_HAVE_STRCASECMP && !APR_HAVE_STRICMP)
-int strcasecmp(const char *a, const char *b)
-{
-    const char *p = a;
-    const char *q = b;
-    for (p = a, q = b; *p && *q; p++, q++) {
-        int diff = apr_tolower(*p) - apr_tolower(*q);
-        if (diff)
-            return diff;
-    }
-    if (*p)
-        return 1;               /* p was longer than q */
-    if (*q)
-        return -1;              /* p was shorter than q */
-    return 0;                   /* Exact match */
-}
-
-#endif
-
-#if (!APR_HAVE_STRNCASECMP && !APR_HAVE_STRNICMP)
-int strncasecmp(const char *a, const char *b, size_t n)
-{
-    const char *p = a;
-    const char *q = b;
-
-    for (p = a, q = b; /*NOTHING */ ; p++, q++) {
-        int diff;
-        if (p == a + n)
-            return 0;           /*   Match up to n characters */
-        if (!(*p && *q))
-            return *p - *q;
-        diff = apr_tolower(*p) - apr_tolower(*q);
-        if (diff)
-            return diff;
-    }
-    /*NOTREACHED */
-}
-#endif
-
-/* The following routine was donated for UTS21 by dwd@bell-labs.com */
-#if (!APR_HAVE_STRSTR)
-char *strstr(char *s1, char *s2)
-{
-    char *p1, *p2;
-    if (*s2 == '\0') {
-        /* an empty s2 */
-        return(s1);
-    }
-    while((s1 = strchr(s1, *s2)) != NULL) {
-        /* found first character of s2, see if the rest matches */
-        p1 = s1;
-        p2 = s2;
-        while (*++p1 == *++p2) {
-            if (*p1 == '\0') {
-                /* both strings ended together */
-                return(s1);
-            }
-        }
-        if (*p2 == '\0') {
-            /* second string ended, a match */
-            break;
-        }
-        /* didn't find a match here, try starting at next character in s1 */
-        s1++;
-    }
-    return(s1);
-}
-#endif
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_cpystrn.lo b/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_cpystrn.lo
deleted file mode 100644
index 85222d14..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_cpystrn.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# apr_cpystrn.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/apr_cpystrn.o'
-
-# Name of the non-PIC object.
-non_pic_object='apr_cpystrn.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_cpystrn.o b/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_cpystrn.o
deleted file mode 100644
index bbe1f13e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_cpystrn.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_fnmatch.c b/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_fnmatch.c
deleted file mode 100644
index 78b1cb51..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_fnmatch.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Copyright (c) 1989, 1993, 1994
- *      The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Guido van Rossum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fnmatch.c	8.2 (Berkeley) 4/16/94";
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
- * Compares a filename or pathname to a pattern.
- */
-#ifndef WIN32
-#include "apr_private.h"
-#endif
-#include "apr_fnmatch.h"
-#include "apr_lib.h"
-#include <string.h>
-#if APR_HAVE_CTYPE_H
-# include <ctype.h>
-#endif
-
-#define	EOS	'\0'
-
-static const char *rangematch(const char *, int, int);
-
-APR_DECLARE(apr_status_t) apr_fnmatch(const char *pattern, const char *string, int flags)
-{
-    const char *stringstart;
-    char c, test;
-
-    for (stringstart = string;;) {
-	switch (c = *pattern++) {
-	case EOS:
-	    return (*string == EOS ? APR_SUCCESS : APR_FNM_NOMATCH);
-	case '?':
-	    if (*string == EOS) {
-		return (APR_FNM_NOMATCH);
-	    }
-	    if (*string == '/' && (flags & APR_FNM_PATHNAME)) {
-		return (APR_FNM_NOMATCH);
-	    }
-	    if (*string == '.' && (flags & APR_FNM_PERIOD) &&
-		(string == stringstart ||
-		 ((flags & APR_FNM_PATHNAME) && *(string - 1) == '/'))) {
-		return (APR_FNM_NOMATCH);
-	    }
-	    ++string;
-	    break;
-	case '*':
-	    c = *pattern;
-	    /* Collapse multiple stars. */
-	    while (c == '*') {
-		c = *++pattern;
-	    }
-
-	    if (*string == '.' && (flags & APR_FNM_PERIOD) &&
-		(string == stringstart ||
-		 ((flags & APR_FNM_PATHNAME) && *(string - 1) == '/'))) {
-		return (APR_FNM_NOMATCH);
-	    }
-
-	    /* Optimize for pattern with * at end or before /. */
-	    if (c == EOS) {
-		if (flags & APR_FNM_PATHNAME) {
-		    return (strchr(string, '/') == NULL ? APR_SUCCESS : APR_FNM_NOMATCH);
-		}
-		else {
-		    return (APR_SUCCESS);
-		}
-	    }
-	    else if (c == '/' && flags & APR_FNM_PATHNAME) {
-	        if ((string = strchr(string, '/')) == NULL) {
-		    return (APR_FNM_NOMATCH);
-		}
-		break;
-	    }
-
-	    /* General case, use recursion. */
-	    while ((test = *string) != EOS) {
-	        if (!apr_fnmatch(pattern, string, flags & ~APR_FNM_PERIOD)) {
-		    return (APR_SUCCESS);
-		}
-		if (test == '/' && flags & APR_FNM_PATHNAME) {
-		    break;
-		}
-		++string;
-	    }
-	    return (APR_FNM_NOMATCH);
-	case '[':
-	    if (*string == EOS) {
-		return (APR_FNM_NOMATCH);
-	    }
-	    if (*string == '/' && flags & APR_FNM_PATHNAME) {
-		return (APR_FNM_NOMATCH);
-	    }
-	    if (*string == '.' && (flags & APR_FNM_PERIOD) &&
-		(string == stringstart ||
-		 ((flags & APR_FNM_PATHNAME) && *(string - 1) == '/'))) {
-	        return (APR_FNM_NOMATCH);
-	    }
-	    if ((pattern = rangematch(pattern, *string, flags)) == NULL) {
-		return (APR_FNM_NOMATCH);
-	    }
-	    ++string;
-	    break;
-	case '\\':
-	    if (!(flags & APR_FNM_NOESCAPE)) {
-		if ((c = *pattern++) == EOS) {
-		    c = '\\';
-		    --pattern;
-		}
-	    }
-	    /* FALLTHROUGH */
-	default:
-	    if (flags & APR_FNM_CASE_BLIND) {
-	        if (apr_tolower(c) != apr_tolower(*string)) {
-		    return (APR_FNM_NOMATCH);
-		}
-	    }
-	    else if (c != *string) {
-	        return (APR_FNM_NOMATCH);
-	    }
-	    string++;
-	    break;
-	}
-    /* NOTREACHED */
-    }
-}
-
-static const char *rangematch(const char *pattern, int test, int flags)
-{
-    int negate, ok;
-    char c, c2;
-
-    /*
-     * A bracket expression starting with an unquoted circumflex
-     * character produces unspecified results (IEEE 1003.2-1992,
-     * 3.13.2).  This implementation treats it like '!', for
-     * consistency with the regular expression syntax.
-     * J.T. Conklin (conklin@ngai.kaleida.com)
-     */
-    if ((negate = (*pattern == '!' || *pattern == '^'))) {
-	++pattern;
-    }
-
-    for (ok = 0; (c = *pattern++) != ']';) {
-        if (c == '\\' && !(flags & APR_FNM_NOESCAPE)) {
-	    c = *pattern++;
-	}
-	if (c == EOS) {
-	    return (NULL);
-	}
-	if (*pattern == '-' && (c2 = *(pattern + 1)) != EOS && c2 != ']') {
-	    pattern += 2;
-	    if (c2 == '\\' && !(flags & APR_FNM_NOESCAPE)) {
-		c2 = *pattern++;
-	    }
-	    if (c2 == EOS) {
-		return (NULL);
-	    }
-	    if ((c <= test && test <= c2)
-		|| ((flags & APR_FNM_CASE_BLIND)
-		    && ((apr_tolower(c) <= apr_tolower(test))
-			&& (apr_tolower(test) <= apr_tolower(c2))))) {
-		ok = 1;
-	    }
-	}
-	else if ((c == test)
-		 || ((flags & APR_FNM_CASE_BLIND)
-		     && (apr_tolower(c) == apr_tolower(test)))) {
-	    ok = 1;
-	}
-    }
-    return (ok == negate ? NULL : pattern);
-}
-
-
-/* This function is an Apache addition */
-/* return non-zero if pattern has any glob chars in it */
-APR_DECLARE(int) apr_fnmatch_test(const char *pattern)
-{
-    int nesting;
-
-    nesting = 0;
-    while (*pattern) {
-	switch (*pattern) {
-	case '?':
-	case '*':
-	    return 1;
-
-	case '\\':
-	    if (*pattern++ == '\0') {
-		return 0;
-	    }
-	    break;
-
-	case '[':	/* '[' is only a glob if it has a matching ']' */
-	    ++nesting;
-	    break;
-
-	case ']':
-	    if (nesting) {
-		return 1;
-	    }
-	    break;
-	}
-	++pattern;
-    }
-    return 0;
-}
-
-/* Deprecated */
-APR_DECLARE(int) apr_is_fnmatch(const char *pattern)
-{
-    return apr_fnmatch_test(pattern);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_fnmatch.lo b/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_fnmatch.lo
deleted file mode 100644
index bdc2f218..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_fnmatch.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# apr_fnmatch.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/apr_fnmatch.o'
-
-# Name of the non-PIC object.
-non_pic_object='apr_fnmatch.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_fnmatch.o b/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_fnmatch.o
deleted file mode 100644
index 19e8a057..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_fnmatch.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_snprintf.c b/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_snprintf.c
deleted file mode 100644
index 776890bb..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_snprintf.c
+++ /dev/null
@@ -1,1311 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_private.h"
-
-#include "apr_lib.h"
-#include "apr_strings.h"
-#include "apr_network_io.h"
-#include "apr_portable.h"
-#include <math.h>
-#if APR_HAVE_CTYPE_H
-#include <ctype.h>
-#endif
-#if APR_HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#if APR_HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#if APR_HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#if APR_HAVE_LIMITS_H
-#include <limits.h>
-#endif
-#if APR_HAVE_STRING_H
-#include <string.h>
-#endif
-
-typedef enum {
-    NO = 0, YES = 1
-} boolean_e;
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-#ifndef TRUE
-#define TRUE 1
-#endif
-#define NUL '\0'
-#define WIDE_INT long
-
-typedef WIDE_INT wide_int;
-typedef unsigned WIDE_INT u_wide_int;
-typedef apr_int64_t widest_int;
-#ifdef __TANDEM
-/* Although Tandem supports "long long" there is no unsigned variant. */
-typedef unsigned long       u_widest_int;
-#else
-typedef apr_uint64_t u_widest_int;
-#endif
-typedef int bool_int;
-
-static const char null_string[] = "(null)";
-#define S_NULL ((char *)null_string)
-#define S_NULL_LEN 6
-
-#define FLOAT_DIGITS 6
-#define EXPONENT_LENGTH 10
-
-/*
- * NUM_BUF_SIZE is the size of the buffer used for arithmetic conversions
- *
- * NOTICE: this is a magic number; do not decrease it
- */
-#define NUM_BUF_SIZE 512
-
-/*
- * cvt - IEEE floating point formatting routines.
- *       Derived from UNIX V7, Copyright(C) Caldera International Inc.
- */
-
-/*
- *    apr_ecvt converts to decimal
- *      the number of digits is specified by ndigit
- *      decpt is set to the position of the decimal point
- *      sign is set to 0 for positive, 1 for negative
- */
-
-#define NDIG 80
-
-/* buf must have at least NDIG bytes */
-static char *apr_cvt(double arg, int ndigits, int *decpt, int *sign, 
-                     int eflag, char *buf)
-{
-    register int r2;
-    double fi, fj;
-    register char *p, *p1;
-    
-    if (ndigits >= NDIG - 1)
-        ndigits = NDIG - 2;
-    r2 = 0;
-    *sign = 0;
-    p = &buf[0];
-    if (arg < 0) {
-        *sign = 1;
-        arg = -arg;
-    }
-    arg = modf(arg, &fi);
-    p1 = &buf[NDIG];
-    /*
-     * Do integer part
-     */
-    if (fi != 0) {
-        p1 = &buf[NDIG];
-        while (p1 > &buf[0] && fi != 0) {
-            fj = modf(fi / 10, &fi);
-            *--p1 = (int) ((fj + .03) * 10) + '0';
-            r2++;
-        }
-        while (p1 < &buf[NDIG])
-            *p++ = *p1++;
-    }
-    else if (arg > 0) {
-        while ((fj = arg * 10) < 1) {
-            arg = fj;
-            r2--;
-        }
-    }
-    p1 = &buf[ndigits];
-    if (eflag == 0)
-        p1 += r2;
-    if (p1 < &buf[0]) {
-        *decpt = -ndigits;
-        buf[0] = '\0';
-        return (buf);
-    }
-    *decpt = r2;
-    while (p <= p1 && p < &buf[NDIG]) {
-        arg *= 10;
-        arg = modf(arg, &fj);
-        *p++ = (int) fj + '0';
-    }
-    if (p1 >= &buf[NDIG]) {
-        buf[NDIG - 1] = '\0';
-        return (buf);
-    }
-    p = p1;
-    *p1 += 5;
-    while (*p1 > '9') {
-        *p1 = '0';
-        if (p1 > buf)
-            ++ * --p1;
-        else {
-            *p1 = '1';
-            (*decpt)++;
-            if (eflag == 0) {
-                if (p > buf)
-                    *p = '0';
-                p++;
-            }
-        }
-    }
-    *p = '\0';
-    return (buf);
-}
-
-static char *apr_ecvt(double arg, int ndigits, int *decpt, int *sign, char *buf)
-{
-    return (apr_cvt(arg, ndigits, decpt, sign, 1, buf));
-}
-
-static char *apr_fcvt(double arg, int ndigits, int *decpt, int *sign, char *buf)
-{
-    return (apr_cvt(arg, ndigits, decpt, sign, 0, buf));
-}
-
-/*
- * apr_gcvt  - Floating output conversion to
- * minimal length string
- */
-
-static char *apr_gcvt(double number, int ndigit, char *buf, boolean_e altform)
-{
-    int sign, decpt;
-    register char *p1, *p2;
-    register int i;
-    char buf1[NDIG];
-
-    p1 = apr_ecvt(number, ndigit, &decpt, &sign, buf1);
-    p2 = buf;
-    if (sign)
-        *p2++ = '-';
-    for (i = ndigit - 1; i > 0 && p1[i] == '0'; i--)
-        ndigit--;
-    if ((decpt >= 0 && decpt - ndigit > 4)
-        || (decpt < 0 && decpt < -3)) {                /* use E-style */
-        decpt--;
-        *p2++ = *p1++;
-        *p2++ = '.';
-        for (i = 1; i < ndigit; i++)
-            *p2++ = *p1++;
-        *p2++ = 'e';
-        if (decpt < 0) {
-            decpt = -decpt;
-            *p2++ = '-';
-        }
-        else
-            *p2++ = '+';
-        if (decpt / 100 > 0)
-            *p2++ = decpt / 100 + '0';
-        if (decpt / 10 > 0)
-            *p2++ = (decpt % 100) / 10 + '0';
-        *p2++ = decpt % 10 + '0';
-    }
-    else {
-        if (decpt <= 0) {
-            if (*p1 != '0')
-                *p2++ = '.';
-            while (decpt < 0) {
-                decpt++;
-                *p2++ = '0';
-            }
-        }
-        for (i = 1; i <= ndigit; i++) {
-            *p2++ = *p1++;
-            if (i == decpt)
-                *p2++ = '.';
-        }
-        if (ndigit < decpt) {
-            while (ndigit++ < decpt)
-                *p2++ = '0';
-            *p2++ = '.';
-        }
-    }
-    if (p2[-1] == '.' && !altform)
-        p2--;
-    *p2 = '\0';
-    return (buf);
-}
-
-/*
- * The INS_CHAR macro inserts a character in the buffer and writes
- * the buffer back to disk if necessary
- * It uses the char pointers sp and bep:
- *      sp points to the next available character in the buffer
- *      bep points to the end-of-buffer+1
- * While using this macro, note that the nextb pointer is NOT updated.
- *
- * NOTE: Evaluation of the c argument should not have any side-effects
- */
-#define INS_CHAR(c, sp, bep, cc)                    \
-{                                                   \
-    if (sp) {                                       \
-        if (sp >= bep) {                            \
-            vbuff->curpos = sp;                     \
-            if (flush_func(vbuff))                  \
-                return -1;                          \
-            sp = vbuff->curpos;                     \
-            bep = vbuff->endpos;                    \
-        }                                           \
-        *sp++ = (c);                                \
-    }                                               \
-    cc++;                                           \
-}
-
-#define NUM(c) (c - '0')
-
-#define STR_TO_DEC(str, num)                        \
-    num = NUM(*str++);                              \
-    while (apr_isdigit(*str))                       \
-    {                                               \
-        num *= 10 ;                                 \
-        num += NUM(*str++);                         \
-    }
-
-/*
- * This macro does zero padding so that the precision
- * requirement is satisfied. The padding is done by
- * adding '0's to the left of the string that is going
- * to be printed. We don't allow precision to be large
- * enough that we continue past the start of s.
- *
- * NOTE: this makes use of the magic info that s is
- * always based on num_buf with a size of NUM_BUF_SIZE.
- */
-#define FIX_PRECISION(adjust, precision, s, s_len)  \
-    if (adjust) {                                   \
-        int p = precision < NUM_BUF_SIZE - 1 ? precision : NUM_BUF_SIZE - 1; \
-        while (s_len < p)                           \
-        {                                           \
-            *--s = '0';                             \
-            s_len++;                                \
-        }                                           \
-    }
-
-/*
- * Macro that does padding. The padding is done by printing
- * the character ch.
- */
-#define PAD(width, len, ch)                         \
-do                                                  \
-{                                                   \
-    INS_CHAR(ch, sp, bep, cc);                      \
-    width--;                                        \
-}                                                   \
-while (width > len)
-
-/*
- * Prefix the character ch to the string str
- * Increase length
- * Set the has_prefix flag
- */
-#define PREFIX(str, length, ch)                     \
-    *--str = ch;                                    \
-    length++;                                       \
-    has_prefix=YES;
-
-
-/*
- * Convert num to its decimal format.
- * Return value:
- *   - a pointer to a string containing the number (no sign)
- *   - len contains the length of the string
- *   - is_negative is set to TRUE or FALSE depending on the sign
- *     of the number (always set to FALSE if is_unsigned is TRUE)
- *
- * The caller provides a buffer for the string: that is the buf_end argument
- * which is a pointer to the END of the buffer + 1 (i.e. if the buffer
- * is declared as buf[ 100 ], buf_end should be &buf[ 100 ])
- *
- * Note: we have 2 versions. One is used when we need to use quads
- * (conv_10_quad), the other when we don't (conv_10). We're assuming the
- * latter is faster.
- */
-static char *conv_10(register wide_int num, register bool_int is_unsigned,
-                     register bool_int *is_negative, char *buf_end,
-                     register int *len)
-{
-    register char *p = buf_end;
-    register u_wide_int magnitude;
-
-    if (is_unsigned) {
-        magnitude = (u_wide_int) num;
-        *is_negative = FALSE;
-    }
-    else {
-        *is_negative = (num < 0);
-
-        /*
-         * On a 2's complement machine, negating the most negative integer 
-         * results in a number that cannot be represented as a signed integer.
-         * Here is what we do to obtain the number's magnitude:
-         *      a. add 1 to the number
-         *      b. negate it (becomes positive)
-         *      c. convert it to unsigned
-         *      d. add 1
-         */
-        if (*is_negative) {
-            wide_int t = num + 1;
-
-            magnitude = ((u_wide_int) -t) + 1;
-        }
-        else
-            magnitude = (u_wide_int) num;
-    }
-
-    /*
-     * We use a do-while loop so that we write at least 1 digit 
-     */
-    do {
-        register u_wide_int new_magnitude = magnitude / 10;
-
-        *--p = (char) (magnitude - new_magnitude * 10 + '0');
-        magnitude = new_magnitude;
-    }
-    while (magnitude);
-
-    *len = buf_end - p;
-    return (p);
-}
-
-static char *conv_10_quad(widest_int num, register bool_int is_unsigned,
-                     register bool_int *is_negative, char *buf_end,
-                     register int *len)
-{
-    register char *p = buf_end;
-    u_widest_int magnitude;
-
-    /*
-     * We see if we can use the faster non-quad version by checking the
-     * number against the largest long value it can be. If <=, we
-     * punt to the quicker version.
-     */
-    if ((num <= ULONG_MAX && is_unsigned) 
-        || (num <= LONG_MAX && num >= LONG_MIN && !is_unsigned))
-            return(conv_10( (wide_int)num, is_unsigned, is_negative,
-               buf_end, len));
-
-    if (is_unsigned) {
-        magnitude = (u_widest_int) num;
-        *is_negative = FALSE;
-    }
-    else {
-        *is_negative = (num < 0);
-
-        /*
-         * On a 2's complement machine, negating the most negative integer 
-         * results in a number that cannot be represented as a signed integer.
-         * Here is what we do to obtain the number's magnitude:
-         *      a. add 1 to the number
-         *      b. negate it (becomes positive)
-         *      c. convert it to unsigned
-         *      d. add 1
-         */
-        if (*is_negative) {
-            widest_int t = num + 1;
-
-            magnitude = ((u_widest_int) -t) + 1;
-        }
-        else
-            magnitude = (u_widest_int) num;
-    }
-
-    /*
-     * We use a do-while loop so that we write at least 1 digit 
-     */
-    do {
-        u_widest_int new_magnitude = magnitude / 10;
-
-        *--p = (char) (magnitude - new_magnitude * 10 + '0');
-        magnitude = new_magnitude;
-    }
-    while (magnitude);
-
-    *len = buf_end - p;
-    return (p);
-}
-
-
-
-static char *conv_in_addr(struct in_addr *ia, char *buf_end, int *len)
-{
-    unsigned addr = ntohl(ia->s_addr);
-    char *p = buf_end;
-    bool_int is_negative;
-    int sub_len;
-
-    p = conv_10((addr & 0x000000FF)      , TRUE, &is_negative, p, &sub_len);
-    *--p = '.';
-    p = conv_10((addr & 0x0000FF00) >>  8, TRUE, &is_negative, p, &sub_len);
-    *--p = '.';
-    p = conv_10((addr & 0x00FF0000) >> 16, TRUE, &is_negative, p, &sub_len);
-    *--p = '.';
-    p = conv_10((addr & 0xFF000000) >> 24, TRUE, &is_negative, p, &sub_len);
-
-    *len = buf_end - p;
-    return (p);
-}
-
-
-
-static char *conv_apr_sockaddr(apr_sockaddr_t *sa, char *buf_end, int *len)
-{
-    char *p = buf_end;
-    bool_int is_negative;
-    int sub_len;
-    char *ipaddr_str;
-
-    p = conv_10(sa->port, TRUE, &is_negative, p, &sub_len);
-    *--p = ':';
-    apr_sockaddr_ip_get(&ipaddr_str, sa);
-    sub_len = strlen(ipaddr_str);
-#if APR_HAVE_IPV6
-    if (sa->family == APR_INET6 &&
-        !IN6_IS_ADDR_V4MAPPED(&sa->sa.sin6.sin6_addr)) {
-        *(p - 1) = ']';
-        p -= sub_len + 2;
-        *p = '[';
-        memcpy(p + 1, ipaddr_str, sub_len);
-    }
-    else
-#endif
-    {
-        p -= sub_len;
-        memcpy(p, ipaddr_str, sub_len);
-    }
-
-    *len = buf_end - p;
-    return (p);
-}
-
-
-
-#if APR_HAS_THREADS
-static char *conv_os_thread_t(apr_os_thread_t *tid, char *buf_end, int *len)
-{
-    union {
-        apr_os_thread_t tid;
-        apr_uint64_t alignme;
-    } u;
-    int is_negative;
-
-    u.tid = *tid;
-    switch(sizeof(u.tid)) {
-    case sizeof(apr_int32_t):
-        return conv_10(*(apr_uint32_t *)&u.tid, TRUE, &is_negative, buf_end, len);
-    case sizeof(apr_int64_t):
-        return conv_10_quad(*(apr_uint64_t *)&u.tid, TRUE, &is_negative, buf_end, len);
-    default:
-        /* not implemented; stick 0 in the buffer */
-        return conv_10(0, TRUE, &is_negative, buf_end, len);
-    }
-}
-#endif
-
-
-
-/*
- * Convert a floating point number to a string formats 'f', 'e' or 'E'.
- * The result is placed in buf, and len denotes the length of the string
- * The sign is returned in the is_negative argument (and is not placed
- * in buf).
- */
-static char *conv_fp(register char format, register double num,
-    boolean_e add_dp, int precision, bool_int *is_negative,
-    char *buf, int *len)
-{
-    register char *s = buf;
-    register char *p;
-    int decimal_point;
-    char buf1[NDIG];
-
-    if (format == 'f')
-        p = apr_fcvt(num, precision, &decimal_point, is_negative, buf1);
-    else /* either e or E format */
-        p = apr_ecvt(num, precision + 1, &decimal_point, is_negative, buf1);
-
-    /*
-     * Check for Infinity and NaN
-     */
-    if (apr_isalpha(*p)) {
-        *len = strlen(p);
-        memcpy(buf, p, *len + 1);
-        *is_negative = FALSE;
-        return (buf);
-    }
-
-    if (format == 'f') {
-        if (decimal_point <= 0) {
-            *s++ = '0';
-            if (precision > 0) {
-                *s++ = '.';
-                while (decimal_point++ < 0)
-                    *s++ = '0';
-            }
-            else if (add_dp)
-                *s++ = '.';
-        }
-        else {
-            while (decimal_point-- > 0)
-                *s++ = *p++;
-            if (precision > 0 || add_dp)
-                *s++ = '.';
-        }
-    }
-    else {
-        *s++ = *p++;
-        if (precision > 0 || add_dp)
-            *s++ = '.';
-    }
-
-    /*
-     * copy the rest of p, the NUL is NOT copied
-     */
-    while (*p)
-        *s++ = *p++;
-
-    if (format != 'f') {
-        char temp[EXPONENT_LENGTH];        /* for exponent conversion */
-        int t_len;
-        bool_int exponent_is_negative;
-
-        *s++ = format;                /* either e or E */
-        decimal_point--;
-        if (decimal_point != 0) {
-            p = conv_10((wide_int) decimal_point, FALSE, &exponent_is_negative,
-                        &temp[EXPONENT_LENGTH], &t_len);
-            *s++ = exponent_is_negative ? '-' : '+';
-
-            /*
-             * Make sure the exponent has at least 2 digits
-             */
-            if (t_len == 1)
-                *s++ = '0';
-            while (t_len--)
-                *s++ = *p++;
-        }
-        else {
-            *s++ = '+';
-            *s++ = '0';
-            *s++ = '0';
-        }
-    }
-
-    *len = s - buf;
-    return (buf);
-}
-
-
-/*
- * Convert num to a base X number where X is a power of 2. nbits determines X.
- * For example, if nbits is 3, we do base 8 conversion
- * Return value:
- *      a pointer to a string containing the number
- *
- * The caller provides a buffer for the string: that is the buf_end argument
- * which is a pointer to the END of the buffer + 1 (i.e. if the buffer
- * is declared as buf[ 100 ], buf_end should be &buf[ 100 ])
- *
- * As with conv_10, we have a faster version which is used when
- * the number isn't quad size.
- */
-static char *conv_p2(register u_wide_int num, register int nbits,
-                     char format, char *buf_end, register int *len)
-{
-    register int mask = (1 << nbits) - 1;
-    register char *p = buf_end;
-    static const char low_digits[] = "0123456789abcdef";
-    static const char upper_digits[] = "0123456789ABCDEF";
-    register const char *digits = (format == 'X') ? upper_digits : low_digits;
-
-    do {
-        *--p = digits[num & mask];
-        num >>= nbits;
-    }
-    while (num);
-
-    *len = buf_end - p;
-    return (p);
-}
-
-static char *conv_p2_quad(u_widest_int num, register int nbits,
-                     char format, char *buf_end, register int *len)
-{
-    register int mask = (1 << nbits) - 1;
-    register char *p = buf_end;
-    static const char low_digits[] = "0123456789abcdef";
-    static const char upper_digits[] = "0123456789ABCDEF";
-    register const char *digits = (format == 'X') ? upper_digits : low_digits;
-
-    if (num <= ULONG_MAX)
-        return(conv_p2((u_wide_int)num, nbits, format, buf_end, len));
-
-    do {
-        *--p = digits[num & mask];
-        num >>= nbits;
-    }
-    while (num);
-
-    *len = buf_end - p;
-    return (p);
-}
-
-
-/*
- * Do format conversion placing the output in buffer
- */
-APR_DECLARE(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *),
-    apr_vformatter_buff_t *vbuff, const char *fmt, va_list ap)
-{
-    register char *sp;
-    register char *bep;
-    register int cc = 0;
-    register int i;
-
-    register char *s = NULL;
-    char *q;
-    int s_len;
-
-    register int min_width = 0;
-    int precision = 0;
-    enum {
-        LEFT, RIGHT
-    } adjust;
-    char pad_char;
-    char prefix_char;
-
-    double fp_num;
-    widest_int i_quad = (widest_int) 0;
-    u_widest_int ui_quad;
-    wide_int i_num = (wide_int) 0;
-    u_wide_int ui_num;
-
-    char num_buf[NUM_BUF_SIZE];
-    char char_buf[2];                /* for printing %% and %<unknown> */
-
-    enum var_type_enum {
-            IS_QUAD, IS_LONG, IS_SHORT, IS_INT
-    };
-    enum var_type_enum var_type = IS_INT;
-
-    /*
-     * Flag variables
-     */
-    boolean_e alternate_form;
-    boolean_e print_sign;
-    boolean_e print_blank;
-    boolean_e adjust_precision;
-    boolean_e adjust_width;
-    bool_int is_negative;
-
-    sp = vbuff->curpos;
-    bep = vbuff->endpos;
-
-    while (*fmt) {
-        if (*fmt != '%') {
-            INS_CHAR(*fmt, sp, bep, cc);
-        }
-        else {
-            /*
-             * Default variable settings
-             */
-            boolean_e print_something = YES;
-            adjust = RIGHT;
-            alternate_form = print_sign = print_blank = NO;
-            pad_char = ' ';
-            prefix_char = NUL;
-
-            fmt++;
-
-            /*
-             * Try to avoid checking for flags, width or precision
-             */
-            if (!apr_islower(*fmt)) {
-                /*
-                 * Recognize flags: -, #, BLANK, +
-                 */
-                for (;; fmt++) {
-                    if (*fmt == '-')
-                        adjust = LEFT;
-                    else if (*fmt == '+')
-                        print_sign = YES;
-                    else if (*fmt == '#')
-                        alternate_form = YES;
-                    else if (*fmt == ' ')
-                        print_blank = YES;
-                    else if (*fmt == '0')
-                        pad_char = '0';
-                    else
-                        break;
-                }
-
-                /*
-                 * Check if a width was specified
-                 */
-                if (apr_isdigit(*fmt)) {
-                    STR_TO_DEC(fmt, min_width);
-                    adjust_width = YES;
-                }
-                else if (*fmt == '*') {
-                    min_width = va_arg(ap, int);
-                    fmt++;
-                    adjust_width = YES;
-                    if (min_width < 0) {
-                        adjust = LEFT;
-                        min_width = -min_width;
-                    }
-                }
-                else
-                    adjust_width = NO;
-
-                /*
-                 * Check if a precision was specified
-                 */
-                if (*fmt == '.') {
-                    adjust_precision = YES;
-                    fmt++;
-                    if (apr_isdigit(*fmt)) {
-                        STR_TO_DEC(fmt, precision);
-                    }
-                    else if (*fmt == '*') {
-                        precision = va_arg(ap, int);
-                        fmt++;
-                        if (precision < 0)
-                            precision = 0;
-                    }
-                    else
-                        precision = 0;
-                }
-                else
-                    adjust_precision = NO;
-            }
-            else
-                adjust_precision = adjust_width = NO;
-
-            /*
-             * Modifier check
-             */
-#if defined(APR_INT64_T_FMT_LEN) && (APR_INT64_T_FMT_LEN == 3)
-            if ((*fmt == APR_INT64_T_FMT[0]) &&
-                (fmt[1] == APR_INT64_T_FMT[1])) {
-#elif defined(APR_INT64_T_FMT_LEN) && (APR_INT64_T_FMT_LEN == 2)
-            if (*fmt == APR_INT64_T_FMT[0]) {
-#else
-            if (strncmp(fmt, APR_INT64_T_FMT, 
-                             sizeof(APR_INT64_T_FMT) - 2) == 0) {
-#endif
-                /* Need to account for trailing 'd' and null in sizeof() */
-                var_type = IS_QUAD;
-                fmt += (sizeof(APR_INT64_T_FMT) - 2);
-            }
-            else if (*fmt == 'q') {
-                var_type = IS_QUAD;
-                fmt++;
-            }
-            else if (*fmt == 'l') {
-                var_type = IS_LONG;
-                fmt++;
-            }
-            else if (*fmt == 'h') {
-                var_type = IS_SHORT;
-                fmt++;
-            }
-            else {
-                var_type = IS_INT;
-            }
-
-            /*
-             * Argument extraction and printing.
-             * First we determine the argument type.
-             * Then, we convert the argument to a string.
-             * On exit from the switch, s points to the string that
-             * must be printed, s_len has the length of the string
-             * The precision requirements, if any, are reflected in s_len.
-             *
-             * NOTE: pad_char may be set to '0' because of the 0 flag.
-             *   It is reset to ' ' by non-numeric formats
-             */
-            switch (*fmt) {
-            case 'u':
-                if (var_type == IS_QUAD) {
-                    i_quad = va_arg(ap, u_widest_int);
-                    s = conv_10_quad(i_quad, 1, &is_negative,
-                            &num_buf[NUM_BUF_SIZE], &s_len);
-                }
-                else {
-                    if (var_type == IS_LONG)
-                        i_num = (wide_int) va_arg(ap, u_wide_int);
-                    else if (var_type == IS_SHORT)
-                        i_num = (wide_int) (unsigned short) va_arg(ap, unsigned int);
-                    else
-                        i_num = (wide_int) va_arg(ap, unsigned int);
-                    s = conv_10(i_num, 1, &is_negative,
-                            &num_buf[NUM_BUF_SIZE], &s_len);
-                }
-                FIX_PRECISION(adjust_precision, precision, s, s_len);
-                break;
-
-            case 'd':
-            case 'i':
-                if (var_type == IS_QUAD) {
-                    i_quad = va_arg(ap, widest_int);
-                    s = conv_10_quad(i_quad, 0, &is_negative,
-                            &num_buf[NUM_BUF_SIZE], &s_len);
-                }
-                else {
-                    if (var_type == IS_LONG)
-                        i_num = (wide_int) va_arg(ap, wide_int);
-                    else if (var_type == IS_SHORT)
-                        i_num = (wide_int) (short) va_arg(ap, int);
-                    else
-                        i_num = (wide_int) va_arg(ap, int);
-                    s = conv_10(i_num, 0, &is_negative,
-                            &num_buf[NUM_BUF_SIZE], &s_len);
-                }
-                FIX_PRECISION(adjust_precision, precision, s, s_len);
-
-                if (is_negative)
-                    prefix_char = '-';
-                else if (print_sign)
-                    prefix_char = '+';
-                else if (print_blank)
-                    prefix_char = ' ';
-                break;
-
-
-            case 'o':
-                if (var_type == IS_QUAD) {
-                    ui_quad = va_arg(ap, u_widest_int);
-                    s = conv_p2_quad(ui_quad, 3, *fmt,
-                            &num_buf[NUM_BUF_SIZE], &s_len);
-                }
-                else {
-                    if (var_type == IS_LONG)
-                        ui_num = (u_wide_int) va_arg(ap, u_wide_int);
-                    else if (var_type == IS_SHORT)
-                        ui_num = (u_wide_int) (unsigned short) va_arg(ap, unsigned int);
-                    else
-                        ui_num = (u_wide_int) va_arg(ap, unsigned int);
-                    s = conv_p2(ui_num, 3, *fmt,
-                            &num_buf[NUM_BUF_SIZE], &s_len);
-                }
-                FIX_PRECISION(adjust_precision, precision, s, s_len);
-                if (alternate_form && *s != '0') {
-                    *--s = '0';
-                    s_len++;
-                }
-                break;
-
-
-            case 'x':
-            case 'X':
-                if (var_type == IS_QUAD) {
-                    ui_quad = va_arg(ap, u_widest_int);
-                    s = conv_p2_quad(ui_quad, 4, *fmt,
-                            &num_buf[NUM_BUF_SIZE], &s_len);
-                }
-                else {
-                    if (var_type == IS_LONG)
-                        ui_num = (u_wide_int) va_arg(ap, u_wide_int);
-                    else if (var_type == IS_SHORT)
-                        ui_num = (u_wide_int) (unsigned short) va_arg(ap, unsigned int);
-                    else
-                        ui_num = (u_wide_int) va_arg(ap, unsigned int);
-                    s = conv_p2(ui_num, 4, *fmt,
-                            &num_buf[NUM_BUF_SIZE], &s_len);
-                }
-                FIX_PRECISION(adjust_precision, precision, s, s_len);
-                if (alternate_form && i_num != 0) {
-                    *--s = *fmt;        /* 'x' or 'X' */
-                    *--s = '0';
-                    s_len += 2;
-                }
-                break;
-
-
-            case 's':
-                s = va_arg(ap, char *);
-                if (s != NULL) {
-                    if (!adjust_precision) {
-                        s_len = strlen(s);
-                    }
-                    else {
-                        /* From the C library standard in section 7.9.6.1:
-                         * ...if the precision is specified, no more then
-                         * that many characters are written.  If the
-                         * precision is not specified or is greater
-                         * than the size of the array, the array shall
-                         * contain a null character.
-                         *
-                         * My reading is is precision is specified and
-                         * is less then or equal to the size of the
-                         * array, no null character is required.  So
-                         * we can't do a strlen.
-                         *
-                         * This figures out the length of the string
-                         * up to the precision.  Once it's long enough
-                         * for the specified precision, we don't care
-                         * anymore.
-                         *
-                         * NOTE: you must do the length comparison
-                         * before the check for the null character.
-                         * Otherwise, you'll check one beyond the
-                         * last valid character.
-                         */
-                        const char *walk;
-
-                        for (walk = s, s_len = 0;
-                             (s_len < precision) && (*walk != '\0');
-                             ++walk, ++s_len);
-                    }
-                }
-                else {
-                    s = S_NULL;
-                    s_len = S_NULL_LEN;
-                }
-                pad_char = ' ';
-                break;
-
-
-            case 'f':
-            case 'e':
-            case 'E':
-                fp_num = va_arg(ap, double);
-                /*
-                 * We use &num_buf[ 1 ], so that we have room for the sign
-                 */
-                s = NULL;
-#ifdef HAVE_ISNAN
-                if (isnan(fp_num)) {
-                    s = "nan";
-                    s_len = 3;
-                }
-#endif
-#ifdef HAVE_ISINF
-                if (!s && isinf(fp_num)) {
-                    s = "inf";
-                    s_len = 3;
-                }
-#endif
-                if (!s) {
-                    s = conv_fp(*fmt, fp_num, alternate_form,
-                            (adjust_precision == NO) ? FLOAT_DIGITS : precision,
-                                &is_negative, &num_buf[1], &s_len);
-                    if (is_negative)
-                        prefix_char = '-';
-                    else if (print_sign)
-                        prefix_char = '+';
-                    else if (print_blank)
-                        prefix_char = ' ';
-                }
-                break;
-
-
-            case 'g':
-            case 'G':
-                if (adjust_precision == NO)
-                    precision = FLOAT_DIGITS;
-                else if (precision == 0)
-                    precision = 1;
-                /*
-                 * * We use &num_buf[ 1 ], so that we have room for the sign
-                 */
-                s = apr_gcvt(va_arg(ap, double), precision, &num_buf[1],
-                            alternate_form);
-                if (*s == '-')
-                    prefix_char = *s++;
-                else if (print_sign)
-                    prefix_char = '+';
-                else if (print_blank)
-                    prefix_char = ' ';
-
-                s_len = strlen(s);
-
-                if (alternate_form && (q = strchr(s, '.')) == NULL) {
-                    s[s_len++] = '.';
-                    s[s_len] = '\0'; /* delimit for following strchr() */
-                }
-                if (*fmt == 'G' && (q = strchr(s, 'e')) != NULL)
-                    *q = 'E';
-                break;
-
-
-            case 'c':
-                char_buf[0] = (char) (va_arg(ap, int));
-                s = &char_buf[0];
-                s_len = 1;
-                pad_char = ' ';
-                break;
-
-
-            case '%':
-                char_buf[0] = '%';
-                s = &char_buf[0];
-                s_len = 1;
-                pad_char = ' ';
-                break;
-
-
-            case 'n':
-                if (var_type == IS_QUAD)
-                    *(va_arg(ap, widest_int *)) = cc;
-                else if (var_type == IS_LONG)
-                    *(va_arg(ap, long *)) = cc;
-                else if (var_type == IS_SHORT)
-                    *(va_arg(ap, short *)) = cc;
-                else
-                    *(va_arg(ap, int *)) = cc;
-                print_something = NO;
-                break;
-
-                /*
-                 * This is where we extend the printf format, with a second
-                 * type specifier
-                 */
-            case 'p':
-                switch(*++fmt) {
-                /*
-                 * If the pointer size is equal to or smaller than the size
-                 * of the largest unsigned int, we convert the pointer to a
-                 * hex number, otherwise we print "%p" to indicate that we
-                 * don't handle "%p".
-                 */
-                case 'p':
-#if APR_SIZEOF_VOIDP == 8
-                    if (sizeof(void *) <= sizeof(u_widest_int)) {
-                        ui_quad = (u_widest_int) va_arg(ap, void *);
-                        s = conv_p2_quad(ui_quad, 4, 'x',
-                                &num_buf[NUM_BUF_SIZE], &s_len);
-                    }
-#else
-                    if (sizeof(void *) <= sizeof(u_wide_int)) {
-                        ui_num = (u_wide_int) va_arg(ap, void *);
-                        s = conv_p2(ui_num, 4, 'x',
-                                &num_buf[NUM_BUF_SIZE], &s_len);
-                    }
-#endif
-                    else {
-                        s = "%p";
-                        s_len = 2;
-                        prefix_char = NUL;
-                    }
-                    pad_char = ' ';
-                    break;
-
-                /* print an apr_sockaddr_t as a.b.c.d:port */
-                case 'I':
-                {
-                    apr_sockaddr_t *sa;
-
-                    sa = va_arg(ap, apr_sockaddr_t *);
-                    if (sa != NULL) {
-                        s = conv_apr_sockaddr(sa, &num_buf[NUM_BUF_SIZE], &s_len);
-                        if (adjust_precision && precision < s_len)
-                            s_len = precision;
-                    }
-                    else {
-                        s = S_NULL;
-                        s_len = S_NULL_LEN;
-                    }
-                    pad_char = ' ';
-                }
-                break;
-
-                /* print a struct in_addr as a.b.c.d */
-                case 'A':
-                {
-                    struct in_addr *ia;
-
-                    ia = va_arg(ap, struct in_addr *);
-                    if (ia != NULL) {
-                        s = conv_in_addr(ia, &num_buf[NUM_BUF_SIZE], &s_len);
-                        if (adjust_precision && precision < s_len)
-                            s_len = precision;
-                    }
-                    else {
-                        s = S_NULL;
-                        s_len = S_NULL_LEN;
-                    }
-                    pad_char = ' ';
-                }
-                break;
-
-                case 'T':
-#if APR_HAS_THREADS
-                {
-                    apr_os_thread_t *tid;
-
-                    tid = va_arg(ap, apr_os_thread_t *);
-                    if (tid != NULL) {
-                        s = conv_os_thread_t(tid, &num_buf[NUM_BUF_SIZE], &s_len);
-                        if (adjust_precision && precision < s_len)
-                            s_len = precision;
-                    }
-                    else {
-                        s = S_NULL;
-                        s_len = S_NULL_LEN;
-                    }
-                    pad_char = ' ';
-                }
-#else
-                    char_buf[0] = '0';
-                    s = &char_buf[0];
-                    s_len = 1;
-                    pad_char = ' ';
-#endif
-                    break;
-
-                case NUL:
-                    /* if %p ends the string, oh well ignore it */
-                    continue;
-
-                default:
-                    s = "bogus %p";
-                    s_len = 8;
-                    prefix_char = NUL;
-                    (void)va_arg(ap, void *); /* skip the bogus argument on the stack */
-                    break;
-                }
-                break;
-
-            case NUL:
-                /*
-                 * The last character of the format string was %.
-                 * We ignore it.
-                 */
-                continue;
-
-
-                /*
-                 * The default case is for unrecognized %'s.
-                 * We print %<char> to help the user identify what
-                 * option is not understood.
-                 * This is also useful in case the user wants to pass
-                 * the output of format_converter to another function
-                 * that understands some other %<char> (like syslog).
-                 * Note that we can't point s inside fmt because the
-                 * unknown <char> could be preceded by width etc.
-                 */
-            default:
-                char_buf[0] = '%';
-                char_buf[1] = *fmt;
-                s = char_buf;
-                s_len = 2;
-                pad_char = ' ';
-                break;
-            }
-
-            if (prefix_char != NUL && s != S_NULL && s != char_buf) {
-                *--s = prefix_char;
-                s_len++;
-            }
-
-            if (adjust_width && adjust == RIGHT && min_width > s_len) {
-                if (pad_char == '0' && prefix_char != NUL) {
-                    INS_CHAR(*s, sp, bep, cc);
-                    s++;
-                    s_len--;
-                    min_width--;
-                }
-                PAD(min_width, s_len, pad_char);
-            }
-
-            /*
-             * Print the string s. 
-             */
-            if (print_something == YES) {
-                for (i = s_len; i != 0; i--) {
-                      INS_CHAR(*s, sp, bep, cc);
-                    s++;
-                }
-            }
-
-            if (adjust_width && adjust == LEFT && min_width > s_len)
-                PAD(min_width, s_len, pad_char);
-        }
-        fmt++;
-    }
-    vbuff->curpos = sp;
-
-    return cc;
-}
-
-
-static int snprintf_flush(apr_vformatter_buff_t *vbuff)
-{
-    /* if the buffer fills we have to abort immediately, there is no way
-     * to "flush" an apr_snprintf... there's nowhere to flush it to.
-     */
-    return -1;
-}
-
-
-APR_DECLARE_NONSTD(int) apr_snprintf(char *buf, apr_size_t len, 
-                                     const char *format, ...)
-{
-    int cc;
-    va_list ap;
-    apr_vformatter_buff_t vbuff;
-
-    if (len == 0) {
-        /* NOTE: This is a special case; we just want to return the number
-         * of chars that would be written (minus \0) if the buffer
-         * size was infinite. We leverage the fact that INS_CHAR
-         * just does actual inserts iff the buffer pointer is non-NULL.
-         * In this case, we don't care what buf is; it can be NULL, since
-         * we don't touch it at all.
-         */
-        vbuff.curpos = NULL;
-        vbuff.endpos = NULL;
-    } else {
-        /* save one byte for nul terminator */
-        vbuff.curpos = buf;
-        vbuff.endpos = buf + len - 1;
-    }
-    va_start(ap, format);
-    cc = apr_vformatter(snprintf_flush, &vbuff, format, ap);
-    va_end(ap);
-    if (len != 0) {
-        *vbuff.curpos = '\0';
-    }
-    return (cc == -1) ? (int)len : cc;
-}
-
-
-APR_DECLARE(int) apr_vsnprintf(char *buf, apr_size_t len, const char *format,
-                               va_list ap)
-{
-    int cc;
-    apr_vformatter_buff_t vbuff;
-
-    if (len == 0) {
-        /* See above note */
-        vbuff.curpos = NULL;
-        vbuff.endpos = NULL;
-    } else {
-        /* save one byte for nul terminator */
-        vbuff.curpos = buf;
-        vbuff.endpos = buf + len - 1;
-    }
-    cc = apr_vformatter(snprintf_flush, &vbuff, format, ap);
-    if (len != 0) {
-        *vbuff.curpos = '\0';
-    }
-    return (cc == -1) ? (int)len : cc;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_snprintf.lo b/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_snprintf.lo
deleted file mode 100644
index 24aa0fc0..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_snprintf.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# apr_snprintf.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/apr_snprintf.o'
-
-# Name of the non-PIC object.
-non_pic_object='apr_snprintf.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_snprintf.o b/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_snprintf.o
deleted file mode 100644
index 82b10d9c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_snprintf.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strings.c b/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strings.c
deleted file mode 100644
index 1927c515..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strings.c
+++ /dev/null
@@ -1,458 +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.
- */
-/*
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "apr.h"
-#include "apr_strings.h"
-#include "apr_general.h"
-#include "apr_private.h"
-#include "apr_lib.h"
-#define APR_WANT_STDIO
-#define APR_WANT_STRFUNC
-#include "apr_want.h"
-
-#ifdef HAVE_STDDEF_H
-#include <stddef.h> /* NULL */
-#endif
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h> /* strtol and strtoll */
-#endif
-
-/** this is used to cache lengths in apr_pstrcat */
-#define MAX_SAVED_LENGTHS  6
-
-APR_DECLARE(char *) apr_pstrdup(apr_pool_t *a, const char *s)
-{
-    char *res;
-    apr_size_t len;
-
-    if (s == NULL) {
-        return NULL;
-    }
-    len = strlen(s) + 1;
-    res = apr_palloc(a, len);
-    memcpy(res, s, len);
-    return res;
-}
-
-APR_DECLARE(char *) apr_pstrndup(apr_pool_t *a, const char *s, apr_size_t n)
-{
-    char *res;
-    const char *end;
-
-    if (s == NULL) {
-        return NULL;
-    }
-    end = memchr(s, '\0', n);
-    if (end != NULL)
-        n = end - s;
-    res = apr_palloc(a, n + 1);
-    memcpy(res, s, n);
-    res[n] = '\0';
-    return res;
-}
-
-APR_DECLARE(char *) apr_pstrmemdup(apr_pool_t *a, const char *s, apr_size_t n)
-{
-    char *res;
-
-    if (s == NULL) {
-        return NULL;
-    }
-    res = apr_palloc(a, n + 1);
-    memcpy(res, s, n);
-    res[n] = '\0';
-    return res;
-}
-
-APR_DECLARE(void *) apr_pmemdup(apr_pool_t *a, const void *m, apr_size_t n)
-{
-    void *res;
-
-    if (m == NULL)
-	return NULL;
-    res = apr_palloc(a, n);
-    memcpy(res, m, n);
-    return res;
-}
-
-APR_DECLARE_NONSTD(char *) apr_pstrcat(apr_pool_t *a, ...)
-{
-    char *cp, *argp, *res;
-    apr_size_t saved_lengths[MAX_SAVED_LENGTHS];
-    int nargs = 0;
-
-    /* Pass one --- find length of required string */
-
-    apr_size_t len = 0;
-    va_list adummy;
-
-    va_start(adummy, a);
-
-    while ((cp = va_arg(adummy, char *)) != NULL) {
-        apr_size_t cplen = strlen(cp);
-        if (nargs < MAX_SAVED_LENGTHS) {
-            saved_lengths[nargs++] = cplen;
-        }
-        len += cplen;
-    }
-
-    va_end(adummy);
-
-    /* Allocate the required string */
-
-    res = (char *) apr_palloc(a, len + 1);
-    cp = res;
-
-    /* Pass two --- copy the argument strings into the result space */
-
-    va_start(adummy, a);
-
-    nargs = 0;
-    while ((argp = va_arg(adummy, char *)) != NULL) {
-        if (nargs < MAX_SAVED_LENGTHS) {
-            len = saved_lengths[nargs++];
-        }
-        else {
-            len = strlen(argp);
-        }
- 
-        memcpy(cp, argp, len);
-        cp += len;
-    }
-
-    va_end(adummy);
-
-    /* Return the result string */
-
-    *cp = '\0';
-
-    return res;
-}
-
-APR_DECLARE(char *) apr_pstrcatv(apr_pool_t *a, const struct iovec *vec,
-                                 apr_size_t nvec, apr_size_t *nbytes)
-{
-    apr_size_t i;
-    apr_size_t len;
-    const struct iovec *src;
-    char *res;
-    char *dst;
-
-    /* Pass one --- find length of required string */
-    len = 0;
-    src = vec;
-    for (i = nvec; i; i--) {
-        len += src->iov_len;
-        src++;
-    }
-    if (nbytes) {
-        *nbytes = len;
-    }
-
-    /* Allocate the required string */
-    res = (char *) apr_palloc(a, len + 1);
-    
-    /* Pass two --- copy the argument strings into the result space */
-    src = vec;
-    dst = res;
-    for (i = nvec; i; i--) {
-        memcpy(dst, src->iov_base, src->iov_len);
-        dst += src->iov_len;
-        src++;
-    }
-
-    /* Return the result string */
-    *dst = '\0';
-
-    return res;
-}
-
-#if (!APR_HAVE_MEMCHR)
-void *memchr(const void *s, int c, size_t n)
-{
-    const char *cp;
-
-    for (cp = s; n > 0; n--, cp++) {
-        if (*cp == c)
-            return (char *) cp; /* Casting away the const here */
-    }
-
-    return NULL;
-}
-#endif
-
-#ifndef INT64_MAX
-#define INT64_MAX  APR_INT64_C(0x7fffffffffffffff)
-#endif
-#ifndef INT64_MIN
-#define INT64_MIN (-APR_INT64_C(0x7fffffffffffffff) - APR_INT64_C(1))
-#endif
-
-APR_DECLARE(apr_int64_t) apr_strtoi64(const char *nptr, char **endptr, int base)
-{
-#if (APR_HAVE_INT64_STRFN)
-    return APR_INT64_STRFN(nptr, endptr, base);
-#else
-    const char *s;
-    apr_int64_t acc;
-    apr_int64_t val;
-    int neg, any;
-    char c;
-
-    /*
-     * Skip white space and pick up leading +/- sign if any.
-     * If base is 0, allow 0x for hex and 0 for octal, else
-     * assume decimal; if base is already 16, allow 0x.
-     */
-    s = nptr;
-    do {
-	c = *s++;
-    } while (apr_isspace(c));
-    if (c == '-') {
-	neg = 1;
-	c = *s++;
-    } else {
-	neg = 0;
-	if (c == '+')
-	    c = *s++;
-    }
-    if ((base == 0 || base == 16) &&
-	c == '0' && (*s == 'x' || *s == 'X')) {
-	    c = s[1];
-	    s += 2;
-	    base = 16;
-    }
-    if (base == 0)
-	base = c == '0' ? 8 : 10;
-    acc = any = 0;
-    if (base < 2 || base > 36) {
-	errno = EINVAL;
-        if (endptr != NULL)
-	    *endptr = (char *)(any ? s - 1 : nptr);
-        return acc;
-    }
-
-    /* The classic bsd implementation requires div/mod operators
-     * to compute a cutoff.  Benchmarking proves that is very, very
-     * evil to some 32 bit processors.  Instead, look for underflow
-     * in both the mult and add/sub operation.  Unlike the bsd impl,
-     * we also work strictly in a signed int64 word as we haven't
-     * implemented the unsigned type in win32.
-     * 
-     * Set 'any' if any `digits' consumed; make it negative to indicate
-     * overflow.
-     */
-    val = 0;
-    for ( ; ; c = *s++) {
-        if (c >= '0' && c <= '9')
-	    c -= '0';
-#if (('Z' - 'A') == 25)
-	else if (c >= 'A' && c <= 'Z')
-	    c -= 'A' - 10;
-	else if (c >= 'a' && c <= 'z')
-	    c -= 'a' - 10;
-#elif APR_CHARSET_EBCDIC
-	else if (c >= 'A' && c <= 'I')
-	    c -= 'A' - 10;
-	else if (c >= 'J' && c <= 'R')
-	    c -= 'J' - 19;
-	else if (c >= 'S' && c <= 'Z')
-	    c -= 'S' - 28;
-	else if (c >= 'a' && c <= 'i')
-	    c -= 'a' - 10;
-	else if (c >= 'j' && c <= 'r')
-	    c -= 'j' - 19;
-	else if (c >= 's' && c <= 'z')
-	    c -= 'z' - 28;
-#else
-#error "CANNOT COMPILE apr_strtoi64(), only ASCII and EBCDIC supported" 
-#endif
-	else
-	    break;
-	if (c >= base)
-	    break;
-	val *= base;
-        if ( (any < 0)	/* already noted an over/under flow - short circuit */
-           || (neg && (val > acc || (val -= c) > acc)) /* underflow */
-           || (!neg && (val < acc || (val += c) < acc))) {       /* overflow */
-            any = -1;	/* once noted, over/underflows never go away */
-#ifdef APR_STRTOI64_OVERFLOW_IS_BAD_CHAR
-            break;
-#endif
-        } else {
-            acc = val;
-	    any = 1;
-        }
-    }
-
-    if (any < 0) {
-	acc = neg ? INT64_MIN : INT64_MAX;
-	errno = ERANGE;
-    } else if (!any) {
-	errno = EINVAL;
-    }
-    if (endptr != NULL)
-	*endptr = (char *)(any ? s - 1 : nptr);
-    return (acc);
-#endif
-}
-
-APR_DECLARE(apr_int64_t) apr_atoi64(const char *buf)
-{
-    return apr_strtoi64(buf, NULL, 10);
-}
-
-APR_DECLARE(char *) apr_itoa(apr_pool_t *p, int n)
-{
-    const int BUFFER_SIZE = sizeof(int) * 3 + 2;
-    char *buf = apr_palloc(p, BUFFER_SIZE);
-    char *start = buf + BUFFER_SIZE - 1;
-    int negative;
-    if (n < 0) {
-	negative = 1;
-	n = -n;
-    }
-    else {
-	negative = 0;
-    }
-    *start = 0;
-    do {
-	*--start = '0' + (n % 10);
-	n /= 10;
-    } while (n);
-    if (negative) {
-	*--start = '-';
-    }
-    return start;
-}
-
-APR_DECLARE(char *) apr_ltoa(apr_pool_t *p, long n)
-{
-    const int BUFFER_SIZE = sizeof(long) * 3 + 2;
-    char *buf = apr_palloc(p, BUFFER_SIZE);
-    char *start = buf + BUFFER_SIZE - 1;
-    int negative;
-    if (n < 0) {
-	negative = 1;
-	n = -n;
-    }
-    else {
-	negative = 0;
-    }
-    *start = 0;
-    do {
-	*--start = (char)('0' + (n % 10));
-	n /= 10;
-    } while (n);
-    if (negative) {
-	*--start = '-';
-    }
-    return start;
-}
-
-APR_DECLARE(char *) apr_off_t_toa(apr_pool_t *p, apr_off_t n)
-{
-    const int BUFFER_SIZE = sizeof(apr_off_t) * 3 + 2;
-    char *buf = apr_palloc(p, BUFFER_SIZE);
-    char *start = buf + BUFFER_SIZE - 1;
-    int negative;
-    if (n < 0) {
-	negative = 1;
-	n = -n;
-    }
-    else {
-	negative = 0;
-    }
-    *start = 0;
-    do {
-	*--start = '0' + (char)(n % 10);
-	n /= 10;
-    } while (n);
-    if (negative) {
-	*--start = '-';
-    }
-    return start;
-}
-
-APR_DECLARE(char *) apr_strfsize(apr_off_t size, char *buf)
-{
-    const char ord[] = "KMGTPE";
-    const char *o = ord;
-    int remain;
-
-    if (size < 0) {
-        return strcpy(buf, "  - ");
-    }
-    if (size < 973) {
-        if (apr_snprintf(buf, 5, "%3d ", (int) size) < 0)
-            return strcpy(buf, "****");
-        return buf;
-    }
-    do {
-        remain = (int)(size & 1023);
-        size >>= 10;
-        if (size >= 973) {
-            ++o;
-            continue;
-        }
-        if (size < 9 || (size == 9 && remain < 973)) {
-            if ((remain = ((remain * 5) + 256) / 512) >= 10)
-                ++size, remain = 0;
-            if (apr_snprintf(buf, 5, "%d.%d%c", (int) size, remain, *o) < 0)
-                return strcpy(buf, "****");
-            return buf;
-        }
-        if (remain >= 512)
-            ++size;
-        if (apr_snprintf(buf, 5, "%3d%c", (int) size, *o) < 0)
-            return strcpy(buf, "****");
-        return buf;
-    } while (1);
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strings.lo b/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strings.lo
deleted file mode 100644
index 4314698b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strings.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# apr_strings.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/apr_strings.o'
-
-# Name of the non-PIC object.
-non_pic_object='apr_strings.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strings.o b/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strings.o
deleted file mode 100644
index 720cd411..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strings.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strnatcmp.c b/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strnatcmp.c
deleted file mode 100644
index 0e960e8a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strnatcmp.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* -*- mode: c; c-file-style: "k&r" -*-
-
-  strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
-  Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#include <ctype.h>
-#include <string.h>
-#include "apr_strings.h"
-#include "apr_lib.h"            /* for apr_is*() */
-
-#if defined(__GNUC__)
-#  define UNUSED __attribute__((__unused__))
-#else
-#  define UNUSED
-#endif
-
-/* based on "strnatcmp.c,v 1.6 2000/04/20 07:30:11 mbp Exp $" */
-
-static int
-compare_right(char const *a, char const *b)
-{
-     int bias = 0;
-     
-     /* The longest run of digits wins.  That aside, the greatest
-	value wins, but we can't know that it will until we've scanned
-	both numbers to know that they have the same magnitude, so we
-	remember it in BIAS. */
-     for (;; a++, b++) {
-	  if (!apr_isdigit(*a)  &&  !apr_isdigit(*b))
-	       break;
-	  else if (!apr_isdigit(*a))
-	       return -1;
-	  else if (!apr_isdigit(*b))
-	       return +1;
-	  else if (*a < *b) {
-	       if (!bias)
-		    bias = -1;
-	  } else if (*a > *b) {
-	       if (!bias)
-		    bias = +1;
-	  } else if (!*a  &&  !*b)
-	       break;
-     }
-
-     return bias;
-}
-
-
-static int
-compare_left(char const *a, char const *b)
-{
-     /* Compare two left-aligned numbers: the first to have a
-        different value wins. */
-     for (;; a++, b++) {
-	  if (!apr_isdigit(*a)  &&  !apr_isdigit(*b))
-	       break;
-	  else if (!apr_isdigit(*a))
-	       return -1;
-	  else if (!apr_isdigit(*b))
-	       return +1;
-	  else if (*a < *b)
-	       return -1;
-	  else if (*a > *b)
-	       return +1;
-     }
-	  
-     return 0;
-}
-
-
-static int strnatcmp0(char const *a, char const *b, int fold_case)
-{
-     int ai, bi;
-     char ca, cb;
-     int fractional, result;
-     ai = bi = 0;
-     while (1) {
-	  ca = a[ai]; cb = b[bi];
-
-	  /* skip over leading spaces or zeros */
-	  while (apr_isspace(ca))
-	       ca = a[++ai];
-
-	  while (apr_isspace(cb))
-	       cb = b[++bi];
-
-	  /* process run of digits */
-	  if (apr_isdigit(ca)  &&  apr_isdigit(cb)) {
-	       fractional = (ca == '0' || cb == '0');
-
-	       if (fractional) {
-		    if ((result = compare_left(a+ai, b+bi)) != 0)
-			 return result;
-	       } else {
-		    if ((result = compare_right(a+ai, b+bi)) != 0)
-			 return result;
-	       }
-	  }
-
-	  if (!ca && !cb) {
-	       /* The strings compare the same.  Perhaps the caller
-                  will want to call strcmp to break the tie. */
-	       return 0;
-	  }
-
-	  if (fold_case) {
-	       ca = apr_toupper(ca);
-	       cb = apr_toupper(cb);
-	  }
-	  
-	  if (ca < cb)
-	       return -1;
-	  else if (ca > cb)
-	       return +1;
-
-	  ++ai; ++bi;
-     }
-}
-
-
-
-APR_DECLARE(int) apr_strnatcmp(char const *a, char const *b)
-{
-     return strnatcmp0(a, b, 0);
-}
-
-
-/* Compare, recognizing numeric string and ignoring case. */
-APR_DECLARE(int) apr_strnatcasecmp(char const *a, char const *b)
-{
-     return strnatcmp0(a, b, 1);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strnatcmp.lo b/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strnatcmp.lo
deleted file mode 100644
index 1ac1ef2b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strnatcmp.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# apr_strnatcmp.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/apr_strnatcmp.o'
-
-# Name of the non-PIC object.
-non_pic_object='apr_strnatcmp.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strnatcmp.o b/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strnatcmp.o
deleted file mode 100644
index bad4e5c7..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strnatcmp.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strtok.c b/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strtok.c
deleted file mode 100644
index 517b319d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strtok.c
+++ /dev/null
@@ -1,56 +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.
- */
-
-#ifdef HAVE_STDDEF_H
-#include <stddef.h>        /* for NULL */
-#endif
-
-#include "apr.h"
-#include "apr_strings.h"
-
-#define APR_WANT_STRFUNC   /* for strchr() */
-#include "apr_want.h"
-
-APR_DECLARE(char *) apr_strtok(char *str, const char *sep, char **last)
-{
-    char *token;
-
-    if (!str)           /* subsequent call */
-        str = *last;    /* start where we left off */
-
-    /* skip characters in sep (will terminate at '\0') */
-    while (*str && strchr(sep, *str))
-        ++str;
-
-    if (!*str)          /* no more tokens */
-        return NULL;
-
-    token = str;
-
-    /* skip valid token characters to terminate token and
-     * prepare for the next call (will terminate at '\0) 
-     */
-    *last = token + 1;
-    while (**last && !strchr(sep, **last))
-        ++*last;
-
-    if (**last) {
-        **last = '\0';
-        ++*last;
-    }
-
-    return token;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strtok.lo b/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strtok.lo
deleted file mode 100644
index d601db21..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strtok.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# apr_strtok.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/apr_strtok.o'
-
-# Name of the non-PIC object.
-non_pic_object='apr_strtok.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strtok.o b/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strtok.o
deleted file mode 100644
index 2a483101..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/strings/apr_strtok.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/.libs/waitio.o b/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/.libs/waitio.o
deleted file mode 100644
index 6ead1cd2..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/.libs/waitio.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/Makefile
deleted file mode 100644
index 45df847a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-srcdir = .
-
-
-TARGETS = \
-	waitio.lo 
-
-# bring in rules.mk for standard functionality
-include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/unix
-DEFOSDIR=$(INCDIR)/arch/unix
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/Makefile.in
deleted file mode 100644
index 190cacfc..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = \
-	waitio.lo 
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/@OSDIR@
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/waitio.c b/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/waitio.c
deleted file mode 100644
index 774e923e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/waitio.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_file_io.h"
-#include "apr_arch_networkio.h"
-#include "apr_poll.h"
-#include "apr_errno.h"
-#include "apr_support.h"
-
-/* The only case where we don't use wait_for_io_or_timeout is on
- * pre-BONE BeOS, so this check should be sufficient and simpler */
-#if !BEOS_R5
-#define USE_WAIT_FOR_IO
-#endif
-
-#ifdef USE_WAIT_FOR_IO
-apr_status_t apr_wait_for_io_or_timeout(apr_file_t *f, apr_socket_t *s,
-                                           int for_read)
-{
-    apr_interval_time_t timeout;
-    apr_pollfd_t pollset;
-    int srv, n;
-    int type = for_read ? APR_POLLIN : APR_POLLOUT;
-
-    /* TODO - timeout should be less each time through this loop */
-    if (f) {
-        pollset.desc_type = APR_POLL_FILE;
-        pollset.desc.f = f;
-        pollset.p = f->pool;
-        timeout = f->timeout;
-    }
-    else {
-        pollset.desc_type = APR_POLL_SOCKET;
-        pollset.desc.s = s;
-        pollset.p = s->cntxt;
-        timeout = s->timeout;
-    }
-    pollset.reqevents = type;
-
-    do {
-        srv = apr_poll(&pollset, 1, &n, timeout);
-
-        if (n == 1 && pollset.rtnevents & type) {
-            return APR_SUCCESS;
-        }
-    } while (APR_STATUS_IS_EINTR(srv));
-
-    return srv;
-}
-#endif
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/waitio.lo b/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/waitio.lo
deleted file mode 100644
index 2d94669b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/waitio.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# waitio.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/waitio.o'
-
-# Name of the non-PIC object.
-non_pic_object='waitio.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/waitio.o b/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/waitio.o
deleted file mode 100644
index 8e28ef25..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/support/unix/waitio.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/tables/.libs/apr_hash.o b/rubbos/app/httpd-2.0.64/srclib/apr/tables/.libs/apr_hash.o
deleted file mode 100644
index c7bf7e51..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/tables/.libs/apr_hash.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/tables/.libs/apr_tables.o b/rubbos/app/httpd-2.0.64/srclib/apr/tables/.libs/apr_tables.o
deleted file mode 100644
index e6d0baf4..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/tables/.libs/apr_tables.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/tables/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/tables/Makefile
deleted file mode 100644
index 18c9d1a0..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/tables/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-srcdir = .
-
-
-TARGETS = apr_tables.lo apr_hash.lo
-
-# bring in rules.mk for standard functionality
-include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
-
-DEFOSDIR=$(INCDIR)/arch/unix
-INCDIR=../include
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/tables/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/tables/Makefile.in
deleted file mode 100644
index 9a97a30f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/tables/Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = apr_tables.lo apr_hash.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCDIR=../include
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/tables/apr_hash.c b/rubbos/app/httpd-2.0.64/srclib/apr/tables/apr_hash.c
deleted file mode 100644
index abc5008c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/tables/apr_hash.c
+++ /dev/null
@@ -1,443 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_private.h"
-
-#include "apr_general.h"
-#include "apr_pools.h"
-
-#include "apr_hash.h"
-
-#if APR_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#if APR_HAVE_STRING_H
-#include <string.h>
-#endif
-
-
-/*
- * The internal form of a hash table.
- *
- * The table is an array indexed by the hash of the key; collisions
- * are resolved by hanging a linked list of hash entries off each
- * element of the array. Although this is a really simple design it
- * isn't too bad given that pools have a low allocation overhead.
- */
-
-typedef struct apr_hash_entry_t apr_hash_entry_t;
-
-struct apr_hash_entry_t {
-    apr_hash_entry_t *next;
-    unsigned int      hash;
-    const void       *key;
-    apr_ssize_t       klen;
-    const void       *val;
-};
-
-/*
- * Data structure for iterating through a hash table.
- *
- * We keep a pointer to the next hash entry here to allow the current
- * hash entry to be freed or otherwise mangled between calls to
- * apr_hash_next().
- */
-struct apr_hash_index_t {
-    apr_hash_t         *ht;
-    apr_hash_entry_t   *this, *next;
-    unsigned int        index;
-};
-
-/*
- * The size of the array is always a power of two. We use the maximum
- * index rather than the size so that we can use bitwise-AND for
- * modular arithmetic.
- * The count of hash entries may be greater depending on the chosen
- * collision rate.
- */
-struct apr_hash_t {
-    apr_pool_t          *pool;
-    apr_hash_entry_t   **array;
-    apr_hash_index_t     iterator;  /* For apr_hash_first(NULL, ...) */
-    unsigned int         count, max;
-    apr_hash_entry_t    *free;  /* List of recycled entries */
-};
-
-#define INITIAL_MAX 15 /* tunable == 2^n - 1 */
-
-
-/*
- * Hash creation functions.
- */
-
-static apr_hash_entry_t **alloc_array(apr_hash_t *ht, unsigned int max)
-{
-   return apr_pcalloc(ht->pool, sizeof(*ht->array) * (max + 1));
-}
-
-APR_DECLARE(apr_hash_t *) apr_hash_make(apr_pool_t *pool)
-{
-    apr_hash_t *ht;
-    ht = apr_palloc(pool, sizeof(apr_hash_t));
-    ht->pool = pool;
-    ht->free = NULL;
-    ht->count = 0;
-    ht->max = INITIAL_MAX;
-    ht->array = alloc_array(ht, ht->max);
-    return ht;
-}
-
-
-/*
- * Hash iteration functions.
- */
-
-APR_DECLARE(apr_hash_index_t *) apr_hash_next(apr_hash_index_t *hi)
-{
-    hi->this = hi->next;
-    while (!hi->this) {
-        if (hi->index > hi->ht->max)
-            return NULL;
-
-        hi->this = hi->ht->array[hi->index++];
-    }
-    hi->next = hi->this->next;
-    return hi;
-}
-
-APR_DECLARE(apr_hash_index_t *) apr_hash_first(apr_pool_t *p, apr_hash_t *ht)
-{
-    apr_hash_index_t *hi;
-    if (p)
-        hi = apr_palloc(p, sizeof(*hi));
-    else
-        hi = &ht->iterator;
-
-    hi->ht = ht;
-    hi->index = 0;
-    hi->this = NULL;
-    hi->next = NULL;
-    return apr_hash_next(hi);
-}
-
-APR_DECLARE(void) apr_hash_this(apr_hash_index_t *hi,
-                                const void **key,
-                                apr_ssize_t *klen,
-                                void **val)
-{
-    if (key)  *key  = hi->this->key;
-    if (klen) *klen = hi->this->klen;
-    if (val)  *val  = (void *)hi->this->val;
-}
-
-
-/*
- * Expanding a hash table
- */
-
-static void expand_array(apr_hash_t *ht)
-{
-    apr_hash_index_t *hi;
-    apr_hash_entry_t **new_array;
-    unsigned int new_max;
-
-    new_max = ht->max * 2 + 1;
-    new_array = alloc_array(ht, new_max);
-    for (hi = apr_hash_first(NULL, ht); hi; hi = apr_hash_next(hi)) {
-        unsigned int i = hi->this->hash & new_max;
-        hi->this->next = new_array[i];
-        new_array[i] = hi->this;
-    }
-    ht->array = new_array;
-    ht->max = new_max;
-}
-
-/*
- * This is where we keep the details of the hash function and control
- * the maximum collision rate.
- *
- * If val is non-NULL it creates and initializes a new hash entry if
- * there isn't already one there; it returns an updatable pointer so
- * that hash entries can be removed.
- */
-
-static apr_hash_entry_t **find_entry(apr_hash_t *ht,
-                                     const void *key,
-                                     apr_ssize_t klen,
-                                     const void *val)
-{
-    apr_hash_entry_t **hep, *he;
-    const unsigned char *p;
-    unsigned int hash;
-    apr_ssize_t i;
-
-    /*
-     * This is the popular `times 33' hash algorithm which is used by
-     * perl and also appears in Berkeley DB. This is one of the best
-     * known hash functions for strings because it is both computed
-     * very fast and distributes very well.
-     *
-     * The originator may be Dan Bernstein but the code in Berkeley DB
-     * cites Chris Torek as the source. The best citation I have found
-     * is "Chris Torek, Hash function for text in C, Usenet message
-     * <27038@mimsy.umd.edu> in comp.lang.c , October, 1990." in Rich
-     * Salz's USENIX 1992 paper about INN which can be found at
-     * <http://citeseer.nj.nec.com/salz92internetnews.html>.
-     *
-     * The magic of number 33, i.e. why it works better than many other
-     * constants, prime or not, has never been adequately explained by
-     * anyone. So I try an explanation: if one experimentally tests all
-     * multipliers between 1 and 256 (as I did while writing a low-level
-     * data structure library some time ago) one detects that even
-     * numbers are not useable at all. The remaining 128 odd numbers
-     * (except for the number 1) work more or less all equally well.
-     * They all distribute in an acceptable way and this way fill a hash
-     * table with an average percent of approx. 86%.
-     *
-     * If one compares the chi^2 values of the variants (see
-     * Bob Jenkins ``Hashing Frequently Asked Questions'' at
-     * http://burtleburtle.net/bob/hash/hashfaq.html for a description
-     * of chi^2), the number 33 not even has the best value. But the
-     * number 33 and a few other equally good numbers like 17, 31, 63,
-     * 127 and 129 have nevertheless a great advantage to the remaining
-     * numbers in the large set of possible multipliers: their multiply
-     * operation can be replaced by a faster operation based on just one
-     * shift plus either a single addition or subtraction operation. And
-     * because a hash function has to both distribute good _and_ has to
-     * be very fast to compute, those few numbers should be preferred.
-     *
-     *                  -- Ralf S. Engelschall <rse@engelschall.com>
-     */
-    hash = 0;
-    if (klen == APR_HASH_KEY_STRING) {
-        for (p = key; *p; p++) {
-            hash = hash * 33 + *p;
-        }
-        klen = p - (const unsigned char *)key;
-    }
-    else {
-        for (p = key, i = klen; i; i--, p++) {
-            hash = hash * 33 + *p;
-        }
-    }
-
-    /* scan linked list */
-    for (hep = &ht->array[hash & ht->max], he = *hep;
-         he; hep = &he->next, he = *hep) {
-        if (he->hash == hash
-            && he->klen == klen
-            && memcmp(he->key, key, klen) == 0)
-            break;
-    }
-    if (he || !val)
-        return hep;
-
-    /* add a new entry for non-NULL values */
-    if ((he = ht->free) != NULL)
-        ht->free = he->next;
-    else
-        he = apr_palloc(ht->pool, sizeof(*he));
-    he->next = NULL;
-    he->hash = hash;
-    he->key  = key;
-    he->klen = klen;
-    he->val  = val;
-    *hep = he;
-    ht->count++;
-    return hep;
-}
-
-APR_DECLARE(apr_hash_t *) apr_hash_copy(apr_pool_t *pool,
-                                        const apr_hash_t *orig)
-{
-    apr_hash_t *ht;
-    apr_hash_entry_t *new_vals;
-    unsigned int i, j;
-
-    ht = apr_palloc(pool, sizeof(apr_hash_t) +
-                    sizeof(*ht->array) * (orig->max + 1) +
-                    sizeof(apr_hash_entry_t) * orig->count);
-    ht->pool = pool;
-    ht->free = NULL;
-    ht->count = orig->count;
-    ht->max = orig->max;
-    ht->array = (apr_hash_entry_t **)((char *)ht + sizeof(apr_hash_t));
-
-    new_vals = (apr_hash_entry_t *)((char *)(ht) + sizeof(apr_hash_t) +
-                                    sizeof(*ht->array) * (orig->max + 1));
-    j = 0;
-    for (i = 0; i <= ht->max; i++) {
-        apr_hash_entry_t **new_entry = &(ht->array[i]);
-        apr_hash_entry_t *orig_entry = orig->array[i];
-        while (orig_entry) {
-            *new_entry = &new_vals[j++];
-            (*new_entry)->hash = orig_entry->hash;
-            (*new_entry)->key = orig_entry->key;
-            (*new_entry)->klen = orig_entry->klen;
-            (*new_entry)->val = orig_entry->val;
-            new_entry = &((*new_entry)->next);
-            orig_entry = orig_entry->next;
-        }
-        *new_entry = NULL;
-    }
-    return ht;
-}
-
-APR_DECLARE(void *) apr_hash_get(apr_hash_t *ht,
-                                 const void *key,
-                                 apr_ssize_t klen)
-{
-    apr_hash_entry_t *he;
-    he = *find_entry(ht, key, klen, NULL);
-    if (he)
-        return (void *)he->val;
-    else
-        return NULL;
-}
-
-APR_DECLARE(void) apr_hash_set(apr_hash_t *ht,
-                               const void *key,
-                               apr_ssize_t klen,
-                               const void *val)
-{
-    apr_hash_entry_t **hep;
-    hep = find_entry(ht, key, klen, val);
-    if (*hep) {
-        if (!val) {
-            /* delete entry */
-            apr_hash_entry_t *old = *hep;
-            *hep = (*hep)->next;
-            old->next = ht->free;
-            ht->free = old;
-            --ht->count;
-        }
-        else {
-            /* replace entry */
-            (*hep)->val = val;
-            /* check that the collision rate isn't too high */
-            if (ht->count > ht->max) {
-                expand_array(ht);
-            }
-        }
-    }
-    /* else key not present and val==NULL */
-}
-
-APR_DECLARE(unsigned int) apr_hash_count(apr_hash_t *ht)
-{
-    return ht->count;
-}
-
-APR_DECLARE(apr_hash_t*) apr_hash_overlay(apr_pool_t *p,
-                                          const apr_hash_t *overlay,
-                                          const apr_hash_t *base)
-{
-    return apr_hash_merge(p, overlay, base, NULL, NULL);
-}
-
-APR_DECLARE(apr_hash_t *) apr_hash_merge(apr_pool_t *p,
-                                         const apr_hash_t *overlay,
-                                         const apr_hash_t *base,
-                                         void * (*merger)(apr_pool_t *p,
-                                                     const void *key,
-                                                     apr_ssize_t klen,
-                                                     const void *h1_val,
-                                                     const void *h2_val,
-                                                     const void *data),
-                                         const void *data)
-{
-    apr_hash_t *res;
-    apr_hash_entry_t *new_vals = NULL;
-    apr_hash_entry_t *iter;
-    apr_hash_entry_t *ent;
-    unsigned int i,j,k;
-
-#ifdef POOL_DEBUG
-    /* we don't copy keys and values, so it's necessary that
-     * overlay->a.pool and base->a.pool have a life span at least
-     * as long as p
-     */
-    if (!apr_pool_is_ancestor(overlay->pool, p)) {
-        fprintf(stderr,
-                "apr_hash_overlay: overlay's pool is not an ancestor of p\n");
-        abort();
-    }
-    if (!apr_pool_is_ancestor(base->pool, p)) {
-        fprintf(stderr,
-                "apr_hash_overlay: base's pool is not an ancestor of p\n");
-        abort();
-    }
-#endif
-
-    res = apr_palloc(p, sizeof(apr_hash_t));
-    res->pool = p;
-    res->free = NULL;
-    res->count = base->count;
-    res->max = (overlay->max > base->max) ? overlay->max : base->max;
-    if (base->count + overlay->count > res->max) {
-        res->max = res->max * 2 + 1;
-    }
-    res->array = alloc_array(res, res->max);
-    if (base->count + overlay->count) {
-        new_vals = apr_palloc(p, sizeof(apr_hash_entry_t) *
-                              (base->count + overlay->count));
-    }
-    j = 0;
-    for (k = 0; k <= base->max; k++) {
-        for (iter = base->array[k]; iter; iter = iter->next) {
-            i = iter->hash & res->max;
-            new_vals[j].klen = iter->klen;
-            new_vals[j].key = iter->key;
-            new_vals[j].val = iter->val;
-            new_vals[j].hash = iter->hash;
-            new_vals[j].next = res->array[i];
-            res->array[i] = &new_vals[j];
-            j++;
-        }
-    }
-
-    for (k = 0; k <= overlay->max; k++) {
-        for (iter = overlay->array[k]; iter; iter = iter->next) {
-            i = iter->hash & res->max;
-            for (ent = res->array[i]; ent; ent = ent->next) {
-                if ((ent->klen == iter->klen) &&
-                    (memcmp(ent->key, iter->key, iter->klen) == 0)) {
-                    if (merger) {
-                        ent->val = (*merger)(p, iter->key, iter->klen,
-                                             iter->val, ent->val, data);
-                    }
-                    else {
-                        ent->val = iter->val;
-                    }
-                    break;
-                }
-            }
-            if (!ent) {
-                new_vals[j].klen = iter->klen;
-                new_vals[j].key = iter->key;
-                new_vals[j].val = iter->val;
-                new_vals[j].hash = iter->hash;
-                new_vals[j].next = res->array[i];
-                res->array[i] = &new_vals[j];
-                res->count++;
-                j++;
-            }
-        }
-    }
-    return res;
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(hash)
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/tables/apr_hash.lo b/rubbos/app/httpd-2.0.64/srclib/apr/tables/apr_hash.lo
deleted file mode 100644
index 94e4a9c1..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/tables/apr_hash.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# apr_hash.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/apr_hash.o'
-
-# Name of the non-PIC object.
-non_pic_object='apr_hash.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/tables/apr_hash.o b/rubbos/app/httpd-2.0.64/srclib/apr/tables/apr_hash.o
deleted file mode 100644
index 04bd1950..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/tables/apr_hash.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/tables/apr_tables.c b/rubbos/app/httpd-2.0.64/srclib/apr/tables/apr_tables.c
deleted file mode 100644
index 3f1f2edd..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/tables/apr_tables.c
+++ /dev/null
@@ -1,1207 +0,0 @@
-#include <stdio.h>
-/* 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.
- */
-
-/*
- * Resource allocation code... the code here is responsible for making
- * sure that nothing leaks.
- *
- * rst --- 4/95 --- 6/95
- */
-
-#include "apr_private.h"
-
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_tables.h"
-#include "apr_strings.h"
-#include "apr_lib.h"
-#if APR_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#if APR_HAVE_STRING_H
-#include <string.h>
-#endif
-#if APR_HAVE_STRINGS_H
-#include <strings.h>
-#endif
-
-/*****************************************************************
- * This file contains array and apr_table_t functions only.
- */
-
-/*****************************************************************
- *
- * The 'array' functions...
- */
-
-static void make_array_core(apr_array_header_t *res, apr_pool_t *p,
-			    int nelts, int elt_size, int clear)
-{
-    /*
-     * Assure sanity if someone asks for
-     * array of zero elts.
-     */
-    if (nelts < 1) {
-        nelts = 1;
-    }
-
-    if (clear) {
-        res->elts = apr_pcalloc(p, nelts * elt_size);
-    }
-    else {
-        res->elts = apr_palloc(p, nelts * elt_size);
-    }
-
-    res->pool = p;
-    res->elt_size = elt_size;
-    res->nelts = 0;		/* No active elements yet... */
-    res->nalloc = nelts;	/* ...but this many allocated */
-}
-
-APR_DECLARE(int) apr_is_empty_array(const apr_array_header_t *a)
-{
-    return ((a == NULL) || (a->nelts == 0));
-}
-
-APR_DECLARE(apr_array_header_t *) apr_array_make(apr_pool_t *p,
-						int nelts, int elt_size)
-{
-    apr_array_header_t *res;
-
-    res = (apr_array_header_t *) apr_palloc(p, sizeof(apr_array_header_t));
-    make_array_core(res, p, nelts, elt_size, 1);
-    return res;
-}
-
-APR_DECLARE(void *) apr_array_pop(apr_array_header_t *arr)
-{
-    if (apr_is_empty_array(arr)) {
-        return NULL;
-    }
-   
-    return arr->elts + (arr->elt_size * (--arr->nelts));
-}
-
-APR_DECLARE(void *) apr_array_push(apr_array_header_t *arr)
-{
-    if (arr->nelts == arr->nalloc) {
-        int new_size = (arr->nalloc <= 0) ? 1 : arr->nalloc * 2;
-        char *new_data;
-
-        new_data = apr_palloc(arr->pool, arr->elt_size * new_size);
-
-        memcpy(new_data, arr->elts, arr->nalloc * arr->elt_size);
-        memset(new_data + arr->nalloc * arr->elt_size, 0,
-               arr->elt_size * (new_size - arr->nalloc));
-        arr->elts = new_data;
-        arr->nalloc = new_size;
-    }
-
-    ++arr->nelts;
-    return arr->elts + (arr->elt_size * (arr->nelts - 1));
-}
-
-static void *apr_array_push_noclear(apr_array_header_t *arr)
-{
-    if (arr->nelts == arr->nalloc) {
-        int new_size = (arr->nalloc <= 0) ? 1 : arr->nalloc * 2;
-        char *new_data;
-
-        new_data = apr_palloc(arr->pool, arr->elt_size * new_size);
-
-        memcpy(new_data, arr->elts, arr->nalloc * arr->elt_size);
-        arr->elts = new_data;
-        arr->nalloc = new_size;
-    }
-
-    ++arr->nelts;
-    return arr->elts + (arr->elt_size * (arr->nelts - 1));
-}
-
-APR_DECLARE(void) apr_array_cat(apr_array_header_t *dst,
-			       const apr_array_header_t *src)
-{
-    int elt_size = dst->elt_size;
-
-    if (dst->nelts + src->nelts > dst->nalloc) {
-	int new_size = (dst->nalloc <= 0) ? 1 : dst->nalloc * 2;
-	char *new_data;
-
-	while (dst->nelts + src->nelts > new_size) {
-	    new_size *= 2;
-	}
-
-	new_data = apr_pcalloc(dst->pool, elt_size * new_size);
-	memcpy(new_data, dst->elts, dst->nalloc * elt_size);
-
-	dst->elts = new_data;
-	dst->nalloc = new_size;
-    }
-
-    memcpy(dst->elts + dst->nelts * elt_size, src->elts,
-	   elt_size * src->nelts);
-    dst->nelts += src->nelts;
-}
-
-APR_DECLARE(apr_array_header_t *) apr_array_copy(apr_pool_t *p,
-						const apr_array_header_t *arr)
-{
-    apr_array_header_t *res =
-        (apr_array_header_t *) apr_palloc(p, sizeof(apr_array_header_t));
-    make_array_core(res, p, arr->nalloc, arr->elt_size, 0);
-
-    memcpy(res->elts, arr->elts, arr->elt_size * arr->nelts);
-    res->nelts = arr->nelts;
-    memset(res->elts + res->elt_size * res->nelts, 0,
-           res->elt_size * (res->nalloc - res->nelts));
-    return res;
-}
-
-/* This cute function copies the array header *only*, but arranges
- * for the data section to be copied on the first push or arraycat.
- * It's useful when the elements of the array being copied are
- * read only, but new stuff *might* get added on the end; we have the
- * overhead of the full copy only where it is really needed.
- */
-
-static APR_INLINE void copy_array_hdr_core(apr_array_header_t *res,
-					   const apr_array_header_t *arr)
-{
-    res->elts = arr->elts;
-    res->elt_size = arr->elt_size;
-    res->nelts = arr->nelts;
-    res->nalloc = arr->nelts;	/* Force overflow on push */
-}
-
-APR_DECLARE(apr_array_header_t *)
-    apr_array_copy_hdr(apr_pool_t *p,
-		       const apr_array_header_t *arr)
-{
-    apr_array_header_t *res;
-
-    res = (apr_array_header_t *) apr_palloc(p, sizeof(apr_array_header_t));
-    res->pool = p;
-    copy_array_hdr_core(res, arr);
-    return res;
-}
-
-/* The above is used here to avoid consing multiple new array bodies... */
-
-APR_DECLARE(apr_array_header_t *)
-    apr_array_append(apr_pool_t *p,
-		      const apr_array_header_t *first,
-		      const apr_array_header_t *second)
-{
-    apr_array_header_t *res = apr_array_copy_hdr(p, first);
-
-    apr_array_cat(res, second);
-    return res;
-}
-
-/* apr_array_pstrcat generates a new string from the apr_pool_t containing
- * the concatenated sequence of substrings referenced as elements within
- * the array.  The string will be empty if all substrings are empty or null,
- * or if there are no elements in the array.
- * If sep is non-NUL, it will be inserted between elements as a separator.
- */
-APR_DECLARE(char *) apr_array_pstrcat(apr_pool_t *p,
-				     const apr_array_header_t *arr,
-				     const char sep)
-{
-    char *cp, *res, **strpp;
-    apr_size_t len;
-    int i;
-
-    if (arr->nelts <= 0 || arr->elts == NULL) {    /* Empty table? */
-        return (char *) apr_pcalloc(p, 1);
-    }
-
-    /* Pass one --- find length of required string */
-
-    len = 0;
-    for (i = 0, strpp = (char **) arr->elts; ; ++strpp) {
-        if (strpp && *strpp != NULL) {
-            len += strlen(*strpp);
-        }
-        if (++i >= arr->nelts) {
-            break;
-	}
-        if (sep) {
-            ++len;
-	}
-    }
-
-    /* Allocate the required string */
-
-    res = (char *) apr_palloc(p, len + 1);
-    cp = res;
-
-    /* Pass two --- copy the argument strings into the result space */
-
-    for (i = 0, strpp = (char **) arr->elts; ; ++strpp) {
-        if (strpp && *strpp != NULL) {
-            len = strlen(*strpp);
-            memcpy(cp, *strpp, len);
-            cp += len;
-        }
-        if (++i >= arr->nelts) {
-            break;
-	}
-        if (sep) {
-            *cp++ = sep;
-	}
-    }
-
-    *cp = '\0';
-
-    /* Return the result string */
-
-    return res;
-}
-
-
-/*****************************************************************
- *
- * The "table" functions.
- */
-
-#if APR_CHARSET_EBCDIC
-#define CASE_MASK 0xbfbfbfbf
-#else
-#define CASE_MASK 0xdfdfdfdf
-#endif
-
-#define TABLE_HASH_SIZE 32
-#define TABLE_INDEX_MASK 0x1f
-#define TABLE_HASH(key)  (TABLE_INDEX_MASK & *(unsigned char *)(key))
-#define TABLE_INDEX_IS_INITIALIZED(t, i) ((t)->index_initialized & (1 << (i)))
-#define TABLE_SET_INDEX_INITIALIZED(t, i) ((t)->index_initialized |= (1 << (i)))
-
-/* Compute the "checksum" for a key, consisting of the first
- * 4 bytes, normalized for case-insensitivity and packed into
- * an int...this checksum allows us to do a single integer
- * comparison as a fast check to determine whether we can
- * skip a strcasecmp
- */
-#define COMPUTE_KEY_CHECKSUM(key, checksum)    \
-{                                              \
-    const char *k = (key);                     \
-    apr_uint32_t c = (apr_uint32_t)*k;         \
-    (checksum) = c;                            \
-    (checksum) <<= 8;                          \
-    if (c) {                                   \
-        c = (apr_uint32_t)*++k;                \
-        checksum |= c;                         \
-    }                                          \
-    (checksum) <<= 8;                          \
-    if (c) {                                   \
-        c = (apr_uint32_t)*++k;                \
-        checksum |= c;                         \
-    }                                          \
-    (checksum) <<= 8;                          \
-    if (c) {                                   \
-        c = (apr_uint32_t)*++k;                \
-        checksum |= c;                         \
-    }                                          \
-    checksum &= CASE_MASK;                     \
-}
-
-/** The opaque string-content table type */
-struct apr_table_t {
-    /* This has to be first to promote backwards compatibility with
-     * older modules which cast a apr_table_t * to an apr_array_header_t *...
-     * they should use the apr_table_elts() function for most of the
-     * cases they do this for.
-     */
-    /** The underlying array for the table */
-    apr_array_header_t a;
-#ifdef MAKE_TABLE_PROFILE
-    /** Who created the array. */
-    void *creator;
-#endif
-    /* An index to speed up table lookups.  The way this works is:
-     *   - Take the requested key and compute its checksum
-     *   - Hash the checksum into the index:
-     *     - index_first[TABLE_HASH(checksum)] is the offset within
-     *       the table of the first entry with that key checksum
-     *     - index_last[TABLE_HASH(checksum)] is the offset within
-     *       the table of the first entry with that key checksum
-     *   - If (and only if) there is no entry in the table whose
-     *     checksum hashes to index element i, then the i'th bit
-     *     of index_initialized will be zero.  (Check this before
-     *     trying to use index_first[i] or index_last[i]!)
-     */
-    apr_uint32_t index_initialized;
-    int index_first[TABLE_HASH_SIZE];
-    int index_last[TABLE_HASH_SIZE];
-};
-
-/*
- * NOTICE: if you tweak this you should look at is_empty_table() 
- * and table_elts() in alloc.h
- */
-#ifdef MAKE_TABLE_PROFILE
-static apr_table_entry_t *table_push(apr_table_t *t)
-{
-    if (t->a.nelts == t->a.nalloc) {
-        return NULL;
-    }
-    return (apr_table_entry_t *) apr_array_push_noclear(&t->a);
-}
-#else /* MAKE_TABLE_PROFILE */
-#define table_push(t)	((apr_table_entry_t *) apr_array_push_noclear(&(t)->a))
-#endif /* MAKE_TABLE_PROFILE */
-
-APR_DECLARE(const apr_array_header_t *) apr_table_elts(const apr_table_t *t)
-{
-    return (const apr_array_header_t *)t;
-}
-
-APR_DECLARE(int) apr_is_empty_table(const apr_table_t *t)
-{
-    return ((t == NULL) || (t->a.nelts == 0));
-}
-
-APR_DECLARE(apr_table_t *) apr_table_make(apr_pool_t *p, int nelts)
-{
-    apr_table_t *t = apr_palloc(p, sizeof(apr_table_t));
-
-    make_array_core(&t->a, p, nelts, sizeof(apr_table_entry_t), 0);
-#ifdef MAKE_TABLE_PROFILE
-    t->creator = __builtin_return_address(0);
-#endif
-    t->index_initialized = 0;
-    return t;
-}
-
-APR_DECLARE(apr_table_t *) apr_table_copy(apr_pool_t *p, const apr_table_t *t)
-{
-    apr_table_t *new = apr_palloc(p, sizeof(apr_table_t));
-
-#ifdef POOL_DEBUG
-    /* we don't copy keys and values, so it's necessary that t->a.pool
-     * have a life span at least as long as p
-     */
-    if (!apr_pool_is_ancestor(t->a.pool, p)) {
-	fprintf(stderr, "copy_table: t's pool is not an ancestor of p\n");
-	abort();
-    }
-#endif
-    make_array_core(&new->a, p, t->a.nalloc, sizeof(apr_table_entry_t), 0);
-    memcpy(new->a.elts, t->a.elts, t->a.nelts * sizeof(apr_table_entry_t));
-    new->a.nelts = t->a.nelts;
-    memcpy(new->index_first, t->index_first, sizeof(int) * TABLE_HASH_SIZE);
-    memcpy(new->index_last, t->index_last, sizeof(int) * TABLE_HASH_SIZE);
-    new->index_initialized = t->index_initialized;
-    return new;
-}
-
-static void table_reindex(apr_table_t *t)
-{
-    int i;
-    int hash;
-    apr_table_entry_t *next_elt = (apr_table_entry_t *) t->a.elts;
-
-    t->index_initialized = 0;
-    for (i = 0; i < t->a.nelts; i++, next_elt++) {
-        hash = TABLE_HASH(next_elt->key);
-        t->index_last[hash] = i;
-        if (!TABLE_INDEX_IS_INITIALIZED(t, hash)) {
-            t->index_first[hash] = i;
-            TABLE_SET_INDEX_INITIALIZED(t, hash);
-        }
-    }
-}
-
-APR_DECLARE(void) apr_table_clear(apr_table_t *t)
-{
-    t->a.nelts = 0;
-    t->index_initialized = 0;
-}
-
-APR_DECLARE(const char *) apr_table_get(const apr_table_t *t, const char *key)
-{
-    apr_table_entry_t *next_elt;
-    apr_table_entry_t *end_elt;
-    apr_uint32_t checksum;
-    int hash;
-
-    if (key == NULL) {
-	return NULL;
-    }
-
-    hash = TABLE_HASH(key);
-    if (!TABLE_INDEX_IS_INITIALIZED(t, hash)) {
-        return NULL;
-    }
-    COMPUTE_KEY_CHECKSUM(key, checksum);
-    next_elt = ((apr_table_entry_t *) t->a.elts) + t->index_first[hash];;
-    end_elt = ((apr_table_entry_t *) t->a.elts) + t->index_last[hash];
-
-    for (; next_elt <= end_elt; next_elt++) {
-	if ((checksum == next_elt->key_checksum) &&
-            !strcasecmp(next_elt->key, key)) {
-	    return next_elt->val;
-	}
-    }
-
-    return NULL;
-}
-
-APR_DECLARE(void) apr_table_set(apr_table_t *t, const char *key,
-                                const char *val)
-{
-    apr_table_entry_t *next_elt;
-    apr_table_entry_t *end_elt;
-    apr_table_entry_t *table_end;
-    apr_uint32_t checksum;
-    int hash;
-
-    COMPUTE_KEY_CHECKSUM(key, checksum);
-    hash = TABLE_HASH(key);
-    if (!TABLE_INDEX_IS_INITIALIZED(t, hash)) {
-        t->index_first[hash] = t->a.nelts;
-        TABLE_SET_INDEX_INITIALIZED(t, hash);
-        goto add_new_elt;
-    }
-    next_elt = ((apr_table_entry_t *) t->a.elts) + t->index_first[hash];;
-    end_elt = ((apr_table_entry_t *) t->a.elts) + t->index_last[hash];
-    table_end =((apr_table_entry_t *) t->a.elts) + t->a.nelts;
-
-    for (; next_elt <= end_elt; next_elt++) {
-	if ((checksum == next_elt->key_checksum) &&
-            !strcasecmp(next_elt->key, key)) {
-
-            /* Found an existing entry with the same key, so overwrite it */
-
-            int must_reindex = 0;
-            apr_table_entry_t *dst_elt = NULL;
-
-            next_elt->val = apr_pstrdup(t->a.pool, val);
-
-            /* Remove any other instances of this key */
-            for (next_elt++; next_elt <= end_elt; next_elt++) {
-                if ((checksum == next_elt->key_checksum) &&
-                    !strcasecmp(next_elt->key, key)) {
-                    t->a.nelts--;
-                    if (!dst_elt) {
-                        dst_elt = next_elt;
-                    }
-                }
-                else if (dst_elt) {
-                    *dst_elt++ = *next_elt;
-                    must_reindex = 1;
-                }
-            }
-
-            /* If we've removed anything, shift over the remainder
-             * of the table (note that the previous loop didn't
-             * run to the end of the table, just to the last match
-             * for the index)
-             */
-            if (dst_elt) {
-                for (; next_elt < table_end; next_elt++) {
-                    *dst_elt++ = *next_elt;
-                }
-                must_reindex = 1;
-            }
-            if (must_reindex) {
-                table_reindex(t);
-            }
-            return;
-        }
-    }
-
-add_new_elt:
-    t->index_last[hash] = t->a.nelts;
-    next_elt = (apr_table_entry_t *) table_push(t);
-    next_elt->key = apr_pstrdup(t->a.pool, key);
-    next_elt->val = apr_pstrdup(t->a.pool, val);
-    next_elt->key_checksum = checksum;
-}
-
-APR_DECLARE(void) apr_table_setn(apr_table_t *t, const char *key,
-                                 const char *val)
-{
-    apr_table_entry_t *next_elt;
-    apr_table_entry_t *end_elt;
-    apr_table_entry_t *table_end;
-    apr_uint32_t checksum;
-    int hash;
-
-    COMPUTE_KEY_CHECKSUM(key, checksum);
-    hash = TABLE_HASH(key);
-    if (!TABLE_INDEX_IS_INITIALIZED(t, hash)) {
-        t->index_first[hash] = t->a.nelts;
-        TABLE_SET_INDEX_INITIALIZED(t, hash);
-        goto add_new_elt;
-    }
-    next_elt = ((apr_table_entry_t *) t->a.elts) + t->index_first[hash];;
-    end_elt = ((apr_table_entry_t *) t->a.elts) + t->index_last[hash];
-    table_end =((apr_table_entry_t *) t->a.elts) + t->a.nelts;
-
-    for (; next_elt <= end_elt; next_elt++) {
-	if ((checksum == next_elt->key_checksum) &&
-            !strcasecmp(next_elt->key, key)) {
-
-            /* Found an existing entry with the same key, so overwrite it */
-
-            int must_reindex = 0;
-            apr_table_entry_t *dst_elt = NULL;
-
-            next_elt->val = (char *)val;
-
-            /* Remove any other instances of this key */
-            for (next_elt++; next_elt <= end_elt; next_elt++) {
-                if ((checksum == next_elt->key_checksum) &&
-                    !strcasecmp(next_elt->key, key)) {
-                    t->a.nelts--;
-                    if (!dst_elt) {
-                        dst_elt = next_elt;
-                    }
-                }
-                else if (dst_elt) {
-                    *dst_elt++ = *next_elt;
-                    must_reindex = 1;
-                }
-            }
-
-            /* If we've removed anything, shift over the remainder
-             * of the table (note that the previous loop didn't
-             * run to the end of the table, just to the last match
-             * for the index)
-             */
-            if (dst_elt) {
-                for (; next_elt < table_end; next_elt++) {
-                    *dst_elt++ = *next_elt;
-                }
-                must_reindex = 1;
-            }
-            if (must_reindex) {
-                table_reindex(t);
-            }
-            return;
-        }
-    }
-
-add_new_elt:
-    t->index_last[hash] = t->a.nelts;
-    next_elt = (apr_table_entry_t *) table_push(t);
-    next_elt->key = (char *)key;
-    next_elt->val = (char *)val;
-    next_elt->key_checksum = checksum;
-}
-
-APR_DECLARE(void) apr_table_unset(apr_table_t *t, const char *key)
-{
-    apr_table_entry_t *next_elt;
-    apr_table_entry_t *end_elt;
-    apr_table_entry_t *dst_elt;
-    apr_uint32_t checksum;
-    int hash;
-    int must_reindex;
-
-    hash = TABLE_HASH(key);
-    if (!TABLE_INDEX_IS_INITIALIZED(t, hash)) {
-        return;
-    }
-    COMPUTE_KEY_CHECKSUM(key, checksum);
-    next_elt = ((apr_table_entry_t *) t->a.elts) + t->index_first[hash];
-    end_elt = ((apr_table_entry_t *) t->a.elts) + t->index_last[hash];
-    must_reindex = 0;
-    for (; next_elt <= end_elt; next_elt++) {
-	if ((checksum == next_elt->key_checksum) &&
-            !strcasecmp(next_elt->key, key)) {
-
-            /* Found a match: remove this entry, plus any additional
-             * matches for the same key that might follow
-             */
-            apr_table_entry_t *table_end = ((apr_table_entry_t *) t->a.elts) +
-                t->a.nelts;
-            t->a.nelts--;
-            dst_elt = next_elt;
-            for (next_elt++; next_elt <= end_elt; next_elt++) {
-                if ((checksum == next_elt->key_checksum) &&
-                    !strcasecmp(next_elt->key, key)) {
-                    t->a.nelts--;
-                }
-                else {
-                    *dst_elt++ = *next_elt;
-                }
-            }
-
-            /* Shift over the remainder of the table (note that
-             * the previous loop didn't run to the end of the table,
-             * just to the last match for the index)
-             */
-            for (; next_elt < table_end; next_elt++) {
-                *dst_elt++ = *next_elt;
-            }
-            must_reindex = 1;
-            break;
-        }
-    }
-    if (must_reindex) {
-        table_reindex(t);
-    }
-}
-
-APR_DECLARE(void) apr_table_merge(apr_table_t *t, const char *key,
-				 const char *val)
-{
-    apr_table_entry_t *next_elt;
-    apr_table_entry_t *end_elt;
-    apr_uint32_t checksum;
-    int hash;
-
-    COMPUTE_KEY_CHECKSUM(key, checksum);
-    hash = TABLE_HASH(key);
-    if (!TABLE_INDEX_IS_INITIALIZED(t, hash)) {
-        t->index_first[hash] = t->a.nelts;
-        TABLE_SET_INDEX_INITIALIZED(t, hash);
-        goto add_new_elt;
-    }
-    next_elt = ((apr_table_entry_t *) t->a.elts) + t->index_first[hash];
-    end_elt = ((apr_table_entry_t *) t->a.elts) + t->index_last[hash];
-
-    for (; next_elt <= end_elt; next_elt++) {
-	if ((checksum == next_elt->key_checksum) &&
-            !strcasecmp(next_elt->key, key)) {
-
-            /* Found an existing entry with the same key, so merge with it */
-	    next_elt->val = apr_pstrcat(t->a.pool, next_elt->val, ", ",
-                                        val, NULL);
-            return;
-        }
-    }
-
-add_new_elt:
-    t->index_last[hash] = t->a.nelts;
-    next_elt = (apr_table_entry_t *) table_push(t);
-    next_elt->key = apr_pstrdup(t->a.pool, key);
-    next_elt->val = apr_pstrdup(t->a.pool, val);
-    next_elt->key_checksum = checksum;
-}
-
-APR_DECLARE(void) apr_table_mergen(apr_table_t *t, const char *key,
-				  const char *val)
-{
-    apr_table_entry_t *next_elt;
-    apr_table_entry_t *end_elt;
-    apr_uint32_t checksum;
-    int hash;
-
-#ifdef POOL_DEBUG
-    {
-	if (!apr_pool_is_ancestor(apr_pool_find(key), t->a.pool)) {
-	    fprintf(stderr, "table_set: key not in ancestor pool of t\n");
-	    abort();
-	}
-	if (!apr_pool_is_ancestor(apr_pool_find(val), t->a.pool)) {
-	    fprintf(stderr, "table_set: val not in ancestor pool of t\n");
-	    abort();
-	}
-    }
-#endif
-
-    COMPUTE_KEY_CHECKSUM(key, checksum);
-    hash = TABLE_HASH(key);
-    if (!TABLE_INDEX_IS_INITIALIZED(t, hash)) {
-        t->index_first[hash] = t->a.nelts;
-        TABLE_SET_INDEX_INITIALIZED(t, hash);
-        goto add_new_elt;
-    }
-    next_elt = ((apr_table_entry_t *) t->a.elts) + t->index_first[hash];;
-    end_elt = ((apr_table_entry_t *) t->a.elts) + t->index_last[hash];
-
-    for (; next_elt <= end_elt; next_elt++) {
-	if ((checksum == next_elt->key_checksum) &&
-            !strcasecmp(next_elt->key, key)) {
-
-            /* Found an existing entry with the same key, so merge with it */
-	    next_elt->val = apr_pstrcat(t->a.pool, next_elt->val, ", ",
-                                        val, NULL);
-            return;
-        }
-    }
-
-add_new_elt:
-    t->index_last[hash] = t->a.nelts;
-    next_elt = (apr_table_entry_t *) table_push(t);
-    next_elt->key = (char *)key;
-    next_elt->val = (char *)val;
-    next_elt->key_checksum = checksum;
-}
-
-APR_DECLARE(void) apr_table_add(apr_table_t *t, const char *key,
-			       const char *val)
-{
-    apr_table_entry_t *elts;
-    apr_uint32_t checksum;
-    int hash;
-
-    hash = TABLE_HASH(key);
-    t->index_last[hash] = t->a.nelts;
-    if (!TABLE_INDEX_IS_INITIALIZED(t, hash)) {
-        t->index_first[hash] = t->a.nelts;
-        TABLE_SET_INDEX_INITIALIZED(t, hash);
-    }
-    COMPUTE_KEY_CHECKSUM(key, checksum);
-    elts = (apr_table_entry_t *) table_push(t);
-    elts->key = apr_pstrdup(t->a.pool, key);
-    elts->val = apr_pstrdup(t->a.pool, val);
-    elts->key_checksum = checksum;
-}
-
-APR_DECLARE(void) apr_table_addn(apr_table_t *t, const char *key,
-				const char *val)
-{
-    apr_table_entry_t *elts;
-    apr_uint32_t checksum;
-    int hash;
-
-#ifdef POOL_DEBUG
-    {
-	if (!apr_pool_is_ancestor(apr_pool_find(key), t->a.pool)) {
-	    fprintf(stderr, "table_set: key not in ancestor pool of t\n");
-	    abort();
-	}
-	if (!apr_pool_is_ancestor(apr_pool_find(val), t->a.pool)) {
-	    fprintf(stderr, "table_set: val not in ancestor pool of t\n");
-	    abort();
-	}
-    }
-#endif
-
-    hash = TABLE_HASH(key);
-    t->index_last[hash] = t->a.nelts;
-    if (!TABLE_INDEX_IS_INITIALIZED(t, hash)) {
-        t->index_first[hash] = t->a.nelts;
-        TABLE_SET_INDEX_INITIALIZED(t, hash);
-    }
-    COMPUTE_KEY_CHECKSUM(key, checksum);
-    elts = (apr_table_entry_t *) table_push(t);
-    elts->key = (char *)key;
-    elts->val = (char *)val;
-    elts->key_checksum = checksum;
-}
-
-APR_DECLARE(apr_table_t *) apr_table_overlay(apr_pool_t *p,
-					     const apr_table_t *overlay,
-					     const apr_table_t *base)
-{
-    apr_table_t *res;
-
-#ifdef POOL_DEBUG
-    /* we don't copy keys and values, so it's necessary that
-     * overlay->a.pool and base->a.pool have a life span at least
-     * as long as p
-     */
-    if (!apr_pool_is_ancestor(overlay->a.pool, p)) {
-	fprintf(stderr,
-		"overlay_tables: overlay's pool is not an ancestor of p\n");
-	abort();
-    }
-    if (!apr_pool_is_ancestor(base->a.pool, p)) {
-	fprintf(stderr,
-		"overlay_tables: base's pool is not an ancestor of p\n");
-	abort();
-    }
-#endif
-
-    res = apr_palloc(p, sizeof(apr_table_t));
-    /* behave like append_arrays */
-    res->a.pool = p;
-    copy_array_hdr_core(&res->a, &overlay->a);
-    apr_array_cat(&res->a, &base->a);
-    table_reindex(res);
-    return res;
-}
-
-/* And now for something completely abstract ...
-
- * For each key value given as a vararg:
- *   run the function pointed to as
- *     int comp(void *r, char *key, char *value);
- *   on each valid key-value pair in the apr_table_t t that matches the vararg key,
- *   or once for every valid key-value pair if the vararg list is empty,
- *   until the function returns false (0) or we finish the table.
- *
- * Note that we restart the traversal for each vararg, which means that
- * duplicate varargs will result in multiple executions of the function
- * for each matching key.  Note also that if the vararg list is empty,
- * only one traversal will be made and will cut short if comp returns 0.
- *
- * Note that the table_get and table_merge functions assume that each key in
- * the apr_table_t is unique (i.e., no multiple entries with the same key).  This
- * function does not make that assumption, since it (unfortunately) isn't
- * true for some of Apache's tables.
- *
- * Note that rec is simply passed-on to the comp function, so that the
- * caller can pass additional info for the task.
- *
- * ADDENDUM for apr_table_vdo():
- * 
- * The caching api will allow a user to walk the header values:
- *
- * apr_status_t apr_cache_el_header_walk(apr_cache_el *el, 
- *    int (*comp)(void *, const char *, const char *), void *rec, ...);
- *
- * So it can be ..., however from there I use a  callback that use a va_list:
- *
- * apr_status_t (*cache_el_header_walk)(apr_cache_el *el, 
- *    int (*comp)(void *, const char *, const char *), void *rec, va_list);
- *
- * To pass those ...'s on down to the actual module that will handle walking
- * their headers, in the file case this is actually just an apr_table - and
- * rather than reimplementing apr_table_do (which IMHO would be bad) I just
- * called it with the va_list. For mod_shmem_cache I don't need it since I
- * can't use apr_table's, but mod_file_cache should (though a good hash would
- * be better, but that's a different issue :). 
- *
- * So to make mod_file_cache easier to maintain, it's a good thing
- */
-APR_DECLARE_NONSTD(int) apr_table_do(apr_table_do_callback_fn_t *comp,
-                                     void *rec, const apr_table_t *t, ...)
-{
-    int rv;
-
-    va_list vp;
-    va_start(vp, t);
-    rv = apr_table_vdo(comp, rec, t, vp);
-    va_end(vp);
-
-    return rv;
-} 
-
-/* XXX: do the semantics of this routine make any sense?  Right now,
- * if the caller passed in a non-empty va_list of keys to search for,
- * the "early termination" facility only terminates on *that* key; other
- * keys will continue to process.  Note that this only has any effect
- * at all if there are multiple entries in the table with the same key,
- * otherwise the called function can never effectively early-terminate
- * this function, as the zero return value is effectively ignored.
- *
- * Note also that this behavior is at odds with the behavior seen if an
- * empty va_list is passed in -- in that case, a zero return value terminates
- * the entire apr_table_vdo (which is what I think should happen in
- * both cases).
- *
- * If nobody objects soon, I'm going to change the order of the nested
- * loops in this function so that any zero return value from the (*comp)
- * function will cause a full termination of apr_table_vdo.  I'm hesitant
- * at the moment because these (funky) semantics have been around for a
- * very long time, and although Apache doesn't seem to use them at all,
- * some third-party vendor might.  I can only think of one possible reason
- * the existing semantics would make any sense, and it's very Apache-centric,
- * which is this: if (*comp) is looking for matches of a particular
- * substring in request headers (let's say it's looking for a particular
- * cookie name in the Set-Cookie headers), then maybe it wants to be
- * able to stop searching early as soon as it finds that one and move
- * on to the next key.  That's only an optimization of course, but changing
- * the behavior of this function would mean that any code that tried
- * to do that would stop working right.
- *
- * Sigh.  --JCW, 06/28/02
- */
-APR_DECLARE(int) apr_table_vdo(apr_table_do_callback_fn_t *comp,
-                               void *rec, const apr_table_t *t, va_list vp)
-{
-    char *argp;
-    apr_table_entry_t *elts = (apr_table_entry_t *) t->a.elts;
-    int vdorv = 1;
-
-    argp = va_arg(vp, char *);
-    do {
-        int rv = 1, i;
-        if (argp) {
-            /* Scan for entries that match the next key */
-            int hash = TABLE_HASH(argp);
-            if (TABLE_INDEX_IS_INITIALIZED(t, hash)) {
-                apr_uint32_t checksum;
-                COMPUTE_KEY_CHECKSUM(argp, checksum);
-                for (i = t->index_first[hash];
-                     rv && (i <= t->index_last[hash]); ++i) {
-                    if (elts[i].key && (checksum == elts[i].key_checksum) &&
-                                        !strcasecmp(elts[i].key, argp)) {
-                        rv = (*comp) (rec, elts[i].key, elts[i].val);
-                    }
-                }
-            }
-        }
-        else {
-            /* Scan the entire table */
-            for (i = 0; rv && (i < t->a.nelts); ++i) {
-                if (elts[i].key) {
-                    rv = (*comp) (rec, elts[i].key, elts[i].val);
-                }
-            }
-        }
-        if (rv == 0) {
-            vdorv = 0;
-        }
-    } while (argp && ((argp = va_arg(vp, char *)) != NULL));
-
-    return vdorv;
-}
-
-static apr_table_entry_t **table_mergesort(apr_pool_t *pool,
-                                           apr_table_entry_t **values, int n)
-{
-    /* Bottom-up mergesort, based on design in Sedgewick's "Algorithms
-     * in C," chapter 8
-     */
-    apr_table_entry_t **values_tmp =
-        (apr_table_entry_t **)apr_palloc(pool, n * sizeof(apr_table_entry_t*));
-    int i;
-    int blocksize;
-
-    /* First pass: sort pairs of elements (blocksize=1) */
-    for (i = 0; i + 1 < n; i += 2) {
-        if (strcasecmp(values[i]->key, values[i + 1]->key) > 0) {
-            apr_table_entry_t *swap = values[i];
-            values[i] = values[i + 1];
-            values[i + 1] = swap;
-        }
-    }
-
-    /* Merge successively larger blocks */
-    blocksize = 2;
-    while (blocksize < n) {
-        apr_table_entry_t **dst = values_tmp;
-        int next_start;
-        apr_table_entry_t **swap;
-
-        /* Merge consecutive pairs blocks of the next blocksize.
-         * Within a block, elements are in sorted order due to
-         * the previous iteration.
-         */
-        for (next_start = 0; next_start + blocksize < n;
-             next_start += (blocksize + blocksize)) {
-
-            int block1_start = next_start;
-            int block2_start = block1_start + blocksize;
-            int block1_end = block2_start;
-            int block2_end = block2_start + blocksize;
-            if (block2_end > n) {
-                /* The last block may be smaller than blocksize */
-                block2_end = n;
-            }
-            for (;;) {
-
-                /* Merge the next two blocks:
-                 * Pick the smaller of the next element from
-                 * block 1 and the next element from block 2.
-                 * Once either of the blocks is emptied, copy
-                 * over all the remaining elements from the
-                 * other block
-                 */
-                if (block1_start == block1_end) {
-                    for (; block2_start < block2_end; block2_start++) {
-                        *dst++ = values[block2_start];
-                    }
-                    break;
-                }
-                else if (block2_start == block2_end) {
-                    for (; block1_start < block1_end; block1_start++) {
-                        *dst++ = values[block1_start];
-                    }
-                    break;
-                }
-                if (strcasecmp(values[block1_start]->key,
-                               values[block2_start]->key) > 0) {
-                    *dst++ = values[block2_start++];
-                }
-                else {
-                    *dst++ = values[block1_start++];
-                }
-            }
-        }
-
-        /* If n is not a multiple of 2*blocksize, some elements
-         * will be left over at the end of the array.
-         */
-        for (i = dst - values_tmp; i < n; i++) {
-            values_tmp[i] = values[i];
-        }
-
-        /* The output array of this pass becomes the input
-         * array of the next pass, and vice versa
-         */
-        swap = values_tmp;
-        values_tmp = values;
-        values = swap;
-
-        blocksize += blocksize;
-    }
-
-    return values;
-}
-
-APR_DECLARE(void) apr_table_compress(apr_table_t *t, unsigned flags)
-{
-    apr_table_entry_t **sort_array;
-    apr_table_entry_t **sort_next;
-    apr_table_entry_t **sort_end;
-    apr_table_entry_t *table_next;
-    apr_table_entry_t **last;
-    int i;
-    int dups_found;
-
-    if (t->a.nelts <= 1) {
-        return;
-    }
-
-    /* Copy pointers to all the table elements into an
-     * array and sort to allow for easy detection of
-     * duplicate keys
-     */
-    sort_array = (apr_table_entry_t **)
-        apr_palloc(t->a.pool, t->a.nelts * sizeof(apr_table_entry_t*));
-    sort_next = sort_array;
-    table_next = (apr_table_entry_t *)t->a.elts;
-    i = t->a.nelts;
-    do {
-        *sort_next++ = table_next++;
-    } while (--i);
-
-    /* Note: the merge is done with mergesort instead of quicksort
-     * because mergesort is a stable sort and runs in n*log(n)
-     * time regardless of its inputs (quicksort is quadratic in
-     * the worst case)
-     */
-    sort_array = table_mergesort(t->a.pool, sort_array, t->a.nelts);
-
-    /* Process any duplicate keys */
-    dups_found = 0;
-    sort_next = sort_array;
-    sort_end = sort_array + t->a.nelts;
-    last = sort_next++;
-    while (sort_next < sort_end) {
-        if (((*sort_next)->key_checksum == (*last)->key_checksum) &&
-            !strcasecmp((*sort_next)->key, (*last)->key)) {
-            apr_table_entry_t **dup_last = sort_next + 1;
-            dups_found = 1;
-            while ((dup_last < sort_end) &&
-                   ((*dup_last)->key_checksum == (*last)->key_checksum) &&
-                   !strcasecmp((*dup_last)->key, (*last)->key)) {
-                dup_last++;
-            }
-            dup_last--; /* Elements from last through dup_last, inclusive,
-                         * all have the same key
-                         */
-            if (flags == APR_OVERLAP_TABLES_MERGE) {
-                apr_size_t len = 0;
-                apr_table_entry_t **next = last;
-                char *new_val;
-                char *val_dst;
-                do {
-                    len += strlen((*next)->val);
-                    len += 2; /* for ", " or trailing null */
-                } while (++next <= dup_last);
-                new_val = (char *)apr_palloc(t->a.pool, len);
-                val_dst = new_val;
-                next = last;
-                for (;;) {
-                    strcpy(val_dst, (*next)->val);
-                    val_dst += strlen((*next)->val);
-                    next++;
-                    if (next > dup_last) {
-                        *val_dst = 0;
-                        break;
-                    }
-                    else {
-                        *val_dst++ = ',';
-                        *val_dst++ = ' ';
-                    }
-                }
-                (*last)->val = new_val;
-            }
-            else { /* overwrite */
-                (*last)->val = (*dup_last)->val;
-            }
-            do {
-                (*sort_next)->key = NULL;
-            } while (++sort_next <= dup_last);
-        }
-        else {
-            last = sort_next++;
-        }
-    }
-
-    /* Shift elements to the left to fill holes left by removing duplicates */
-    if (dups_found) {
-        apr_table_entry_t *src = (apr_table_entry_t *)t->a.elts;
-        apr_table_entry_t *dst = (apr_table_entry_t *)t->a.elts;
-        apr_table_entry_t *last_elt = src + t->a.nelts;
-        do {
-            if (src->key) {
-                *dst++ = *src;
-            }
-        } while (++src < last_elt);
-        t->a.nelts -= (last_elt - dst);
-    }
-
-    table_reindex(t);
-}
-
-static void apr_table_cat(apr_table_t *t, const apr_table_t *s)
-{
-    const int n = t->a.nelts;
-    register int idx;
-
-    apr_array_cat(&t->a,&s->a);
-
-    if (n == 0) {
-        memcpy(t->index_first,s->index_first,sizeof(int) * TABLE_HASH_SIZE);
-        memcpy(t->index_last, s->index_last, sizeof(int) * TABLE_HASH_SIZE);
-        t->index_initialized = s->index_initialized;
-        return;
-    }
-
-    for (idx = 0; idx < TABLE_HASH_SIZE; ++idx) {
-        if (TABLE_INDEX_IS_INITIALIZED(s, idx)) {
-            t->index_last[idx] = s->index_last[idx] + n;
-            if (!TABLE_INDEX_IS_INITIALIZED(t, idx)) {
-                t->index_first[idx] = s->index_first[idx] + n;
-            }
-        }
-    }
-
-    t->index_initialized |= s->index_initialized;
-}
-
-APR_DECLARE(void) apr_table_overlap(apr_table_t *a, const apr_table_t *b,
-				    unsigned flags)
-{
-    const int m = a->a.nelts;
-    const int n = b->a.nelts;
-    apr_pool_t *p = b->a.pool;
-
-    if (m + n == 0) {
-        return;
-    }
-
-    /* copy (extend) a using b's pool */
-    if (a->a.pool != p) {
-        make_array_core(&a->a, p, m+n, sizeof(apr_table_entry_t), 0);
-    }
-
-    apr_table_cat(a, b);
-
-    apr_table_compress(a, flags);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/tables/apr_tables.lo b/rubbos/app/httpd-2.0.64/srclib/apr/tables/apr_tables.lo
deleted file mode 100644
index a74bcd28..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/tables/apr_tables.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# apr_tables.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/apr_tables.o'
-
-# Name of the non-PIC object.
-non_pic_object='apr_tables.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/tables/apr_tables.o b/rubbos/app/httpd-2.0.64/srclib/apr/tables/apr_tables.o
deleted file mode 100644
index 21b95695..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/tables/apr_tables.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/CuTest.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/CuTest.c
deleted file mode 100644
index 8356b9b2..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/CuTest.c
+++ /dev/null
@@ -1,475 +0,0 @@
-/*
- * Copyright (c) 2002-2006 Asim Jalis
- * 
- * This library is released under the zlib/libpng license as described at
- * 
- * http://www.opensource.org/licenses/zlib-license.html
- * 
- * Here is the statement of the license:
- * 
- * This software is provided 'as-is', without any express or implied warranty. 
- * In no event will the authors be held liable for any damages arising from 
- * the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose, 
- * including commercial applications, and to alter it and redistribute it 
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not 
- * claim that you wrote the original software. If you use this software in a 
- * product, an acknowledgment in the product documentation would be 
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source distribution.
- */
-/*
- * This file has been modified from the original distribution.
- */
-
-#include <assert.h>
-#include <setjmp.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "CuTest.h"
-
-static int verbose = 0;
-
-void CuInit(int argc, char *argv[])
-{
-	int i;
-	
-	/* Windows doesn't have getopt, so we have to fake it.  We can't use
-	 * apr_getopt, because CuTest is meant to be a stand-alone test suite
-	 */
-	for (i = 0; i < argc; i++) {
-		if (!strcmp(argv[i], "-v")) {
-			verbose = 1;
-		}
-	}
-}
-
-/*-------------------------------------------------------------------------*
- * CuStr
- *-------------------------------------------------------------------------*/
-
-char* CuStrAlloc(int size)
-{
-	char* new = (char*) malloc( sizeof(char) * (size) );
-	return new;
-}
-
-char* CuStrCopy(const char* old)
-{
-	int len = strlen(old);
-	char* new = CuStrAlloc(len + 1);
-	strcpy(new, old);
-	return new;
-}
-
-/*-------------------------------------------------------------------------*
- * CuString
- *-------------------------------------------------------------------------*/
-
-void CuStringInit(CuString* str)
-{
-	str->length = 0;
-	str->size = STRING_MAX;
-	str->buffer = (char*) malloc(sizeof(char) * str->size);
-	str->buffer[0] = '\0';
-}
-
-CuString* CuStringNew(void)
-{
-	CuString* str = (CuString*) malloc(sizeof(CuString));
-	str->length = 0;
-	str->size = STRING_MAX;
-	str->buffer = (char*) malloc(sizeof(char) * str->size);
-	str->buffer[0] = '\0';
-	return str;
-}
-
-void CuStringResize(CuString* str, int newSize)
-{
-	str->buffer = (char*) realloc(str->buffer, sizeof(char) * newSize);
-	str->size = newSize;
-}
-
-void CuStringAppend(CuString* str, const char* text)
-{
-	int length = strlen(text);
-	if (str->length + length + 1 >= str->size)
-		CuStringResize(str, str->length + length + 1 + STRING_INC);
-	str->length += length;
-	strcat(str->buffer, text);
-}
-
-void CuStringAppendChar(CuString* str, char ch)
-{
-	char text[2];
-	text[0] = ch;
-	text[1] = '\0';
-	CuStringAppend(str, text);
-}
-
-void CuStringAppendFormat(CuString* str, const char* format, ...)
-{
-	va_list argp;
-	char buf[HUGE_STRING_LEN];
-	va_start(argp, format);
-	vsprintf(buf, format, argp);
-	va_end(argp);
-	CuStringAppend(str, buf);
-}
-
-void CuStringRead(CuString *str, char *path)
-{
-	path = strdup(str->buffer);
-}
-
-/*-------------------------------------------------------------------------*
- * CuTest
- *-------------------------------------------------------------------------*/
-
-void CuTestInit(CuTest* t, char* name, TestFunction function)
-{
-	t->name = CuStrCopy(name);
-	t->notimpl = 0;
-	t->failed = 0;
-	t->ran = 0;
-	t->message = NULL;
-	t->function = function;
-	t->jumpBuf = NULL;
-}
-
-CuTest* CuTestNew(char* name, TestFunction function)
-{
-	CuTest* tc = CU_ALLOC(CuTest);
-	CuTestInit(tc, name, function);
-	return tc;
-}
-
-void CuNotImpl(CuTest* tc, const char* message)
-{
-	CuString* newstr = CuStringNew();
-        CuStringAppend(newstr, message);
-        CuStringAppend(newstr, " not implemented on this platform");
-	tc->notimpl = 1;
-	tc->message = CuStrCopy(newstr->buffer);
-	if (tc->jumpBuf != 0) longjmp(*(tc->jumpBuf), 0);
-}
-
-void CuFail(CuTest* tc, const char* message)
-{
-	tc->failed = 1;
-	tc->message = CuStrCopy(message);
-	if (tc->jumpBuf != 0) longjmp(*(tc->jumpBuf), 0);
-}
-
-void CuAssert(CuTest* tc, const char* message, int condition)
-{
-	if (condition) return;
-	CuFail(tc, message);
-}
-
-void CuAssertTrue(CuTest* tc, int condition)
-{
-	if (condition) return;
-	CuFail(tc, "assert failed");
-}
-
-void CuAssertStrNEquals(CuTest* tc, const char* expected, const char* actual,
-                        int n)
-{
-	CuString* message;
-	if (strncmp(expected, actual, n) == 0) return;
-	message = CuStringNew();
-	CuStringAppend(message, "expected\n---->\n");
-	CuStringAppend(message, expected);
-	CuStringAppend(message, "\n<----\nbut saw\n---->\n");
-	CuStringAppend(message, actual);
-	CuStringAppend(message, "\n<----");
-	CuFail(tc, message->buffer);
-}
-
-void CuAssertStrEquals(CuTest* tc, const char* expected, const char* actual)
-{
-	CuString* message;
-	if (strcmp(expected, actual) == 0) return;
-	message = CuStringNew();
-	CuStringAppend(message, "expected\n---->\n");
-	CuStringAppend(message, expected);
-	CuStringAppend(message, "\n<----\nbut saw\n---->\n");
-	CuStringAppend(message, actual);
-	CuStringAppend(message, "\n<----");
-	CuFail(tc, message->buffer);
-}
-
-void CuAssertIntEquals(CuTest* tc, int expected, int actual)
-{
-	char buf[STRING_MAX];
-	if (expected == actual) return;
-	sprintf(buf, "expected <%d> but was <%d>", expected, actual);
-	CuFail(tc, buf);
-}
-
-void CuAssertPtrEquals(CuTest* tc, const void* expected, const void* actual)
-{
-	char buf[STRING_MAX];
-	if (expected == actual) return;
-	sprintf(buf, "expected pointer <%p> but was <%p>", expected, actual);
-	CuFail(tc, buf);
-}
-
-void CuAssertPtrNotNull(CuTest* tc, const void* pointer)
-{
-	char buf[STRING_MAX];
-	if (pointer != NULL ) return;
-	sprintf(buf, "null pointer unexpected, but was <%p>", pointer);
-	CuFail(tc, buf);
-}
-
-void CuTestRun(CuTest* tc)
-{
-	jmp_buf buf;
-	tc->jumpBuf = &buf;
-	if (setjmp(buf) == 0)
-	{
-		tc->ran = 1;
-		(tc->function)(tc);
-	}
-	tc->jumpBuf = 0;
-}
-
-/*-------------------------------------------------------------------------*
- * CuSuite
- *-------------------------------------------------------------------------*/
-
-void CuSuiteInit(CuSuite* testSuite, char *name)
-{
-	testSuite->name = strdup(name);
-	testSuite->count = 0;
-	testSuite->failCount = 0;
-	testSuite->notimplCount = 0;
-}
-
-CuSuite* CuSuiteNew(char *name)
-{
-	CuSuite* testSuite = CU_ALLOC(CuSuite);
-	CuSuiteInit(testSuite, name);
-	return testSuite;
-}
-
-void CuSuiteAdd(CuSuite* testSuite, CuTest *testCase)
-{
-	assert(testSuite->count < MAX_TEST_CASES);
-	testSuite->list[testSuite->count] = testCase;
-	testSuite->count++;
-}
-
-void CuSuiteAddSuite(CuSuite* testSuite, CuSuite* testSuite2)
-{
-	int i;
-	for (i = 0 ; i < testSuite2->count ; ++i)
-	{
-		CuTest* testCase = testSuite2->list[i];
-		CuSuiteAdd(testSuite, testCase);
-	}
-}
-
-void CuSuiteRun(CuSuite* testSuite)
-{
-	int i;
-	for (i = 0 ; i < testSuite->count ; ++i)
-	{
-		CuTest* testCase = testSuite->list[i];
-		CuTestRun(testCase);
-		if (testCase->failed) { testSuite->failCount += 1; }
-		if (testCase->notimpl) { testSuite->notimplCount += 1; }
-	}
-}
-
-void CuSuiteSummary(CuSuite* testSuite, CuString* summary)
-{
-	int i;
-	for (i = 0 ; i < testSuite->count ; ++i)
-	{
-		CuTest* testCase = testSuite->list[i];
-		CuStringAppend(summary, testCase->failed ? "F" : 
-                               testCase->notimpl ? "N": ".");
-	}
-	CuStringAppend(summary, "\n");
-}
-
-void CuSuiteOverView(CuSuite* testSuite, CuString* details)
-{
-	CuStringAppendFormat(details, "%d %s run:  %d passed, %d failed, "
-			     "%d not implemented.\n",
-			     testSuite->count, 
-			     testSuite->count == 1 ? "test" : "tests",
-   			     testSuite->count - testSuite->failCount - 
-				testSuite->notimplCount,
-			     testSuite->failCount, testSuite->notimplCount);
-}
-
-void CuSuiteDetails(CuSuite* testSuite, CuString* details)
-{
-	int i;
-	int failCount = 0;
-
-	if (testSuite->failCount != 0 && verbose)
-	{
-		CuStringAppendFormat(details, "\nFailed tests in %s:\n", testSuite->name);
-		for (i = 0 ; i < testSuite->count ; ++i)
-		{
-			CuTest* testCase = testSuite->list[i];
-			if (testCase->failed)
-			{
-				failCount++;
-				CuStringAppendFormat(details, "%d) %s: %s\n", 
-					failCount, testCase->name, testCase->message);
-			}
-		}
-	}
-	if (testSuite->notimplCount != 0 && verbose)
-	{
-		CuStringAppendFormat(details, "\nNot Implemented tests in %s:\n", testSuite->name);
-		for (i = 0 ; i < testSuite->count ; ++i)
-		{
-			CuTest* testCase = testSuite->list[i];
-			if (testCase->notimpl)
-			{
-			        failCount++;
-			        CuStringAppendFormat(details, "%d) %s: %s\n",
-			                failCount, testCase->name, testCase->message);
-			}
-		}
-	}
-}
-
-/*-------------------------------------------------------------------------*
- * CuSuiteList
- *-------------------------------------------------------------------------*/
-
-CuSuiteList* CuSuiteListNew(char *name)
-{
-	CuSuiteList* testSuite = CU_ALLOC(CuSuiteList);
-	testSuite->name = strdup(name);
-	testSuite->count = 0;
-	return testSuite;
-}
-
-void CuSuiteListAdd(CuSuiteList *suites, CuSuite *origsuite)
-{
-	assert(suites->count < MAX_TEST_CASES);
-	suites->list[suites->count] = origsuite;
-	suites->count++;
-}
-
-void CuSuiteListRun(CuSuiteList* testSuite)
-{
-	int i;
-	for (i = 0 ; i < testSuite->count ; ++i)
-	{
-		CuSuite* testCase = testSuite->list[i];
-		CuSuiteRun(testCase);
-	}
-}
-
-static const char *genspaces(int i)
-{
-    char *str = malloc((i + 1) * sizeof(char));
-    memset(str, ' ', i);
-    str[i] = '\0';
-    return str;
-}
-
-void CuSuiteListRunWithSummary(CuSuiteList* testSuite)
-{
-	int i;
-
-	printf("%s:\n", testSuite->name);
-	for (i = 0 ; i < testSuite->count ; ++i)
-	{
-		CuSuite* testCase = testSuite->list[i];
-		CuString *str = CuStringNew();
-
-	        printf("    %s:%s", testCase->name, 
-                                  genspaces(21 - strlen(testCase->name)));
-		fflush(stdout);
-		CuSuiteRun(testCase);
-		CuSuiteSummary(testCase, str);
-		printf("    %s", str->buffer);
-
-	}
-	printf("\n");
-}
-
-void CuSuiteListSummary(CuSuiteList* testSuite, CuString* summary)
-{
-	int i;
-	CuStringAppendFormat(summary, "%s:\n", testSuite->name);
-	for (i = 0 ; i < testSuite->count ; ++i)
-	{
-		CuSuite* testCase = testSuite->list[i];
-		CuString *str = CuStringNew();
-		CuSuiteSummary(testCase, str);
-		CuStringAppend(summary, "    ");
-		CuStringAppend(summary, str->buffer);
-	}
-	CuStringAppend(summary, "\n");
-}
-
-int CuSuiteListDetails(CuSuiteList* testSuite, CuString* details)
-{
-	int i;
-	int failCount = 0;
-	int notImplCount = 0;
-	int count = 0;
-
-	for (i = 0 ; i < testSuite->count ; ++i)
-	{
-		failCount += testSuite->list[i]->failCount;
-		notImplCount += testSuite->list[i]->notimplCount;
-                count += testSuite->list[i]->count;
-	}
-	CuStringAppendFormat(details, "%d %s run:  %d passed, %d failed, "
-			     "%d not implemented.\n",
-			     count, 
-			     count == 1 ? "test" : "tests",
-   			     count - failCount - notImplCount,
-			     failCount, notImplCount);
-
-	if (failCount != 0 && verbose)
-	{
-		for (i = 0 ; i < testSuite->count ; ++i)
-		{
-			CuString *str = CuStringNew();
-			CuSuite* testCase = testSuite->list[i];
-			if (testCase->failCount)
-			{
-				CuSuiteDetails(testCase, str);
-				CuStringAppend(details, str->buffer);
-			}
-		}
-	}
-	if (notImplCount != 0 && verbose)
-	{
-		for (i = 0 ; i < testSuite->count ; ++i)
-		{
-			CuString *str = CuStringNew();
-			CuSuite* testCase = testSuite->list[i];
-			if (testCase->notimplCount)
-			{
-				CuSuiteDetails(testCase, str);
-				CuStringAppend(details, str->buffer);
-			}
-		}
-	} 
-	return failCount;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/CuTest.h b/rubbos/app/httpd-2.0.64/srclib/apr/test/CuTest.h
deleted file mode 100644
index e607d3ac..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/CuTest.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2002-2006 Asim Jalis
- *
- * This library is released under the zlib/libpng license as described at
- *
- * http://www.opensource.org/licenses/zlib-license.html
- *
- * Here is the statement of the license:
- *
- * This software is provided 'as-is', without any express or implied warranty.
- * In no event will the authors be held liable for any damages arising from
- * the use of this software.
- *
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software in a
- * product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- *
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- *
- * 3. This notice may not be removed or altered from any source distribution.
- */
-/*
- * This file has been modified from the original distribution.
- */
-
-#ifndef CU_TEST_H
-#define CU_TEST_H
-
-#include <setjmp.h>
-#include <stdarg.h>
-
-/* CuString */
-
-char* CuStrAlloc(int size);
-char* CuStrCopy(const char* old);
-
-#define CU_ALLOC(TYPE)		((TYPE*) malloc(sizeof(TYPE)))
-
-#define HUGE_STRING_LEN	8192
-#define STRING_MAX		256
-#define STRING_INC		256
-
-typedef struct
-{
-	int length;
-	int size;
-	char* buffer;
-} CuString;
-
-void CuStringInit(CuString* str);
-CuString* CuStringNew(void);
-void CuStringRead(CuString* str, char* path);
-void CuStringAppend(CuString* str, const char* text);
-void CuStringAppendChar(CuString* str, char ch);
-void CuStringAppendFormat(CuString* str, const char* format, ...);
-void CuStringResize(CuString* str, int newSize);
-
-/* CuTest */
-
-typedef struct CuTest CuTest;
-
-typedef void (*TestFunction)(CuTest *);
-
-struct CuTest
-{
-	char* name;
-	TestFunction function;
-        int notimpl;
-	int failed;
-	int ran;
-	char* message;
-	jmp_buf *jumpBuf;
-};
-
-void CuInit(int argc, char *argv[]);
-void CuTestInit(CuTest* t, char* name, TestFunction function);
-CuTest* CuTestNew(char* name, TestFunction function);
-void CuFail(CuTest* tc, const char* message);
-void CuNotImpl(CuTest* tc, const char* message);
-void CuAssert(CuTest* tc, const char* message, int condition);
-void CuAssertTrue(CuTest* tc, int condition);
-void CuAssertStrEquals(CuTest* tc, const char* expected, const char* actual);
-void CuAssertStrNEquals(CuTest* tc, const char* expected, const char* actual,
-                        int n);
-void CuAssertIntEquals(CuTest* tc, int expected, int actual);
-void CuAssertPtrEquals(CuTest* tc, const void* expected, const void* actual);
-void CuAssertPtrNotNull(CuTest* tc, const void* pointer);
-
-void CuTestRun(CuTest* tc);
-
-/* CuSuite */
-
-#define MAX_TEST_CASES	1024	
-
-#define SUITE_ADD_TEST(SUITE,TEST)	CuSuiteAdd(SUITE, CuTestNew(#TEST, TEST))
-
-typedef struct
-{
-	char *name;
-	int count;
-	CuTest* list[MAX_TEST_CASES]; 
-	int failCount;
-	int notimplCount;
-
-} CuSuite;
-
-
-void CuSuiteInit(CuSuite* testSuite, char* name);
-CuSuite* CuSuiteNew(char* name);
-void CuSuiteAdd(CuSuite* testSuite, CuTest *testCase);
-void CuSuiteAddSuite(CuSuite* testSuite, CuSuite* testSuite2);
-void CuSuiteRun(CuSuite* testSuite);
-void CuSuiteSummary(CuSuite* testSuite, CuString* summary);
-void CuSuiteOverView(CuSuite* testSuite, CuString* details);
-void CuSuiteDetails(CuSuite* testSuite, CuString* details);
-
-typedef struct
-{
-	char *name;
-	int count;
-	CuSuite* list[MAX_TEST_CASES]; 
-} CuSuiteList;
-
-
-CuSuiteList* CuSuiteListNew(char* name);
-void CuSuiteListAdd(CuSuiteList* testSuite, CuSuite *testCase);
-void CuSuiteListRun(CuSuiteList* testSuite);
-void CuSuiteListRunWithSummary(CuSuiteList* testSuite);
-void CuSuiteListSummary(CuSuiteList* testSuite, CuString* summary);
-/* Print details of test suite results; returns total number of
- * tests which failed. */
-int CuSuiteListDetails(CuSuiteList* testSuite, CuString* details);
-#endif /* CU_TEST_H */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/MakeWin32Make.awk b/rubbos/app/httpd-2.0.64/srclib/apr/test/MakeWin32Make.awk
deleted file mode 100644
index c5529f8f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/MakeWin32Make.awk
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-
-    if (match($0, /\@INCLUDE_RULES\@/ ) ) {
-        print "ALL: \$(TARGETS)";
-	print "";
-        print "CL = cl.exe";
-        print "LINK = link.exe /nologo /debug /machine:I386 /subsystem:console /incremental:no ";
-	print "";
-        print "CFLAGS = /nologo /c /MDd /W3 /Gm /GX /Zi /Od /D _DEBUG /D WIN32 /D APR_DECLARE_STATIC /FD ";
-	print "";
-        print ".c.obj::";
-        $0 = "\t\$(CL) -c \$< \$(CFLAGS) \$(INCLUDES)";
-    }
-    if ( match( $0, /^ALL_LIBS=/ ) ) {
-        $0 = "";
-    }
-    if ( match( $0, /^LOCAL_LIBS=/ ) ) {
-        print "LOCAL_LIBS= ../LibD/apr.lib ";
-        print "ALL_LIBS= kernel32\.lib user32\.lib advapi32\.lib Rpcrt4\.lib ws2_32\.lib wsock32\.lib ole32\.lib ";
-	$0 = ""
-    }
-    if ( match( $0, /\@CFLAGS\@/ ) ) {
-        $0 = "";
-    }
-    gsub( /\$\([^\)]* [^\)]*\)/, "", $0 );
-    gsub( /\$\{LD_FLAGS\}/, "", $0 );
-    gsub( /\.\.\/libapr\.la/, "../LibD/apr.lib", $0 );
-    gsub( /\@RM\@/, "del", $0 );
-    if (gsub( /\$\(RM\) -f/, "del" ) ) {
-	gsub( /\*\.a/, "*.lib *.exp *.idb *.ilk *.pdb", $0 );
-	gsub( /Makefile/, "Makefile *.ncb *.opt", $0 );
-    }
-    gsub( /\@CC\@/, "cl", $0);
-    gsub( /\@RANLIB\@/, "", $0);
-    gsub( /-I\$\(INCDIR\)/, "/I \"$(INCDIR)\"", $0);
-
-    gsub( /\.\.\/libapr\.a/, "../LibD/apr.lib", $0 );
-    if ( gsub( /\@EXEEXT\@/, ".exe", $0 ) ) {
-        gsub( /\$\(CC\) \$\(CFLAGS\)/, "\$\(LINK\) /subsystem:console", $0 );
-        gsub( /-o (\S+)/, "/out:\"$1\"", $0 );
-        gsub( /--export-dynamic /, "", $0 );
-        gsub( /-fPIC /, "", $0 );
-    }
-    if ( gsub( /-shared/, "/subsystem:windows /dll", $0 ) ) {
-        gsub( /-o (\S+)/ "/out:\"$1\"", $0 );
-    }
-    gsub( /\$\(NONPORTABLE\)/, "", $0 );
-    gsub( /\.a /, ".lib ", $0 );
-    gsub( /\.o /, ".obj ", $0 );
-    gsub( /\.lo /, ".obj ", $0 );
-
-    print $0;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/test/Makefile
deleted file mode 100644
index bb66cf89..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/Makefile
+++ /dev/null
@@ -1,123 +0,0 @@
-srcdir = .
-
-
-# PROGRAMS includes all test programs built on this platform.
-# STDTEST_PORTABLE
-#   test programs invoked via standard user interface, run on all platforms
-# STDTEST_NONPORTABLE
-#   test programs invoked via standard user interface, not portable
-# OTHER_PROGRAMS
-#   programs such as sendfile, that have to be invoked in a special sequence
-#   or with special parameters
-
-STDTEST_PORTABLE = \
-	testflock \
-	testsock \
-	testlockperf \
-	testatomic \
-	testmutexscope \
-	testall
-
-STDTEST_NONPORTABLE = \
-	testshm \
-	testglobalmutex
-
-OTHER_PROGRAMS = client sendfile \
-	server
-
-PROGRAMS = $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) $(OTHER_PROGRAMS)
-
-TARGETS = $(PROGRAMS)
-
-# bring in rules.mk for standard functionality
-include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
-
-LOCAL_LIBS=../libapr-${APR_MAJOR_VERSION}.la
-
-CLEAN_TARGETS = testfile.tmp mod_test.slo proc_child occhild \
-readchild
-
-INCDIR=../include
-INCLUDES=-I$(INCDIR)
-
-check: $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
-	for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \
-		./$$prog; \
-		if test $$? = 255; then \
-			echo "$$prog failed"; \
-			break; \
-		fi; \
-	done
-
-testflock: testflock.lo $(LOCAL_LIBS)
-	$(LINK) testflock.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-occhild: occhild.lo $(LOCAL_LIBS)
-	$(LINK) occhild.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-readchild: readchild.lo $(LOCAL_LIBS)
-	$(LINK) readchild.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-proc_child: proc_child.lo $(LOCAL_LIBS)
-	$(LINK) proc_child.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-# FIXME: -prefer-pic is only supported with libtool-1.4+
-mod_test.slo: $(srcdir)/mod_test.c
-	$(LIBTOOL) --mode=compile $(COMPILE) -prefer-pic -c $(srcdir)/mod_test.c && touch $@
-
-mod_test.la: mod_test.slo $(LOCAL_LIBS)
-	$(LIBTOOL) --mode=link $(COMPILE) -rpath `pwd` -avoid-version -module mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
-
-libmod_test.la: mod_test.slo $(LOCAL_LIBS)
-	$(LIBTOOL) --mode=link $(COMPILE) -rpath `pwd` -avoid-version mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
-
-testlockperf: testlockperf.lo $(LOCAL_LIBS)
-	$(LINK) testlockperf.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-testsock: testsock.lo client server sendfile $(LOCAL_LIBS)
-	$(LINK) testsock.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-client: client.lo $(LOCAL_LIBS)
-	$(LINK) client.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-server: server.lo $(LOCAL_LIBS)
-	$(LINK) server.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-sendfile: sendfile.lo $(LOCAL_LIBS)
-	$(LINK) sendfile.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-testshm: testshm.lo $(LOCAL_LIBS) testshmproducer testshmconsumer
-	$(LINK) testshm.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-testshmproducer: testshmproducer.lo $(LOCAL_LIBS)
-	$(LINK) testshmproducer.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-testshmconsumer: testshmconsumer.lo $(LOCAL_LIBS)
-	$(LINK) testshmconsumer.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-testprocmutex: testprocmutex.lo $(LOCAL_LIBS)
-	$(LINK) testprocmutex.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-testglobalmutex: testglobalmutex.lo $(LOCAL_LIBS)
-	$(LINK) testglobalmutex.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-testatomic: testatomic.lo $(LOCAL_LIBS)
-	$(LINK) testatomic.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-testmutexscope: testmutexscope.lo $(LOCAL_LIBS)
-	$(LINK) testmutexscope.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-TESTS = testall.lo testtime.lo teststr.lo testvsn.lo testipsub.lo \
-	testmmap.lo testud.lo testtable.lo testsleep.lo testpools.lo \
-	testfmt.lo testfile.lo testdir.lo testfileinfo.lo testrand.lo \
-	testdso.lo testoc.lo testdup.lo testsockets.lo testproc.lo \
-	testpoll.lo testlock.lo testsockopt.lo testpipe.lo testthread.lo \
-	testhash.lo testargs.lo testnames.lo testuser.lo testpath.lo \
-	testenv.lo testprocmutex.lo
-
-testall: $(TESTS) mod_test.la libmod_test.la occhild \
-	 readchild CuTest.lo proc_child $(LOCAL_LIBS)
-	$(LINK) $(TESTS) CuTest.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/test/Makefile.in
deleted file mode 100644
index 1f7d047e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/Makefile.in
+++ /dev/null
@@ -1,123 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-# PROGRAMS includes all test programs built on this platform.
-# STDTEST_PORTABLE
-#   test programs invoked via standard user interface, run on all platforms
-# STDTEST_NONPORTABLE
-#   test programs invoked via standard user interface, not portable
-# OTHER_PROGRAMS
-#   programs such as sendfile, that have to be invoked in a special sequence
-#   or with special parameters
-
-STDTEST_PORTABLE = \
-	testflock@EXEEXT@ \
-	testsock@EXEEXT@ \
-	testlockperf@EXEEXT@ \
-	testatomic@EXEEXT@ \
-	testmutexscope@EXEEXT@ \
-	testall@EXEEXT@
-
-STDTEST_NONPORTABLE = \
-	testshm@EXEEXT@ \
-	testglobalmutex@EXEEXT@
-
-OTHER_PROGRAMS = client@EXEEXT@ sendfile@EXEEXT@ \
-	server@EXEEXT@
-
-PROGRAMS = $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) $(OTHER_PROGRAMS)
-
-TARGETS = $(PROGRAMS)
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-LOCAL_LIBS=../lib@APR_LIBNAME@.la
-
-CLEAN_TARGETS = testfile.tmp mod_test.slo proc_child@EXEEXT@ occhild@EXEEXT@ \
-readchild@EXEEXT@
-
-INCDIR=../include
-INCLUDES=-I$(INCDIR)
-
-check: $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
-	for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \
-		./$$prog; \
-		if test $$? = 255; then \
-			echo "$$prog failed"; \
-			break; \
-		fi; \
-	done
-
-testflock@EXEEXT@: testflock.lo $(LOCAL_LIBS)
-	$(LINK) testflock.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-occhild@EXEEXT@: occhild.lo $(LOCAL_LIBS)
-	$(LINK) occhild.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-readchild@EXEEXT@: readchild.lo $(LOCAL_LIBS)
-	$(LINK) readchild.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-proc_child@EXEEXT@: proc_child.lo $(LOCAL_LIBS)
-	$(LINK) proc_child.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-# FIXME: -prefer-pic is only supported with libtool-1.4+
-mod_test.slo: $(srcdir)/mod_test.c
-	$(LIBTOOL) --mode=compile $(COMPILE) -prefer-pic -c $(srcdir)/mod_test.c && touch $@
-
-mod_test.la: mod_test.slo $(LOCAL_LIBS)
-	$(LIBTOOL) --mode=link $(COMPILE) -rpath `pwd` -avoid-version -module mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
-
-libmod_test.la: mod_test.slo $(LOCAL_LIBS)
-	$(LIBTOOL) --mode=link $(COMPILE) -rpath `pwd` -avoid-version mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
-
-testlockperf@EXEEXT@: testlockperf.lo $(LOCAL_LIBS)
-	$(LINK) testlockperf.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-testsock@EXEEXT@: testsock.lo client@EXEEXT@ server@EXEEXT@ sendfile@EXEEXT@ $(LOCAL_LIBS)
-	$(LINK) testsock.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-client@EXEEXT@: client.lo $(LOCAL_LIBS)
-	$(LINK) client.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-server@EXEEXT@: server.lo $(LOCAL_LIBS)
-	$(LINK) server.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-sendfile@EXEEXT@: sendfile.lo $(LOCAL_LIBS)
-	$(LINK) sendfile.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-testshm@EXEEXT@: testshm.lo $(LOCAL_LIBS) testshmproducer@EXEEXT@ testshmconsumer@EXEEXT@
-	$(LINK) testshm.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-testshmproducer@EXEEXT@: testshmproducer.lo $(LOCAL_LIBS)
-	$(LINK) testshmproducer.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-testshmconsumer@EXEEXT@: testshmconsumer.lo $(LOCAL_LIBS)
-	$(LINK) testshmconsumer.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-testprocmutex@EXEEXT@: testprocmutex.lo $(LOCAL_LIBS)
-	$(LINK) testprocmutex.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-testglobalmutex@EXEEXT@: testglobalmutex.lo $(LOCAL_LIBS)
-	$(LINK) testglobalmutex.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-testatomic@EXEEXT@: testatomic.lo $(LOCAL_LIBS)
-	$(LINK) testatomic.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-testmutexscope@EXEEXT@: testmutexscope.lo $(LOCAL_LIBS)
-	$(LINK) testmutexscope.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-TESTS = testall.lo testtime.lo teststr.lo testvsn.lo testipsub.lo \
-	testmmap.lo testud.lo testtable.lo testsleep.lo testpools.lo \
-	testfmt.lo testfile.lo testdir.lo testfileinfo.lo testrand.lo \
-	testdso.lo testoc.lo testdup.lo testsockets.lo testproc.lo \
-	testpoll.lo testlock.lo testsockopt.lo testpipe.lo testthread.lo \
-	testhash.lo testargs.lo testnames.lo testuser.lo testpath.lo \
-	testenv.lo testprocmutex.lo
-
-testall: $(TESTS) mod_test.la libmod_test.la occhild@EXEEXT@ \
-	 readchild@EXEEXT@ CuTest.lo proc_child@EXEEXT@ $(LOCAL_LIBS)
-	$(LINK) $(TESTS) CuTest.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/Makefile.win b/rubbos/app/httpd-2.0.64/srclib/apr/test/Makefile.win
deleted file mode 100644
index bdedc4d4..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/Makefile.win
+++ /dev/null
@@ -1,113 +0,0 @@
-
-LINK=link /nologo
-
-NONPORTABLE = \
-	testshm.exe \
-	testglobalmutex.exe
-
-PROGRAMS = \
-	client.exe \
-	sendfile.exe \
-	server.exe \
-	proc_child.exe \
-	occhild.exe \
-	readchild.exe \
-	testflock.exe \
-	testsock.exe \
-	testlockperf.exe \
-	testshmproducer.exe \
-	testshmconsumer.exe \
-	testatomic.exe \
-	testmutexscope.exe \
-	testall.exe \
-	mod_test.so
-
-
-TARGETS = $(PROGRAMS)
-
-LOCAL_LIBS=..\LibD\apr.lib 
-ALL_LIBS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
-
-CLEAN_TARGETS = mod_test.lib mod_test.exp
-
-INCDIR=../include
-INCLUDES=/I "$(INCDIR)"
-
-all: $(TARGETS)
-
-clean:
-	-del $(CLEAN_TARGETS) $(PROGRAMS) *.obj *.pdb *.ilk 2>NUL
-
-.c.obj:
-	cl /nologo /c /MDd /W3 /EHsc /Zi /Od /DWIN32 /D_DEBUG /D_WINDOWS /DAPR_DECLARE_STATIC $(INCLUDES) $<
-
-testflock.exe: testflock.obj $(LOCAL_LIBS)
-	$(LINK) testflock.obj $(LOCAL_LIBS) $(ALL_LIBS)
-
-occhild.exe: occhild.obj $(LOCAL_LIBS)
-	$(LINK) occhild.obj $(LOCAL_LIBS) $(ALL_LIBS)
-
-readchild.exe: readchild.obj $(LOCAL_LIBS)
-	$(LINK) readchild.obj $(LOCAL_LIBS) $(ALL_LIBS)
-
-proc_child.exe: proc_child.obj $(LOCAL_LIBS)
-	$(LINK) /debug /subsystem:console \
-		proc_child.obj $(LOCAL_LIBS) $(ALL_LIBS)
-
-# FIXME: This is BS ... we should deal with namespace decoration within the
-# apr_dso_sym() function or within the test (take y'r pick) since many platforms
-# have decoration and decoration issues.
-mod_test.so: mod_test.obj
-	$(LINK) mod_test.obj /dll /out:mod_test.so $(LOCAL_LIBS) $(ALL_LIBS) \
-		/export:print_hello /export:count_reps
-
-testlockperf.exe: testlockperf.obj $(LOCAL_LIBS)
-	$(LINK) testlockperf.obj $(LOCAL_LIBS) $(ALL_LIBS)
-
-testsock.exe: testsock.obj client.exe server.exe sendfile.exe $(LOCAL_LIBS)
-	$(LINK) testsock.obj $(LOCAL_LIBS) $(ALL_LIBS)
-
-client.exe: client.obj $(LOCAL_LIBS)
-	$(LINK) client.obj $(LOCAL_LIBS) $(ALL_LIBS)
-
-server.exe: server.obj $(LOCAL_LIBS)
-	$(LINK) server.obj $(LOCAL_LIBS) $(ALL_LIBS)
-
-sendfile.exe: sendfile.obj $(LOCAL_LIBS)
-	$(LINK) sendfile.obj $(LOCAL_LIBS) $(ALL_LIBS)
-
-testshm.exe: testshm.obj $(LOCAL_LIBS) testshmproducer.exe testshmconsumer.exe
-	$(LINK) testshm.obj $(LOCAL_LIBS) $(ALL_LIBS)
-
-testshmproducer.exe: testshmproducer.obj $(LOCAL_LIBS)
-	$(LINK) testshmproducer.obj $(LOCAL_LIBS) $(ALL_LIBS)
-
-testshmconsumer.exe: testshmconsumer.obj $(LOCAL_LIBS)
-	$(LINK) testshmconsumer.obj $(LOCAL_LIBS) $(ALL_LIBS)
-
-testprocmutex.exe: testprocmutex.obj $(LOCAL_LIBS)
-	$(LINK) testprocmutex.obj $(LOCAL_LIBS) $(ALL_LIBS)
-
-testglobalmutex.exe: testglobalmutex.obj $(LOCAL_LIBS)
-	$(LINK) testglobalmutex.obj $(LOCAL_LIBS) $(ALL_LIBS)
-
-testatomic.exe: testatomic.obj $(LOCAL_LIBS)
-	$(LINK) testatomic.obj $(LOCAL_LIBS) $(ALL_LIBS)
-
-testmutexscope.exe: testmutexscope.obj $(LOCAL_LIBS)
-	$(LINK) testmutexscope.obj $(LOCAL_LIBS) $(ALL_LIBS)
-
-TESTS = testall.obj testtime.obj teststr.obj testvsn.obj testipsub.obj \
-	testmmap.obj testud.obj testtable.obj testsleep.obj testpools.obj \
-	testfmt.obj testfile.obj testdir.obj testfileinfo.obj testrand.obj \
-	testdso.obj testoc.obj testdup.obj testsockets.obj testproc.obj \
-	testpoll.obj testlock.obj testsockopt.obj testpipe.obj testthread.obj \
-	testhash.obj testargs.obj testnames.obj testuser.obj testpath.obj \
-	testenv.obj testprocmutex.obj
-
-testall.exe: $(TESTS) CuTest.obj $(LOCAL_LIBS)
-	$(LINK) /debug /subsystem:console $(TESTS) CuTest.obj \
-		$(LOCAL_LIBS) $(ALL_LIBS)
-
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/NWGNUaprtest b/rubbos/app/httpd-2.0.64/srclib/apr/test/NWGNUaprtest
deleted file mode 100644
index 76d1ca4c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/NWGNUaprtest
+++ /dev/null
@@ -1,287 +0,0 @@
-#
-# Make sure all needed macro's are defined
-#
-
-#
-# Get the 'head' of the build environment if necessary.  This includes default
-# targets and paths to tools
-#
-
-ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
-endif
-
-#
-# These directories will be at the beginning of the include list, followed by
-# INCDIRS
-#
-XINCDIRS	+= \
-			$(APR_WORK)/include \
-			$(APR_WORK)/include/arch/NetWare \
-			$(EOLIST)
-
-#
-# These flags will come after CFLAGS
-#
-XCFLAGS		+= \
-			$(EOLIST)
-
-#
-# These defines will come after DEFINES
-#
-XDEFINES	+= \
-			$(EOLIST)
-
-#
-# These flags will be added to the link.opt file
-#
-XLFLAGS		+= \
-			$(EOLIST)
-
-#
-# These values will be appended to the correct variables based on the value of
-# RELEASE
-#
-ifeq "$(RELEASE)" "debug"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "noopt"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "release"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-endif
-
-#
-# These are used by the link target if an NLM is being generated
-# This is used by the link 'name' directive to name the nlm.  If left blank
-# TARGET_nlm (see below) will be used.
-#
-NLM_NAME	= aprtest
-#
-# This is used by the link '-desc ' directive. 
-# If left blank, NLM_NAME will be used.
-#
-NLM_DESCRIPTION	=  NLM is to test the apr layer
-
-#
-# This is used by the '-threadname' directive.  If left blank,
-# NLM_NAME Thread will be used.
-#
-NLM_THREAD_NAME	= $(NLM_NAME) Thread
-
-#
-# This is used by the '-screenname' directive.  If left blank,
-# 'Apache for NetWare' Thread will be used.
-#
-NLM_SCREEN_NAME = $(NLM_NAME)
-
-#
-# If this is specified, it will override VERSION value in 
-# $(APR_WORK)\build\NWGNUenvironment.inc
-#
-NLM_VERSION	=
-
-#
-# If this is specified, it will override the default of 64K
-#
-NLM_STACK_SIZE	= 524288
-
-#
-# If this is specified it will be used by the link '-entry' directive
-#
-NLM_ENTRY_SYM	= _LibCPrelude
-
-#
-# If this is specified it will be used by the link '-exit' directive
-#
-NLM_EXIT_SYM	= _LibCPostlude
-
-#
-# If this is specified it will be used by the link '-check' directive
-#
-NLM_CHECK_SYM	=
-
-#
-# If this is specified it will be used by the link '-flags' directive
-#
-NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION
- 
-#
-# If this is specified it will be linked in with the XDCData option in the def 
-# file instead of the default of $(APR)/misc/netware/apache.xdc.  XDCData can 
-# be disabled by setting APACHE_UNIPROC in the environment
-#
-XDCDATA		= 
-
-#
-# Declare all target files (you must add your files here)
-#
-
-#
-# If there is an NLM target, put it here
-#
-TARGET_nlm = \
-	$(OBJDIR)/aprtest.nlm \
-	$(EOLIST)
-
-#
-# If there is an LIB target, put it here
-#
-TARGET_lib = \
-	$(EOLIST)
-
-#
-# These are the OBJ files needed to create the NLM target above.
-# Paths must all use the '/' character
-#
-FILES_nlm_objs = \
-	$(OBJDIR)/CuTest.o \
-	$(OBJDIR)/testall.o \
-	$(OBJDIR)/testargs.o \
-	$(OBJDIR)/testdir.o \
-	$(OBJDIR)/testdup.o \
-	$(OBJDIR)/testdso.o \
-	$(OBJDIR)/testenv.o \
-	$(OBJDIR)/testfileinfo.o \
-	$(OBJDIR)/testfile.o \
-	$(OBJDIR)/testfmt.o \
-	$(OBJDIR)/testhash.o \
-	$(OBJDIR)/testipsub.o \
-	$(OBJDIR)/testlock.o \
-	$(OBJDIR)/testmmap.o \
-	$(OBJDIR)/testnames.o \
-	$(OBJDIR)/testoc.o \
-	$(OBJDIR)/testpath.o \
-	$(OBJDIR)/testpoll.o \
-	$(OBJDIR)/testpools.o \
-	$(OBJDIR)/testproc.o \
-	$(OBJDIR)/testprocmutex.o \
-	$(OBJDIR)/testrand.o \
-	$(OBJDIR)/testsleep.o \
-	$(OBJDIR)/testsockets.o \
-	$(OBJDIR)/testsockopt.o \
-	$(OBJDIR)/teststr.o \
-	$(OBJDIR)/testthread.o \
-	$(OBJDIR)/testtime.o \
-	$(OBJDIR)/testtable.o \
-	$(OBJDIR)/testud.o \
-	$(OBJDIR)/testuser.o \
-	$(OBJDIR)/testvsn.o \
-	$(OBJDIR)/nw_misc.o \
-	$(OBJDIR)/testpipe.o \
-	$(EOLIST)
-
-# Pending tests
-	
-#
-# These are the LIB files needed to create the NLM target above.
-# These will be added as a library command in the link.opt file.
-#
-FILES_nlm_libs = \
-	libcpre.o \
-	$(EOLIST)
-
-#
-# These are the modules that the above NLM target depends on to load.
-# These will be added as a module command in the link.opt file.
-#
-FILES_nlm_modules = \
-	Libc \
-	APRLIB \
-	$(EOLIST)
-
-#
-# If the nlm has a msg file, put it's path here
-#
-FILE_nlm_msg =
- 
-#
-# If the nlm has a hlp file put it's path here
-#
-FILE_nlm_hlp =
-
-#
-# If this is specified, it will override the default copyright.
-#
-FILE_nlm_copyright =
-
-#
-# Any additional imports go here
-#
-FILES_nlm_Ximports = \
-	@libc.imp \
-	@$(APR)/aprlib.imp \
-	$(EOLIST)
- 
-#   
-# Any symbols exported to here
-#
-FILES_nlm_exports = \
-	$(EOLIST)
-
-#   
-# These are the OBJ files needed to create the LIB target above.
-# Paths must all use the '/' character
-#
-FILES_lib_objs = \
-	$(EOLIST)
-
-#
-# implement targets and dependancies (leave this section alone)
-#
-
-libs :: $(OBJDIR) $(TARGET_lib)
-
-nlms :: libs $(TARGET_nlm)
-
-#
-# Updated this target to create necessary directories and copy files to the 
-# correct place.  (See $(APR_WORK)\build\NWGNUhead.inc for examples)
-#
-install :: nlms FORCE
-
-#
-# Any specialized rules here
-#
-
-
-#
-# Include the 'tail' makefile that has targets that depend on variables defined
-# in this makefile
-#
-
-include $(APR_WORK)\build\NWGNUtail.inc
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/NWGNUmakefile b/rubbos/app/httpd-2.0.64/srclib/apr/test/NWGNUmakefile
deleted file mode 100644
index c63714a5..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/NWGNUmakefile
+++ /dev/null
@@ -1,260 +0,0 @@
-#
-# Declare the sub-directories to be built here
-#
-
-SUBDIRS = \
-	$(EOLIST) 
-
-#
-# Get the 'head' of the build environment.  This includes default targets and
-# paths to tools
-#
-
-include $(APR_WORK)\build\NWGNUhead.inc
-
-#
-# build this level's files
-
-#
-# Make sure all needed macro's are defined
-#
-
-
-#
-# These directories will be at the beginning of the include list, followed by
-# INCDIRS
-#
-XINCDIRS	+= \
-			$(APR_WORK)/include \
-			$(APR_WORK)/include/arch/NetWare \
-			$(EOLIST)
-
-#
-# These flags will come after CFLAGS
-#
-XCFLAGS		+= \
-			$(EOLIST)
-
-#
-# These defines will come after DEFINES
-#
-XDEFINES	+= \
-			$(EOLIST)
-
-#
-# These flags will be added to the link.opt file
-#
-XLFLAGS		+= \
-			$(EOLIST)
-
-#
-# These values will be appended to the correct variables based on the value of
-# RELEASE
-#
-ifeq "$(RELEASE)" "debug"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-						
-endif
-
-ifeq "$(RELEASE)" "noopt"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "release"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-endif
-
-#
-# These are used by the link target if an NLM is being generated
-# This is used by the link 'name' directive to name the nlm.  If left blank
-# TARGET_nlm (see below) will be used.
-#
-NLM_NAME		=	
-
-#
-# This is used by the link '-desc ' directive. 
-# If left blank, NLM_NAME will be used.
-#
-NLM_DESCRIPTION	=  NLM is to test the apr layer
-
-#
-# This is used by the '-threadname' directive.  If left blank,
-# NLM_NAME Thread will be used.
-#
-NLM_THREAD_NAME	= 
-
-#
-# This is used by the '-screenname' directive.  If left blank,
-# 'Apache for NetWare' Thread will be used.
-#
-NLM_SCREEN_NAME =
-
-#
-# If this is specified, it will override VERSION value in 
-# $(APR_WORK)\build\NWGNUenvironment.inc
-#
-NLM_VERSION		= 
-
-#
-# If this is specified, it will override the default of 64K
-#
-NLM_STACK_SIZE	= 
-
-#
-# If this is specified it will be used by the link '-entry' directive
-#
-NLM_ENTRY_SYM	= 
-
-#
-# If this is specified it will be used by the link '-exit' directive
-#
-NLM_EXIT_SYM	= 
-
-#
-# If this is specified it will be used by the link '-check' directive
-#
-NLM_CHECK_SYM	=
-
-#
-# If this is specified it will be used by the link '-flags' directive
-#
-NLM_FLAGS		=
- 
-#
-# If this is specified it will be linked in with the XDCData option in the def 
-# file instead of the default of $(APR)/misc/netware/apache.xdc.  XDCData can 
-# be disabled by setting APACHE_UNIPROC in the environment
-#
-XDCDATA         = 
-
-#
-# Declare all target files (you must add your files here)
-#
-
-#
-# If there is an NLM target, put it here
-#
-TARGET_nlm = \
-	$(OBJDIR)/aprtest.nlm \
-	$(OBJDIR)/mod_test.nlm \
-	$(OBJDIR)/proc_child.nlm \
-	$(OBJDIR)/testatmc.nlm \
-	$(EOLIST)
-#
-# If there is an LIB target, put it here
-#
-TARGET_lib = \
-	$(EOLIST)
-
-#
-# These are the OBJ files needed to create the NLM target above.
-# Paths must all use the '/' character
-#
-FILES_nlm_objs = \
-		$(EOLIST)
-
-#
-# These are the LIB files needed to create the NLM target above.
-# These will be added as a library command in the link.opt file.
-#
-FILES_nlm_libs = \
-   	$(EOLIST)
-
-#
-# These are the modules that the above NLM target depends on to load.
-# These will be added as a module command in the link.opt file.
-#
-FILES_nlm_modules = \
-	aprlib \
-  	$(EOLIST)
-
-#
-# If the nlm has a msg file, put it's path here
-#
-FILE_nlm_msg =
- 
-#
-# If the nlm has a hlp file put it's path here
-#
-FILE_nlm_hlp =
-
-#
-# If this is specified, it will override the default copyright.
-#
-FILE_nlm_copyright =
-
-#
-# Any additional imports go here
-#
-FILES_nlm_Ximports = \
-   	$(EOLIST)
- 
-#   
-# Any symbols exported to here
-#
-FILES_nlm_exports = \
-	$(EOLIST)
-	
-#   
-# These are the OBJ files needed to create the LIB target above.
-# Paths must all use the '/' character
-#
-FILES_lib_objs = \
-	$(EOLIST)
-
-#
-# implement targets and dependancies (leave this section alone)
-#
-
-libs :: $(OBJDIR) $(TARGET_lib)
-
-nlms :: libs $(TARGET_nlm)
-
-#
-# Updated this target to create necessary directories and copy files to the 
-# correct place.  (See $(APR_WORK)\build\NWGNUhead.inc for examples)
-#
-install :: nlms FORCE
-	  copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2
-
-#
-# Any specialized rules here
-#
-
-#
-# Include the 'tail' makefile that has targets that depend on variables defined
-# in this makefile
-#
-
-include $(APR_WORK)\build\NWGNUtail.inc
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/NWGNUmod_test b/rubbos/app/httpd-2.0.64/srclib/apr/test/NWGNUmod_test
deleted file mode 100644
index a454ef0c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/NWGNUmod_test
+++ /dev/null
@@ -1,254 +0,0 @@
-#
-# Make sure all needed macro's are defined
-#
-
-#
-# Get the 'head' of the build environment if necessary.  This includes default
-# targets and paths to tools
-#
-
-ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
-endif
-
-#
-# These directories will be at the beginning of the include list, followed by
-# INCDIRS
-#
-XINCDIRS	+= \
-			$(APR_WORK)/include \
-			$(APR_WORK)/include/arch/NetWare \
-			$(EOLIST)
-
-#
-# These flags will come after CFLAGS
-#
-XCFLAGS		+= \
-			$(EOLIST)
-
-#
-# These defines will come after DEFINES
-#
-XDEFINES	+= \
-			$(EOLIST)
-
-#
-# These flags will be added to the link.opt file
-#
-XLFLAGS		+= \
-			$(EOLIST)
-
-#
-# These values will be appended to the correct variables based on the value of
-# RELEASE
-#
-ifeq "$(RELEASE)" "debug"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "noopt"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "release"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-endif
-
-#
-# These are used by the link target if an NLM is being generated
-# This is used by the link 'name' directive to name the nlm.  If left blank
-# TARGET_nlm (see below) will be used.
-#
-NLM_NAME	= mod_test
-
-#
-# This is used by the link '-desc ' directive. 
-# If left blank, NLM_NAME will be used.
-#
-NLM_DESCRIPTION	=  DSO NLM to test the apr DSO loading layer
-
-#
-# This is used by the '-threadname' directive.  If left blank,
-# NLM_NAME Thread will be used.
-#
-NLM_THREAD_NAME	= $(NLM_NAME) Thread
-
-#
-# This is used by the '-screenname' directive.  If left blank,
-# 'Apache for NetWare' Thread will be used.
-#
-NLM_SCREEN_NAME = DEFAULT
-
-#
-# If this is specified, it will override VERSION value in 
-# $(APR_WORK)\build\NWGNUenvironment.inc
-#
-NLM_VERSION	=
-
-#
-# If this is specified, it will override the default of 64K
-#
-NLM_STACK_SIZE	= 
-
-#
-# If this is specified it will be used by the link '-entry' directive
-#
-NLM_ENTRY_SYM	= _LibCPrelude
-
-#
-# If this is specified it will be used by the link '-exit' directive
-#
-NLM_EXIT_SYM	= _LibCPostlude
-
-#
-# If this is specified it will be used by the link '-check' directive
-#
-NLM_CHECK_SYM	=
-
-#
-# If this is specified it will be used by the link '-flags' directive
-#
-NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION
- 
-#
-# If this is specified it will be linked in with the XDCData option in the def 
-# file instead of the default of $(APR)/misc/netware/apache.xdc.  XDCData can 
-# be disabled by setting APACHE_UNIPROC in the environment
-#
-XDCDATA		= 
-
-#
-# Declare all target files (you must add your files here)
-#
-
-#
-# If there is an NLM target, put it here
-#
-TARGET_nlm = \
-	$(OBJDIR)/mod_test.nlm \
-	$(EOLIST)
-
-#
-# If there is an LIB target, put it here
-#
-TARGET_lib = \
-	$(EOLIST)
-
-#
-# These are the OBJ files needed to create the NLM target above.
-# Paths must all use the '/' character
-#
-FILES_nlm_objs = \
-	$(OBJDIR)/mod_test.o \
-	$(EOLIST)
-
-#
-# These are the LIB files needed to create the NLM target above.
-# These will be added as a library command in the link.opt file.
-#
-FILES_nlm_libs = \
-	libcpre.o \
-	$(EOLIST)
-
-#
-# These are the modules that the above NLM target depends on to load.
-# These will be added as a module command in the link.opt file.
-#
-FILES_nlm_modules = \
-	aprlib \
-	Libc \
-	$(EOLIST)
-
-#
-# If the nlm has a msg file, put it's path here
-#
-FILE_nlm_msg =
- 
-#
-# If the nlm has a hlp file put it's path here
-#
-FILE_nlm_hlp =
-
-#
-# If this is specified, it will override the default copyright.
-#
-FILE_nlm_copyright =
-
-#
-# Any additional imports go here
-#
-FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
-	@libc.imp \
-	$(EOLIST)
- 
-#   
-# Any symbols exported to here
-#
-FILES_nlm_exports = \
-	print_hello \
-	count_reps \
-	$(EOLIST)
-
-#   
-# These are the OBJ files needed to create the LIB target above.
-# Paths must all use the '/' character
-#
-FILES_lib_objs = \
-	$(EOLIST)
-
-#
-# implement targets and dependancies (leave this section alone)
-#
-
-libs :: $(OBJDIR) $(TARGET_lib)
-
-nlms :: libs $(TARGET_nlm)
-
-#
-# Updated this target to create necessary directories and copy files to the 
-# correct place.  (See $(APR_WORK)\build\NWGNUhead.inc for examples)
-#
-install :: nlms FORCE
-
-#
-# Any specialized rules here
-#
-
-#
-# Include the 'tail' makefile that has targets that depend on variables defined
-# in this makefile
-#
-
-include $(APR_WORK)\build\NWGNUtail.inc
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/NWGNUproc_child b/rubbos/app/httpd-2.0.64/srclib/apr/test/NWGNUproc_child
deleted file mode 100644
index 090bbddf..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/NWGNUproc_child
+++ /dev/null
@@ -1,252 +0,0 @@
-#
-# Make sure all needed macro's are defined
-#
-
-#
-# Get the 'head' of the build environment if necessary.  This includes default
-# targets and paths to tools
-#
-
-ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
-endif
-
-#
-# These directories will be at the beginning of the include list, followed by
-# INCDIRS
-#
-XINCDIRS	+= \
-			$(APR_WORK)/include \
-			$(APR_WORK)/include/arch/NetWare \
-			$(EOLIST)
-
-#
-# These flags will come after CFLAGS
-#
-XCFLAGS		+= \
-			$(EOLIST)
-
-#
-# These defines will come after DEFINES
-#
-XDEFINES	+= \
-			$(EOLIST)
-
-#
-# These flags will be added to the link.opt file
-#
-XLFLAGS		+= \
-			$(EOLIST)
-
-#
-# These values will be appended to the correct variables based on the value of
-# RELEASE
-#
-ifeq "$(RELEASE)" "debug"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "noopt"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "release"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-endif
-
-#
-# These are used by the link target if an NLM is being generated
-# This is used by the link 'name' directive to name the nlm.  If left blank
-# TARGET_nlm (see below) will be used.
-#
-NLM_NAME	= proc_child
-
-#
-# This is used by the link '-desc ' directive. 
-# If left blank, NLM_NAME will be used.
-#
-NLM_DESCRIPTION	= child NLM to test the proc layer
-
-#
-# This is used by the '-threadname' directive.  If left blank,
-# NLM_NAME Thread will be used.
-#
-NLM_THREAD_NAME	= $(NLM_NAME) Thread
-
-#
-# This is used by the '-screenname' directive.  If left blank,
-# 'Apache for NetWare' Thread will be used.
-#
-NLM_SCREEN_NAME = DEFAULT
-
-#
-# If this is specified, it will override VERSION value in 
-# $(APR_WORK)\build\NWGNUenvironment.inc
-#
-NLM_VERSION	=
-
-#
-# If this is specified, it will override the default of 64K
-#
-NLM_STACK_SIZE	= 
-
-#
-# If this is specified it will be used by the link '-entry' directive
-#
-NLM_ENTRY_SYM	= _LibCPrelude
-
-#
-# If this is specified it will be used by the link '-exit' directive
-#
-NLM_EXIT_SYM	= _LibCPostlude
-
-#
-# If this is specified it will be used by the link '-check' directive
-#
-NLM_CHECK_SYM	=
-
-#
-# If this is specified it will be used by the link '-flags' directive
-#
-NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
- 
-#
-# If this is specified it will be linked in with the XDCData option in the def 
-# file instead of the default of $(APR)/misc/netware/apache.xdc.  XDCData can 
-# be disabled by setting APACHE_UNIPROC in the environment
-#
-XDCDATA		= 
-
-#
-# Declare all target files (you must add your files here)
-#
-
-#
-# If there is an NLM target, put it here
-#
-TARGET_nlm = \
-	$(OBJDIR)/proc_child.nlm \
-	$(EOLIST)
-
-#
-# If there is an LIB target, put it here
-#
-TARGET_lib = \
-	$(EOLIST)
-
-#
-# These are the OBJ files needed to create the NLM target above.
-# Paths must all use the '/' character
-#
-FILES_nlm_objs = \
-	$(OBJDIR)/proc_child.o \
-	$(EOLIST)
-
-#
-# These are the LIB files needed to create the NLM target above.
-# These will be added as a library command in the link.opt file.
-#
-FILES_nlm_libs = \
-	libcpre.o \
-	$(EOLIST)
-
-#
-# These are the modules that the above NLM target depends on to load.
-# These will be added as a module command in the link.opt file.
-#
-FILES_nlm_modules = \
-	aprlib \
-	Libc \
-	$(EOLIST)
-
-#
-# If the nlm has a msg file, put it's path here
-#
-FILE_nlm_msg =
- 
-#
-# If the nlm has a hlp file put it's path here
-#
-FILE_nlm_hlp =
-
-#
-# If this is specified, it will override the default copyright.
-#
-FILE_nlm_copyright =
-
-#
-# Any additional imports go here
-#
-FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
-	@libc.imp \
-	$(EOLIST)
- 
-#   
-# Any symbols exported to here
-#
-FILES_nlm_exports = \
-	$(EOLIST)
-
-#   
-# These are the OBJ files needed to create the LIB target above.
-# Paths must all use the '/' character
-#
-FILES_lib_objs = \
-	$(EOLIST)
-
-#
-# implement targets and dependancies (leave this section alone)
-#
-
-libs :: $(OBJDIR) $(TARGET_lib)
-
-nlms :: libs $(TARGET_nlm)
-
-#
-# Updated this target to create necessary directories and copy files to the 
-# correct place.  (See $(APR_WORK)\build\NWGNUhead.inc for examples)
-#
-install :: nlms FORCE
-
-#
-# Any specialized rules here
-#
-
-#
-# Include the 'tail' makefile that has targets that depend on variables defined
-# in this makefile
-#
-
-include $(APR_WORK)\build\NWGNUtail.inc
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/NWGNUtestatmc b/rubbos/app/httpd-2.0.64/srclib/apr/test/NWGNUtestatmc
deleted file mode 100644
index e24bf36a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/NWGNUtestatmc
+++ /dev/null
@@ -1,255 +0,0 @@
-#
-# Make sure all needed macro's are defined
-#
-
-#
-# Get the 'head' of the build environment if necessary.  This includes default
-# targets and paths to tools
-#
-
-ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
-endif
-
-#
-# These directories will be at the beginning of the include list, followed by
-# INCDIRS
-#
-XINCDIRS	+= \
-			$(APR_WORK)/include \
-			$(APR_WORK)/include/arch/NetWare \
-			$(EOLIST)
-
-#
-# These flags will come after CFLAGS
-#
-XCFLAGS		+= \
-			$(EOLIST)
-
-#
-# These defines will come after DEFINES
-#
-XDEFINES	+= \
-			$(EOLIST)
-
-#
-# These flags will be added to the link.opt file
-#
-XLFLAGS		+= \
-			$(EOLIST)
-
-#
-# These values will be appended to the correct variables based on the value of
-# RELEASE
-#
-ifeq "$(RELEASE)" "debug"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "noopt"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-endif
-
-ifeq "$(RELEASE)" "release"
-XINCDIRS	+= \
-			$(EOLIST)
-
-XCFLAGS		+= \
-			$(EOLIST)
-
-XDEFINES	+= \
-			$(EOLIST)
-
-XLFLAGS		+= \
-			$(EOLIST)
-endif
-
-#
-# These are used by the link target if an NLM is being generated
-# This is used by the link 'name' directive to name the nlm.  If left blank
-# TARGET_nlm (see below) will be used.
-#
-NLM_NAME	= testatmc
-#
-# This is used by the link '-desc ' directive. 
-# If left blank, NLM_NAME will be used.
-#
-NLM_DESCRIPTION	= NLM is to test the atomic functions
-
-#
-# This is used by the '-threadname' directive.  If left blank,
-# NLM_NAME Thread will be used.
-#
-NLM_THREAD_NAME	= $(NLM_NAME) Thread
-
-#
-# This is used by the '-screenname' directive.  If left blank,
-# 'Apache for NetWare' Thread will be used.
-#
-NLM_SCREEN_NAME = $(NLM_NAME)
-
-#
-# If this is specified, it will override VERSION value in 
-# $(APR_WORK)\build\NWGNUenvironment.inc
-#
-NLM_VERSION	=
-
-#
-# If this is specified, it will override the default of 64K
-#
-NLM_STACK_SIZE	=
-
-#
-# If this is specified it will be used by the link '-entry' directive
-#
-NLM_ENTRY_SYM	= _LibCPrelude
-
-#
-# If this is specified it will be used by the link '-exit' directive
-#
-NLM_EXIT_SYM	= _LibCPostlude
-
-#
-# If this is specified it will be used by the link '-check' directive
-#
-NLM_CHECK_SYM	=
-
-#
-# If this is specified it will be used by the link '-flags' directive
-#
-NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION
- 
-#
-# If this is specified it will be linked in with the XDCData option in the def 
-# file instead of the default of $(APR)/misc/netware/apache.xdc.  XDCData can 
-# be disabled by setting APACHE_UNIPROC in the environment
-#
-XDCDATA		= 
-
-#
-# Declare all target files (you must add your files here)
-#
-
-#
-# If there is an NLM target, put it here
-#
-TARGET_nlm = \
-	$(OBJDIR)/testatmc.nlm \
-	$(EOLIST)
-
-#
-# If there is an LIB target, put it here
-#
-TARGET_lib = \
-	$(EOLIST)
-
-#
-# These are the OBJ files needed to create the NLM target above.
-# Paths must all use the '/' character
-#
-FILES_nlm_objs = \
-	$(OBJDIR)/testatomic.o \
-	$(OBJDIR)/nw_misc.o \
-	$(EOLIST)
-
-# Pending tests
-
-#
-# These are the LIB files needed to create the NLM target above.
-# These will be added as a library command in the link.opt file.
-#
-FILES_nlm_libs = \
-	libcpre.o \
-	$(EOLIST)
-
-#
-# These are the modules that the above NLM target depends on to load.
-# These will be added as a module command in the link.opt file.
-#
-FILES_nlm_modules = \
-	Libc \
-	APRLIB \
-	$(EOLIST)
-
-#
-# If the nlm has a msg file, put it's path here
-#
-FILE_nlm_msg =
- 
-#
-# If the nlm has a hlp file put it's path here
-#
-FILE_nlm_hlp =
-
-#
-# If this is specified, it will override the default copyright.
-#
-FILE_nlm_copyright =
-
-#
-# Any additional imports go here
-#
-FILES_nlm_Ximports = \
-	@libc.imp \
-	@$(APR)/aprlib.imp \
-	$(EOLIST)
- 
-#   
-# Any symbols exported to here
-#
-FILES_nlm_exports = \
-	$(EOLIST)
-
-#   
-# These are the OBJ files needed to create the LIB target above.
-# Paths must all use the '/' character
-#
-FILES_lib_objs = \
-	$(EOLIST)
-
-#
-# implement targets and dependancies (leave this section alone)
-#
-
-libs :: $(OBJDIR) $(TARGET_lib)
-
-nlms :: libs $(TARGET_nlm)
-
-#
-# Updated this target to create necessary directories and copy files to the 
-# correct place.  (See $(APR_WORK)\build\NWGNUhead.inc for examples)
-#
-install :: nlms FORCE
-
-#
-# Any specialized rules here
-#
-
-
-#
-# Include the 'tail' makefile that has targets that depend on variables defined
-# in this makefile
-#
-
-include $(APR_WORK)\build\NWGNUtail.inc
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/README b/rubbos/app/httpd-2.0.64/srclib/apr/test/README
deleted file mode 100644
index 42ecdd47..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/README
+++ /dev/null
@@ -1,248 +0,0 @@
-Writing APR tests
-
-All APR tests should be executable in 2 ways, as an individual program, or
-as a part of the full test suite.  The full test suite is controlled with
-the testall program.  At the beginning of the testall.c file, there is an
-array of functions called tests.  The testall program loops through this 
-array calling each function.  Each function returns a CuSuite variable, which
-is then added to the SuiteList.  Once all Suites have been added, the SuiteList
-is executed, and the output is printed to the screen.  All functions in the
-array should follow the same basic format:
-
-The Full Suite
---------------
-
-/* The driver function.  This must return a CuSuite variable, which will
- * then be used to actually run the tests.  Essentially, all Suites are a
- * collection of tests.  The driver will take each Suite, and put it in a
- * SuiteList, which is a collection of Suites.
- */
-CuSuite *testtime(void)
-{
-    /* The actual suite, this must be created for each test program.  Please
-     * give it a useful name, that will inform the user of the feature being
-     * tested.
-     */
-    CuSuite *suite = CuSuiteNew("Test Time");
-
-    /* Each function must be added to the suite.  Each function represents
-     * a single test.  It is possible to test multiple features in a single
-     * function, although no tests currently do that.
-     */
-    SUITE_ADD_TEST(suite, test_now);
-    SUITE_ADD_TEST(suite, test_gmtstr);
-    SUITE_ADD_TEST(suite, test_localstr);
-    SUITE_ADD_TEST(suite, test_exp_get_gmt);
-    SUITE_ADD_TEST(suite, test_exp_get_lt);
-    SUITE_ADD_TEST(suite, test_imp_gmt);
-    SUITE_ADD_TEST(suite, test_rfcstr);
-    SUITE_ADD_TEST(suite, test_ctime);
-    SUITE_ADD_TEST(suite, test_strftime);
-    SUITE_ADD_TEST(suite, test_strftimesmall);
-    SUITE_ADD_TEST(suite, test_exp_tz);
-    SUITE_ADD_TEST(suite, test_strftimeoffset);
-
-    /* You must return the suite so that the driver knows which suites to
-     * run.
-     */
-    return suite;
-}
-
-Building the full driver
-------------------------
-
-All you need to do to build the full driver is run:
-
-    make testall
-
-To run it, run:
-
-    ./testall
-
-Caveats
--------
-
-Currently, some tests are known to fail in certain circumstances:
-
- * 'testpoll' opens 64 sockets concurrently; ensure that resource
-limits are high enough to allow this (using ulimit or limit); for
-instance, Solaris <=2.7 and HP-UX 11.00 both set the limit to <=64 by
-default
-
- * 'testipsub' will tickle the Solaris 8 getaddrinfo() IPv6
-bug, causing the test to hang.  Configure with --disable-ipv6 if using
-an unpatched Solaris 8 installation.
-
- * The 'testdso' tests will not work if configured with
---disable-shared since the loadable modules cannot be built.
-
-Running individual tests
----------------------------------
-
-It is not possible to build individual tests, however it is possible to
-run individual tests.  When running the test suite, specify the name of the
-tests that you want to run on the command line.  For example:
-
-	./testall teststr testrand
-
-Will run the Strings and Random generator tests.
-
-Reading the test suite output
------------------------------
-
-Once you run the test suite, you will get output like:
-
-All APR Tests:
-    Test Strings:       ....
-    Test Time:  ............
-
-16 tests run:  16 passed, 0 failed, 0 not implemented.
-
-There are a couple of things to look at with this.  First, if you look at the
-first function in this document, you should notice that the string passed to
-the CuSuiteNew function is in the output.  That is why the string should
-explain the feature you are testing.
-
-Second, this test passed completely.  This is obvious in two ways.  First, and
-most obvious, the summary line tells you that 16 tests were run and 16 tests
-passed.  However, the results can also be found in the lines above.  Every
-'.' in the output represents a passed test.
-
-If a test fails, the output will look like:
-
-All APR Tests:
-    Test Strings:       ....
-    Test Time:  ..F.........
-
-16 tests run:  15 passed, 1 failed, 0 not implemented.
-
-This is not very useful, because you don't know which test failed.  However,
-once you know that a test failed, you can run the suite again, with the
--v option.  If you do this, you will get something like:
-
-All APR Tests:
-    Test Strings:       ....
-    Test Time:  ..F.........
-
-16 tests run:  15 passed, 1 failed, 0 not implemented.
-Failed tests:
-1) test_localstr: assert failed
-
-In this case, we know the test_localstr function failed, and there is an
-Assert in this that failed (I modified the test to fail for this document).
-Now, you can look at what that test does, and why it would have failed.
-
-There is one other possible output for the test suite (run with -v):
-
-All APR Tests:
-    Test Strings:       ....
-    Test Time:  ..N.........
-
-16 tests run:  15 passed, 0 failed, 1 not implemented.
-
-Not Implemented tests:
-
-Not Implemented tests:
-1) test_localstr: apr_time_exp_lt not implemented on this platform
-
-The 'N' means that a function has returned APR_ENOTIMPL.  This should be 
-treated as an error, and the function should be implemented as soon as
-possible.
-
-Adding New test Suites to the full driver
--------------------------------------------
-
-To add a new Suite to the full driver, you must make a couple of modifications.
-
-1)  Edit test_apr.h, and add the prototype for the function.
-2)  Edit testall.c, and add the function and name to the tests array.
-3)  Edit Makefile.in, and add the .lo file to the testall target.
-
-Once those four things are done, your tests will automatically be added
-to the suite.
-
-Writing tests
--------------
-
-There are a couple of rules for writing good tests for the test suite.
-
-1)  All tests can determine for themselves if it passed or not.  This means
-that there is no reason for the person running the test suite to interpret
-the results of the tests.
-2)  Never use printf to add to the output of the test suite.  The suite
-library should be able to print all of the information required to debug
-a problem.
-3)  Functions should be tested with both positive and negative tests.  This
-means that you should test things that should both succeed and fail.
-4)  Just checking the return code does _NOT_ make a useful test.  You must
-check to determine that the test actually did what you expected it to do.
-
-An example test
----------------
-
-Finally, we will look at a quick test:
-
-/* All tests are passed a CuTest variable.  This is how the suite determines
- * if the test succeeded or failed.
- */
-static void test_localstr(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_time_exp_t xt;
-    time_t os_now;
-
-    rv = apr_time_exp_lt(&xt, now);
-    os_now = now / APR_USEC_PER_SEC;
-   
-    /* If the function can return APR_ENOTIMPL, then you should check for it.
-     * This allows platform implementors to know if they have to implement
-     * the function.
-     */
-    if (rv == APR_ENOTIMPL) {
-        CuNotImpl(tc, "apr_time_exp_lt");
-    }
-
-    /* It often helps to ensure that the return code was APR_SUCESS.  If it
-     * wasn't, then we know the test failed.
-     */
-    CuAssertTrue(tc, rv == APR_SUCCESS);
-
-    /* Now that we know APR thinks it worked properly, we need to check the
-     * output to ensure that we got what we expected.
-     */
-    CuAssertStrEquals(tc, "2002-08-14 12:05:36.186711 -25200 [257 Sat] DST",
-                      print_time(p, &xt));
-}
-
-Notice, the same test can fail for any of a number of reasons.  The first 
-test to fail ends the test.
-
-CuTest
-------
-
-CuTest is an open source test suite written by Asim Jalis.  It has been 
-released under the zlib/libpng license.  That license can be found in the
-CuTest.c and CuTest.h files.
-
-The version of CuTest that is included in the APR test suite has been modified
-from the original distribution in the following ways:
-
-1)  The original distribution does not have a -v flag, the details are always
-printed.
-2)  The NotImplemented result does not exist.
-3)  SuiteLists do not exist.  In the original distribution, you can add suites
-to suites, but it just adds the tests in the first suite to the list of tests
-in the original suite.  The output wasn't as detailed as I wanted, so I created
-SuiteLists.
-
-The first two modifications have been sent to the original author of CuTest,
-but they have not been integrated into the base distribution.  The SuiteList
-changes will be sent to the original author soon.
-
-The modified version of CuTest is not currently in any CVS or Subversion
-server.  In time, it will be hosted at rkbloom.net.
-
-There are currently no docs for how to write tests, but the teststr and 
-testtime programs should give an idea of how it is done.  In time, a document
-should be written to define how tests are written.
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/aprtest.def b/rubbos/app/httpd-2.0.64/srclib/apr/test/aprtest.def
deleted file mode 100644
index bfea210d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/aprtest.def
+++ /dev/null
@@ -1,3 +0,0 @@
-MODULE  LIBC.NLM
-MODULE  APRLIB.NLM
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/aprtest.dsp b/rubbos/app/httpd-2.0.64/srclib/apr/test/aprtest.dsp
deleted file mode 100644
index e31b898d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/aprtest.dsp
+++ /dev/null
@@ -1,199 +0,0 @@
-# Microsoft Developer Studio Project File - Name="aprtest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) External Target" 0x0106
-
-CFG=aprtest - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "aprtest.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "aprtest.mak" CFG="aprtest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "aprtest - Win32 Release" (based on "Win32 (x86) External Target")
-!MESSAGE "aprtest - Win32 Debug" (based on "Win32 (x86) External Target")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "aprtest - Win32 Release"
-
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Cmd_Line "NMAKE /f Makefile"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "aprtest.exe"
-# PROP BASE Bsc_Name "aprtest.bsc"
-# PROP BASE Target_Dir ""
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Cmd_Line "NMAKE /f aprtest.win"
-# PROP Rebuild_Opt "/a"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ELSEIF  "$(CFG)" == "aprtest - Win32 Debug"
-
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Cmd_Line "NMAKE /f aprtest.mak"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "aprtest.exe"
-# PROP BASE Bsc_Name "aprtest.bsc"
-# PROP BASE Target_Dir ""
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Cmd_Line "NMAKE /f aprtest.win"
-# PROP Rebuild_Opt "/a"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ENDIF 
-
-# Begin Target
-
-# Name "aprtest - Win32 Release"
-# Name "aprtest - Win32 Debug"
-
-!IF  "$(CFG)" == "aprtest - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "aprtest - Win32 Debug"
-
-!ENDIF 
-
-# Begin Group "Sources"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\abc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\client.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mod_test.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\occhild.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sendfile.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\server.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testargs.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testcontext.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testdso.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testfile.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testflock.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testlock.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testmmap.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testnames.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testoc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testpath.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testpipe.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testproc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testshm.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testsock.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testthread.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testtime.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testucs.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testuser.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testuuid.c
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\aprtest.win
-# End Source File
-# Begin Source File
-
-SOURCE=.\Makefile
-# End Source File
-# Begin Source File
-
-SOURCE=.\Makefile.in
-# End Source File
-# Begin Source File
-
-SOURCE=.\MakeWin32Make.awk
-# End Source File
-# End Target
-# End Project
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/aprtest.h b/rubbos/app/httpd-2.0.64/srclib/apr/test/aprtest.h
deleted file mode 100644
index 9da542b3..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/aprtest.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_strings.h"
-
-#ifndef APR_TEST_PREFIX
-#define APR_TEST_PREFIX ""
-#endif
-
-#define APR_TEST_BEGIN(rv, desc, op) \
-    fprintf(stdout, "%s%.*s ", APR_TEST_PREFIX desc,                  \
-            strlen(desc) < 37 ? (int)(40 - strlen(desc)) : 3,         \
-            "........................................");              \
-    APR_TEST_MORE(rv, op)
-
-#define APR_TEST_MORE(rv, op) \
-    if ((rv = (op)) != APR_SUCCESS) {                                 \
-        char msgbuf[256];                                             \
-        fprintf (stdout, "Failed\n");                                 \
-        fprintf (stderr, "Error (%d): %s\n%s", rv, #op,               \
-                 apr_strerror(rv, msgbuf, sizeof(msgbuf)));           \
-        exit(-1); }
-
-#define APR_TEST_END(rv, op) \
-    APR_TEST_MORE(rv, op)                                             \
-    fprintf(stdout, "OK\n");
-
-#define APR_TEST_SUCCESS(rv, desc, op) \
-    APR_TEST_BEGIN(rv, desc, op)                                      \
-    fprintf(stdout, "OK\n");
-
-#define APR_TEST_INITIALIZE(rv, pool) \
-    APR_TEST_SUCCESS(rv, "Initializing", apr_initialize());           \
-    atexit(apr_terminate);                                            \
-    APR_TEST_SUCCESS(rv, "Creating context",                          \
-                     apr_pool_create(&pool, NULL));
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/aprtest.win b/rubbos/app/httpd-2.0.64/srclib/apr/test/aprtest.win
deleted file mode 100644
index 85ad5b4d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/aprtest.win
+++ /dev/null
@@ -1,18 +0,0 @@
-# Note:
-#
-# You may need to modify the configuration of Build - Options - Directories
-# for the Executable path to include the perl interpreter within DevStudio.
-# E.g. add c:\program files\perl\bin to the list of directories
-
-!IF "$(TARGET)" == ""
-TARGET=ALL
-!ENDIF 
-
-$(TARGET): Makefile
-	$(MAKE) /nologo /f Makefile $(TARGET)
-
-Makefile: Makefile.in MakeWin32Make.awk
-	awk -f MakeWin32Make.awk <Makefile.in >Makefile
-
-clean:
-        del Makefile *.obj *.exe *.idb *.pdb
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/client.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/client.c
deleted file mode 100644
index bab7fe59..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/client.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdlib.h>
-#include "apr_network_io.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include <errno.h>
-
-#define STRLEN 15
-
-int main(int argc, char *argv[])
-{
-    apr_pool_t *context;
-    apr_socket_t *sock;
-    apr_size_t length;
-    apr_status_t stat;
-    char datasend[STRLEN] = "Send data test";
-    char datarecv[STRLEN];
-    char msgbuf[80];
-    char *local_ipaddr, *remote_ipaddr;
-    char *dest = "127.0.0.1";
-    apr_port_t local_port, remote_port;
-    apr_interval_time_t timeout = apr_time_from_sec(2);
-    apr_sockaddr_t *local_sa, *remote_sa;
-
-    setbuf(stdout, NULL);
-    if (argc > 1) {
-        dest = argv[1];
-    }
-
-    if (argc > 2) {
-        timeout = atoi(argv[2]);
-    }
-
-    fprintf(stdout, "Initializing.........");
-    if (apr_initialize() != APR_SUCCESS) {
-        fprintf(stderr, "Something went wrong\n");
-        exit(-1);
-    }
-    fprintf(stdout, "OK\n");
-    atexit(apr_terminate);
-
-    fprintf(stdout, "Creating context.......");
-    if (apr_pool_create(&context, NULL) != APR_SUCCESS) {
-        fprintf(stderr, "Something went wrong\n");
-        exit(-1);
-    }
-    fprintf(stdout, "OK\n");
-
-    fprintf(stdout,"\tClient:  Making socket address...............");
-    if ((stat = apr_sockaddr_info_get(&remote_sa, dest, APR_UNSPEC, 8021, 0, context)) 
-        != APR_SUCCESS) {
-        fprintf(stdout, "Failed!\n");
-        fprintf(stdout, "Address resolution failed for %s: %s\n", 
-                dest, apr_strerror(stat, msgbuf, sizeof(msgbuf)));
-        exit(-1);
-    }
-    fprintf(stdout,"OK\n");
-
-    fprintf(stdout, "\tClient:  Creating new socket.......");
-    if (apr_socket_create(&sock, remote_sa->family, SOCK_STREAM,
-                          context) != APR_SUCCESS) {
-        fprintf(stderr, "Couldn't create socket\n");
-        exit(-1);
-    }
-    fprintf(stdout, "OK\n");
-
-    fprintf(stdout, "\tClient:  Setting socket timeout.......");
-    stat = apr_socket_timeout_set(sock, timeout);
-    if (stat) {
-        fprintf(stderr, "Problem setting timeout: %d\n", stat);
-        exit(-1);
-    }
-    fprintf(stdout, "OK\n");
-
-    fprintf(stdout, "\tClient:  Connecting to socket.......");
-
-    stat = apr_socket_connect(sock, remote_sa);
-
-    if (stat != APR_SUCCESS) {
-        apr_socket_close(sock);
-        fprintf(stderr, "Could not connect: %s (%d)\n", 
-		apr_strerror(stat, msgbuf, sizeof(msgbuf)), stat);
-        fflush(stderr);
-        exit(-1);
-    }
-    fprintf(stdout, "OK\n");
-
-    apr_socket_addr_get(&remote_sa, APR_REMOTE, sock);
-    apr_sockaddr_ip_get(&remote_ipaddr, remote_sa);
-    apr_sockaddr_port_get(&remote_port, remote_sa);
-    apr_socket_addr_get(&local_sa, APR_LOCAL, sock);
-    apr_sockaddr_ip_get(&local_ipaddr, local_sa);
-    apr_sockaddr_port_get(&local_port, local_sa);
-    fprintf(stdout, "\tClient socket: %s:%u -> %s:%u\n", local_ipaddr, local_port, remote_ipaddr, remote_port);
-
-    fprintf(stdout, "\tClient:  Trying to send data over socket.......");
-    length = STRLEN;
-    if ((stat = apr_socket_send(sock, datasend, &length) != APR_SUCCESS)) {
-        apr_socket_close(sock);
-        fprintf(stderr, "Problem sending data: %s (%d)\n",
-		apr_strerror(stat, msgbuf, sizeof(msgbuf)), stat);
-        exit(-1);
-    }
-    fprintf(stdout, "OK\n");
-   
-    length = STRLEN; 
-    fprintf(stdout, "\tClient:  Trying to receive data over socket.......");
-
-    if ((stat = apr_socket_recv(sock, datarecv, &length)) != APR_SUCCESS) {
-        apr_socket_close(sock);
-        fprintf(stderr, "Problem receiving data: %s (%d)\n", 
-		apr_strerror(stat, msgbuf, sizeof(msgbuf)), stat);
-        exit(-1);
-    }
-    if (strcmp(datarecv, "Recv data test")) {
-        apr_socket_close(sock);
-        fprintf(stderr, "I did not receive the correct data %s\n", datarecv);
-        exit(-1);
-    }
-    fprintf(stdout, "OK\n");
-
-    fprintf(stdout, "\tClient:  Shutting down socket.......");
-    if (apr_socket_shutdown(sock, APR_SHUTDOWN_WRITE) != APR_SUCCESS) {
-        apr_socket_close(sock);
-        fprintf(stderr, "Could not shutdown socket\n");
-        exit(-1);
-    }
-    fprintf(stdout, "OK\n");
-
-    fprintf(stdout, "\tClient:  Closing down socket.......");
-    if (apr_socket_close(sock) != APR_SUCCESS) {
-        fprintf(stderr, "Could not shutdown socket\n");
-        exit(-1);
-    }
-    fprintf(stdout, "OK\n");
-
-    return 1;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/data/file_datafile.txt b/rubbos/app/httpd-2.0.64/srclib/apr/test/data/file_datafile.txt
deleted file mode 100644
index 1651a329..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/data/file_datafile.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is the file data file.
\ No newline at end of file
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/data/mmap_datafile.txt b/rubbos/app/httpd-2.0.64/srclib/apr/test/data/mmap_datafile.txt
deleted file mode 100644
index 50f47a60..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/data/mmap_datafile.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is the MMAP data file.
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/internal/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/test/internal/Makefile
deleted file mode 100644
index 5a790860..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/internal/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-srcdir = .
-
-
-NONPORTABLE = \
-	testregex
-
-PROGRAMS = \
-
-TARGETS = $(PROGRAMS) $(NONPORTABLE)
-
-# bring in rules.mk for standard functionality
-include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
-
-LOCAL_LIBS=../../libapr-${APR_MAJOR_VERSION}.la
-
-CLEAN_TARGETS = testregex
-
-INCDIR=../../include
-INCLUDES=-I$(INCDIR)
-
-CFLAGS=$(MY_CFLAGS)
-
-all: $(PROGRAMS) $(NONPORTABLE)
-
-check: $(PROGRAMS) $(NONPORTABLE)
-	for prog in $(PROGRAMS) $(NONPORTABLE); do \
-		./$$prog; \
-		if test $$i = 255; then \
-			echo "$$prog failed"; \
-			break; \
-		fi \
-	done
-
-testregex: testregex.lo $(LOCAL_LIBS)
-	$(LINK) testregex.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/internal/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/test/internal/Makefile.in
deleted file mode 100644
index b1f6c6a6..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/internal/Makefile.in
+++ /dev/null
@@ -1,37 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-NONPORTABLE = \
-	testregex@EXEEXT@
-
-PROGRAMS = \
-
-TARGETS = $(PROGRAMS) $(NONPORTABLE)
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-LOCAL_LIBS=../../lib@APR_LIBNAME@.la
-
-CLEAN_TARGETS = testregex@EXEEXT@
-
-INCDIR=../../include
-INCLUDES=-I$(INCDIR)
-
-CFLAGS=$(MY_CFLAGS)
-
-all: $(PROGRAMS) $(NONPORTABLE)
-
-check: $(PROGRAMS) $(NONPORTABLE)
-	for prog in $(PROGRAMS) $(NONPORTABLE); do \
-		./$$prog; \
-		if test $$i = 255; then \
-			echo "$$prog failed"; \
-			break; \
-		fi \
-	done
-
-testregex@EXEEXT@: testregex.lo $(LOCAL_LIBS)
-	$(LINK) testregex.lo $(LOCAL_LIBS) $(ALL_LIBS)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/internal/testregex.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/internal/testregex.c
deleted file mode 100644
index 20dcfdeb..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/internal/testregex.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "apr_strings.h"
-#include "apr_pools.h"
-#include "apr_general.h"
-#include "apr_hash.h"
-#include "apr_lib.h"
-#include "apr_time.h"
-#include <regex.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int main( int argc, char** argv) {
-    apr_pool_t *context;
-    regex_t regex;
-    int rc;
-    int i;
-    int iters;
-    apr_time_t now;
-    apr_time_t end;
-    apr_hash_t *h;
-    
-
-    if (argc !=4 ) {
-            fprintf(stderr, "Usage %s match string #iterations\n",argv[0]);
-            return -1;
-    }
-    iters = atoi( argv[3]);
-    
-    apr_initialize() ;
-    atexit(apr_terminate);
-    if (apr_pool_create(&context, NULL) != APR_SUCCESS) {
-        fprintf(stderr, "Something went wrong\n");
-        exit(-1);
-    }
-    rc = regcomp( &regex, argv[1], REG_EXTENDED|REG_NOSUB);
-
-
-    if (rc) {
-        char errbuf[2000];
-        regerror(rc, &regex,errbuf,2000);
-        fprintf(stderr,"Couldn't compile regex ;(\n%s\n ",errbuf);
-        return -1;
-    }
-    if ( regexec( &regex, argv[2], 0, NULL,0) == 0 ) {
-        fprintf(stderr,"Match\n");
-    }
-    else {
-        fprintf(stderr,"No Match\n");
-    }
-    now = apr_time_now();
-    for (i=0;i<iters;i++) {
-        regexec( &regex, argv[2], 0, NULL,0) ;
-    }
-    end=apr_time_now();
-    puts(apr_psprintf( context, "Time to run %d regex's          %8lld\n",iters,end-now));
-    h = apr_hash_make( context);
-    for (i=0;i<70;i++) {
-            apr_hash_set(h,apr_psprintf(context, "%dkey",i),APR_HASH_KEY_STRING,"1");
-    }
-    now = apr_time_now();
-    for (i=0;i<iters;i++) {
-        apr_hash_get( h, argv[2], APR_HASH_KEY_STRING);
-    }
-    end=apr_time_now();
-    puts(apr_psprintf( context, "Time to run %d hash (no find)'s %8lld\n",iters,end-now));
-    apr_hash_set(h, argv[2],APR_HASH_KEY_STRING,"1");
-    now = apr_time_now();
-    for (i=0;i<iters;i++) {
-        apr_hash_get( h, argv[2], APR_HASH_KEY_STRING);
-    }
-    end=apr_time_now();
-    puts(apr_psprintf( context, "Time to run %d hash (find)'s    %8lld\n",iters,end-now));
- 
-    return 0;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/internal/testucs.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/internal/testucs.c
deleted file mode 100644
index ca735d23..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/internal/testucs.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "arch/win32/apr_arch_utf8.h"
-#include <wchar.h>
-#include <string.h>
-
-struct testval {
-    unsigned char n[8];
-    wchar_t w[4];
-    int nl;
-    int wl;
-};
-
-void displaynw(struct testval *f, struct testval *l)
-{
-    char x[80], *t = x;
-    int i;
-    for (i = 0; i < f->nl; ++i)
-        t += sprintf(t, "%02X ", f->n[i]);
-    *(t++) = '-';
-    for (i = 0; i < l->nl; ++i)
-        t += sprintf(t, " %02X", l->n[i]);
-    *(t++) = ' ';
-    *(t++) = '=';
-    *(t++) = ' '; 
-    for (i = 0; i < f->wl; ++i)
-        t += sprintf(t, "%04X ", f->w[i]);
-    *(t++) = '-';
-    for (i = 0; i < l->wl; ++i)
-        t += sprintf(t, " %04X", l->w[i]);
-    puts(x);
-}
-
-/*
- *  Test every possible byte value. 
- *  If the test passes or fails at this byte value we are done.
- *  Otherwise iterate test_nrange again, appending another byte.
- */
-void test_nrange(struct testval *p)
-{
-    struct testval f, l, s;
-    apr_status_t rc;
-    int success = 0;
-    
-    memcpy (&s, p, sizeof(s));
-    ++s.nl;    
-    
-    do {
-        apr_size_t nl = s.nl, wl = sizeof(s.w) / 2;
-        rc = apr_conv_utf8_to_ucs2(s.n, &nl, s.w, &wl);
-        s.wl = (sizeof(s.w) / 2) - wl;
-        if (!nl && rc == APR_SUCCESS) {
-            if (!success) {
-                memcpy(&f, &s, sizeof(s));
-                success = -1;
-            }
-            else {
-                if (s.wl != l.wl 
-                 || memcmp(s.w, l.w, (s.wl - 1) * 2) != 0
-                 || s.w[s.wl - 1] != l.w[l.wl - 1] + 1) {
-                    displaynw(&f, &l);
-                    memcpy(&f, &s, sizeof(s));
-                }
-            }            
-            memcpy(&l, &s, sizeof(s));
-        }
-        else {
-            if (success) {
-                displaynw(&f, &l);
-                success = 0;
-            }
-            if (rc == APR_INCOMPLETE) {
-                test_nrange(&s);
-            }
-        }
-    } while (++s.n[s.nl - 1]);
-
-    if (success) {
-        displaynw(&f, &l);
-        success = 0;
-    }
-}
-
-/* 
- *  Test every possible word value. 
- *  Once we are finished, retest every possible word value.
- *  if the test fails on the following null word, iterate test_nrange 
- *  again, appending another word.
- *  This assures the output order of the two tests are in sync.
- */
-void test_wrange(struct testval *p)
-{
-    struct testval f, l, s;
-    apr_status_t rc;
-    int success = 0;
-    
-    memcpy (&s, p, sizeof(s));
-    ++s.wl;    
-    
-    do {
-        apr_size_t nl = sizeof(s.n), wl = s.wl;        
-        rc = apr_conv_ucs2_to_utf8(s.w, &wl, s.n, &nl);
-        s.nl = sizeof(s.n) - nl;
-        if (!wl && rc == APR_SUCCESS) {
-            if (!success) {
-                memcpy(&f, &s, sizeof(s));
-                success = -1;
-            }
-            else {
-                if (s.nl != l.nl 
-                 || memcmp(s.n, l.n, s.nl - 1) != 0
-                 || s.n[s.nl - 1] != l.n[l.nl - 1] + 1) {
-                    displaynw(&f, &l);
-                    memcpy(&f, &s, sizeof(s));
-                }
-            }            
-            memcpy(&l, &s, sizeof(s));
-        }
-        else {
-            if (success) {
-                displaynw(&f, &l);
-                success = 0;
-            }
-        }
-    } while (++s.w[s.wl - 1]);
-
-    if (success) {
-        displaynw(&f, &l);
-        success = 0;
-    }
-
-    do {
-        int wl = s.wl, nl = sizeof(s.n);
-        rc = apr_conv_ucs2_to_utf8(s.w, &wl, s.n, &nl);
-        s.nl = sizeof(s.n) - s.nl;
-        if (rc == APR_INCOMPLETE) {
-            test_wrange(&s);
-        }
-    } while (++s.w[s.wl - 1]);
-}
-
-/*
- *  Syntax: testucs [w|n]
- *
- *  If arg is not recognized, run both tests.
- */
-int main(int argc, char **argv)
-{
-    struct testval s;
-    memset (&s, 0, sizeof(s));
-
-    if (argc < 2 || apr_tolower(*argv[1]) != 'w') {
-        printf ("\n\nTesting Narrow Char Ranges\n");
-        test_nrange(&s);
-    }
-    if (argc < 2 || apr_tolower(*argv[1]) != 'n') {
-        printf ("\n\nTesting Wide Char Ranges\n");
-        test_wrange(&s);
-    }
-    return 0;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/mod_test.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/mod_test.c
deleted file mode 100644
index 2178e940..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/mod_test.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_strings.h"
-
-void print_hello(char str[256]);
-int count_reps(int reps);
-
-void print_hello(char str[256])
-{
-    apr_cpystrn(str, "Hello - I'm a DSO!\n", strlen("Hello - I'm a DSO!\n") + 1);
-}
-
-int count_reps(int reps)
-{
-    int i = 0;
-    for (i = 0;i < reps; i++);
-    return i;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/nw_misc.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/nw_misc.c
deleted file mode 100644
index 2f670935..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/nw_misc.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <netware.h>
-#include <screen.h>
-#include "test_apr.h"
-
-void _NonAppStop( void )
-{
-  if (getenv("_IN_NETWARE_BASH_") == NULL)
-    pressanykey();
-}
-
-static void test_not_impl(CuTest *tc)
-{
-    CuNotImpl(tc, "Test not implemented on this platform yet");
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/occhild.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/occhild.c
deleted file mode 100644
index a96885d8..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/occhild.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "apr.h"
-#include "apr_file_io.h"
-#include "apr.h"
-
-#if APR_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-int main(void)
-{
-    char buf[256];
-    apr_file_t *err;
-    apr_pool_t *p;
-
-    apr_initialize();
-    atexit(apr_terminate);
-
-    apr_pool_create(&p, NULL);
-    apr_file_open_stdin(&err, p);
-
-    while (1) {
-        apr_size_t length = 256;
-        apr_file_read(err, buf, &length);
-    }
-    exit(0); /* just to keep the compiler happy */
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/proc_child.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/proc_child.c
deleted file mode 100644
index 405bb7f5..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/proc_child.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "apr.h"
-#include <stdio.h>
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#if APR_HAVE_IO_H
-#include <io.h>
-#endif
-#include <stdlib.h>
-
-int main(void)
-{
-    char buf[256];
-    apr_ssize_t bytes;
-    
-    bytes = read(STDIN_FILENO, buf, 256);
-    if (bytes > 0)
-        write(STDOUT_FILENO, buf, bytes);
-
-    return 0; /* just to keep the compiler happy */
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/readchild.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/readchild.c
deleted file mode 100644
index f8443cce..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/readchild.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdlib.h>
-
-#include "apr_file_io.h"
-
-int main(int argc, char *argv[])
-{
-    apr_file_t *in, *out;
-    apr_size_t nbytes, total_bytes;
-    apr_pool_t *p;
-    char buf[128];
-    apr_status_t rv;
-    
-    apr_initialize();
-    atexit(apr_terminate);
-    apr_pool_create(&p, NULL);
-
-    apr_file_open_stdin(&in, p);
-    apr_file_open_stdout(&out, p);
-
-    total_bytes = 0;
-    nbytes = sizeof(buf);
-    while ((rv = apr_file_read(in, buf, &nbytes)) == APR_SUCCESS) {
-        total_bytes += nbytes;
-        nbytes = sizeof(buf);
-    }
-
-    apr_file_printf(out, "%" APR_SIZE_T_FMT " bytes were read\n",
-                    total_bytes);
-    return 0;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/sendfile.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/sendfile.c
deleted file mode 100644
index b14765fd..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/sendfile.c
+++ /dev/null
@@ -1,749 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <assert.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include "apr_network_io.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_poll.h"
-
-#if !APR_HAS_SENDFILE
-int main(void)
-{
-    fprintf(stderr, 
-            "This program won't work on this platform because there is no "
-            "support for sendfile().\n");
-    return 0;
-}
-#else /* !APR_HAS_SENDFILE */
-
-#define FILE_LENGTH    200000
-
-#define FILE_DATA_CHAR '0'
-
-#define HDR1           "1234567890ABCD\n"
-#define HDR2           "EFGH\n"
-#define HDR3_LEN       80000
-#define HDR3_CHAR      '^'
-#define TRL1           "IJKLMNOPQRSTUVWXYZ\n"
-#define TRL2           "!@#$%&*()\n"
-#define TRL3_LEN       90000
-#define TRL3_CHAR      '@'
-
-#define TESTSF_PORT    8021
-
-#define TESTFILE       "testsf.dat"
-
-typedef enum {BLK, NONBLK, TIMEOUT} client_socket_mode_t;
-
-static void apr_setup(apr_pool_t **p, apr_socket_t **sock, int *family)
-{
-    char buf[120];
-    apr_status_t rv;
-
-    rv = apr_initialize();
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "apr_initialize()->%d/%s\n",
-                rv,
-                apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-
-    atexit(apr_terminate);
-
-    rv = apr_pool_create(p, NULL);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "apr_pool_create()->%d/%s\n",
-                rv,
-                apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-
-    *sock = NULL;
-    rv = apr_socket_create(sock, *family, SOCK_STREAM, *p);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "apr_socket_create()->%d/%s\n",
-                rv,
-                apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-
-    if (*family == APR_UNSPEC) {
-        apr_sockaddr_t *localsa;
-
-        rv = apr_socket_addr_get(&localsa, APR_LOCAL, *sock);
-        if (rv != APR_SUCCESS) {
-            fprintf(stderr, "apr_socket_addr_get()->%d/%s\n",
-                    rv,
-                    apr_strerror(rv, buf, sizeof buf));
-            exit(1);
-        }
-        *family = localsa->family;
-    }
-}
-
-static void create_testfile(apr_pool_t *p, const char *fname)
-{
-    apr_file_t *f = NULL;
-    apr_status_t rv;
-    char buf[120];
-    int i;
-    apr_finfo_t finfo;
-
-    printf("Creating a test file...\n");
-    rv = apr_file_open(&f, fname, 
-                 APR_CREATE | APR_WRITE | APR_TRUNCATE | APR_BUFFERED,
-                 APR_UREAD | APR_UWRITE, p);
-    if (rv) {
-        fprintf(stderr, "apr_file_open()->%d/%s\n",
-                rv, apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-    
-    buf[0] = FILE_DATA_CHAR;
-    buf[1] = '\0';
-    for (i = 0; i < FILE_LENGTH; i++) {
-        /* exercise apr_file_putc() and apr_file_puts() on buffered files */
-        if ((i % 2) == 0) {
-            rv = apr_file_putc(buf[0], f);
-            if (rv) {
-                fprintf(stderr, "apr_file_putc()->%d/%s\n",
-                        rv, apr_strerror(rv, buf, sizeof buf));
-                exit(1);
-            }
-        }
-        else {
-            rv = apr_file_puts(buf, f);
-            if (rv) {
-                fprintf(stderr, "apr_file_puts()->%d/%s\n",
-                        rv, apr_strerror(rv, buf, sizeof buf));
-                exit(1);
-            }
-        }
-    }
-
-    rv = apr_file_close(f);
-    if (rv) {
-        fprintf(stderr, "apr_file_close()->%d/%s\n",
-                rv, apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-
-    rv = apr_stat(&finfo, fname, APR_FINFO_NORM, p);
-    if (rv != APR_SUCCESS && rv != APR_INCOMPLETE) {
-        fprintf(stderr, "apr_stat()->%d/%s\n",
-                rv, apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-
-    if (finfo.size != FILE_LENGTH) {
-        fprintf(stderr, 
-                "test file %s should be %ld-bytes long\n"
-                "instead it is %ld-bytes long\n",
-                fname,
-                (long int)FILE_LENGTH,
-                (long int)finfo.size);
-        exit(1);
-    }
-}
-
-static int client(client_socket_mode_t socket_mode, char *host)
-{
-    apr_status_t rv, tmprv;
-    apr_socket_t *sock;
-    apr_pool_t *p;
-    char buf[120];
-    apr_file_t *f = NULL;
-    apr_size_t len;
-    apr_size_t expected_len;
-    apr_off_t current_file_offset;
-    apr_hdtr_t hdtr;
-    struct iovec headers[3];
-    struct iovec trailers[3];
-    apr_size_t bytes_read;
-    apr_pollfd_t *pfd;
-    apr_int32_t nsocks;
-    int i;
-    int family;
-    apr_sockaddr_t *destsa;
-
-    family = APR_INET;
-    apr_setup(&p, &sock, &family);
-    create_testfile(p, TESTFILE);
-
-    rv = apr_file_open(&f, TESTFILE, APR_READ, 0, p);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "apr_file_open()->%d/%s\n",
-                rv,
-                apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-
-    if (!host) {
-        host = "127.0.0.1";
-    }
-    rv = apr_sockaddr_info_get(&destsa, host, family, TESTSF_PORT, 0, p);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "apr_sockaddr_info_get()->%d/%s\n",
-                rv,
-                apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-
-    rv = apr_socket_connect(sock, destsa);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "apr_socket_connect()->%d/%s\n", 
-                rv,
-		apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-
-    switch(socket_mode) {
-    case BLK:
-        /* leave it blocking */
-        break;
-    case NONBLK:
-        /* set it non-blocking */
-        rv = apr_socket_opt_set(sock, APR_SO_NONBLOCK, 1);
-        if (rv != APR_SUCCESS) {
-            fprintf(stderr, "apr_socket_opt_set(APR_SO_NONBLOCK)->%d/%s\n", 
-                    rv,
-                    apr_strerror(rv, buf, sizeof buf));
-            exit(1);
-        }
-        break;
-    case TIMEOUT:
-        /* set a timeout */
-        rv = apr_socket_timeout_set(sock, 100 * APR_USEC_PER_SEC);
-        if (rv != APR_SUCCESS) {
-            fprintf(stderr, "apr_socket_opt_set(APR_SO_NONBLOCK)->%d/%s\n", 
-                    rv,
-                    apr_strerror(rv, buf, sizeof buf));
-            exit(1);
-        }
-        break;
-    default:
-        assert(1 != 1);
-    }
-
-    printf("Sending the file...\n");
-
-    hdtr.headers = headers;
-    hdtr.numheaders = 3;
-    hdtr.headers[0].iov_base = HDR1;
-    hdtr.headers[0].iov_len  = strlen(hdtr.headers[0].iov_base);
-    hdtr.headers[1].iov_base = HDR2;
-    hdtr.headers[1].iov_len  = strlen(hdtr.headers[1].iov_base);
-    hdtr.headers[2].iov_base = malloc(HDR3_LEN);
-    assert(hdtr.headers[2].iov_base);
-    memset(hdtr.headers[2].iov_base, HDR3_CHAR, HDR3_LEN);
-    hdtr.headers[2].iov_len  = HDR3_LEN;
-
-    hdtr.trailers = trailers;
-    hdtr.numtrailers = 3;
-    hdtr.trailers[0].iov_base = TRL1;
-    hdtr.trailers[0].iov_len  = strlen(hdtr.trailers[0].iov_base);
-    hdtr.trailers[1].iov_base = TRL2;
-    hdtr.trailers[1].iov_len  = strlen(hdtr.trailers[1].iov_base);
-    hdtr.trailers[2].iov_base = malloc(TRL3_LEN);
-    memset(hdtr.trailers[2].iov_base, TRL3_CHAR, TRL3_LEN);
-    assert(hdtr.trailers[2].iov_base);
-    hdtr.trailers[2].iov_len  = TRL3_LEN;
-
-    expected_len = 
-        strlen(HDR1) + strlen(HDR2) + HDR3_LEN +
-        strlen(TRL1) + strlen(TRL2) + TRL3_LEN +
-        FILE_LENGTH;
-    
-    if (socket_mode == BLK) {
-        current_file_offset = 0;
-        len = FILE_LENGTH;
-        rv = apr_socket_sendfile(sock, f, &hdtr, &current_file_offset, &len, 0);
-        if (rv != APR_SUCCESS) {
-            fprintf(stderr, "apr_socket_sendfile()->%d/%s\n",
-                    rv,
-                    apr_strerror(rv, buf, sizeof buf));
-            exit(1);
-        }
-        
-        printf("apr_socket_sendfile() updated offset with %ld\n",
-               (long int)current_file_offset);
-        
-        printf("apr_socket_sendfile() updated len with %ld\n",
-               (long int)len);
-        
-        printf("bytes really sent: %" APR_SIZE_T_FMT "\n",
-               expected_len);
-
-        if (len != expected_len) {
-            fprintf(stderr, "apr_socket_sendfile() didn't report the correct "
-                    "number of bytes sent!\n");
-            exit(1);
-        }
-    }
-    else {
-        /* non-blocking... wooooooo */
-        apr_size_t total_bytes_sent;
-
-        pfd = NULL;
-        rv = apr_poll_setup(&pfd, 1, p);
-        assert(!rv);
-        rv = apr_poll_socket_add(pfd, sock, APR_POLLOUT);
-        assert(!rv);
-
-        total_bytes_sent = 0;
-        current_file_offset = 0;
-        len = FILE_LENGTH;
-        do {
-            apr_size_t tmplen;
-
-            tmplen = len; /* bytes remaining to send from the file */
-            printf("Calling apr_socket_sendfile()...\n");
-            printf("Headers (%d):\n", hdtr.numheaders);
-            for (i = 0; i < hdtr.numheaders; i++) {
-                printf("\t%ld bytes (%c)\n",
-                       (long)hdtr.headers[i].iov_len,
-                       *(char *)hdtr.headers[i].iov_base);
-            }
-            printf("File: %ld bytes from offset %ld\n",
-                   (long)tmplen, (long)current_file_offset);
-            printf("Trailers (%d):\n", hdtr.numtrailers);
-            for (i = 0; i < hdtr.numtrailers; i++) {
-                printf("\t%ld bytes\n",
-                       (long)hdtr.trailers[i].iov_len);
-            }
-
-            rv = apr_socket_sendfile(sock, f, &hdtr, &current_file_offset, &tmplen, 0);
-            printf("apr_socket_sendfile()->%d, sent %ld bytes\n", rv, (long)tmplen);
-            if (rv) {
-                if (APR_STATUS_IS_EAGAIN(rv)) {
-                    assert(tmplen == 0);
-                    nsocks = 1;
-                    tmprv = apr_poll(pfd, 1, &nsocks, -1);
-                    assert(!tmprv);
-                    assert(nsocks == 1);
-                    /* continue; */
-                }
-            }
-
-            total_bytes_sent += tmplen;
-
-            /* Adjust hdtr to compensate for partially-written
-             * data.
-             */
-
-            /* First, skip over any header data which might have
-             * been written.
-             */
-            while (tmplen && hdtr.numheaders) {
-                if (tmplen >= hdtr.headers[0].iov_len) {
-                    tmplen -= hdtr.headers[0].iov_len;
-                    --hdtr.numheaders;
-                    ++hdtr.headers;
-                }
-                else {
-                    hdtr.headers[0].iov_len -= tmplen;
-                    hdtr.headers[0].iov_base = 
-			(char*) hdtr.headers[0].iov_base + tmplen;
-                    tmplen = 0;
-                }
-            }
-
-            /* Now, skip over any file data which might have been
-             * written.
-             */
-
-            if (tmplen <= len) {
-                current_file_offset += tmplen;
-                len -= tmplen;
-                tmplen = 0;
-            }
-            else {
-                tmplen -= len;
-                len = 0;
-                current_file_offset = 0;
-            }
-
-            /* Last, skip over any trailer data which might have
-             * been written.
-             */
-
-            while (tmplen && hdtr.numtrailers) {
-                if (tmplen >= hdtr.trailers[0].iov_len) {
-                    tmplen -= hdtr.trailers[0].iov_len;
-                    --hdtr.numtrailers;
-                    ++hdtr.trailers;
-                }
-                else {
-                    hdtr.trailers[0].iov_len -= tmplen;
-                    hdtr.trailers[0].iov_base = 
-			(char *)hdtr.trailers[0].iov_base + tmplen;
-                    tmplen = 0;
-                }
-            }
-
-        } while (total_bytes_sent < expected_len &&
-                 (rv == APR_SUCCESS || 
-                 (APR_STATUS_IS_EAGAIN(rv) && socket_mode != TIMEOUT)));
-        if (total_bytes_sent != expected_len) {
-            fprintf(stderr,
-                    "client problem: sent %ld of %ld bytes\n",
-                    (long)total_bytes_sent, (long)expected_len);
-            exit(1);
-        }
-
-        if (rv) {
-            fprintf(stderr,
-                    "client problem: rv %d\n",
-                    rv);
-            exit(1);
-        }
-    }
-    
-    current_file_offset = 0;
-    rv = apr_file_seek(f, APR_CUR, &current_file_offset);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "apr_file_seek()->%d/%s\n",
-                rv,
-		apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-
-    printf("After apr_socket_sendfile(), the kernel file pointer is "
-           "at offset %ld.\n",
-           (long int)current_file_offset);
-
-    rv = apr_socket_shutdown(sock, APR_SHUTDOWN_WRITE);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "apr_socket_shutdown()->%d/%s\n",
-                rv,
-		apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-
-    /* in case this is the non-blocking test, set socket timeout;
-     * we're just waiting for EOF */
-
-    rv = apr_socket_timeout_set(sock, apr_time_from_sec(3));
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "apr_socket_timeout_set()->%d/%s\n",
-                rv,
-		apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-    
-    bytes_read = 1;
-    rv = apr_socket_recv(sock, buf, &bytes_read);
-    if (rv != APR_EOF) {
-        fprintf(stderr, "apr_socket_recv()->%d/%s (expected APR_EOF)\n",
-                rv,
-		apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-    if (bytes_read != 0) {
-        fprintf(stderr, "We expected to get 0 bytes read with APR_EOF\n"
-                "but instead we read %ld bytes.\n",
-                (long int)bytes_read);
-        exit(1);
-    }
-
-    printf("client: apr_socket_sendfile() worked as expected!\n");
-
-    rv = apr_file_remove(TESTFILE, p);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "apr_file_remove()->%d/%s\n",
-                rv,
-		apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-
-    return 0;
-}
-
-static int server(void)
-{
-    apr_status_t rv;
-    apr_socket_t *sock;
-    apr_pool_t *p;
-    char buf[120];
-    int i;
-    apr_socket_t *newsock = NULL;
-    apr_size_t bytes_read;
-    apr_sockaddr_t *localsa;
-    int family;
-
-    family = APR_UNSPEC;
-    apr_setup(&p, &sock, &family);
-
-    rv = apr_socket_opt_set(sock, APR_SO_REUSEADDR, 1);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "apr_socket_opt_set()->%d/%s\n",
-                rv,
-		apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-
-    rv = apr_sockaddr_info_get(&localsa, NULL, family, TESTSF_PORT, 0, p);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "apr_sockaddr_info_get()->%d/%s\n",
-                rv,
-		apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-
-    rv = apr_socket_bind(sock, localsa);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "apr_socket_bind()->%d/%s\n",
-                rv,
-		apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-
-    rv = apr_socket_listen(sock, 5);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "apr_socket_listen()->%d/%s\n",
-                rv,
-		apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-
-    printf("Waiting for a client to connect...\n");
-
-    rv = apr_socket_accept(&newsock, sock, p);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "apr_socket_accept()->%d/%s\n",
-                rv,
-		apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-
-    printf("Processing a client...\n");
-
-    assert(sizeof buf > strlen(HDR1));
-    bytes_read = strlen(HDR1);
-    rv = apr_socket_recv(newsock, buf, &bytes_read);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "apr_socket_recv()->%d/%s\n",
-                rv,
-		apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-    if (bytes_read != strlen(HDR1)) {
-        fprintf(stderr, "wrong data read (1)\n");
-        exit(1);
-    }
-    if (memcmp(buf, HDR1, strlen(HDR1))) {
-        fprintf(stderr, "wrong data read (2)\n");
-        fprintf(stderr, "received: `%.*s'\nexpected: `%s'\n",
-                (int)bytes_read, buf, HDR1);
-        exit(1);
-    }
-        
-    assert(sizeof buf > strlen(HDR2));
-    bytes_read = strlen(HDR2);
-    rv = apr_socket_recv(newsock, buf, &bytes_read);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "apr_socket_recv()->%d/%s\n",
-                rv,
-		apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-    if (bytes_read != strlen(HDR2)) {
-        fprintf(stderr, "wrong data read (3)\n");
-        exit(1);
-    }
-    if (memcmp(buf, HDR2, strlen(HDR2))) {
-        fprintf(stderr, "wrong data read (4)\n");
-        fprintf(stderr, "received: `%.*s'\nexpected: `%s'\n",
-                (int)bytes_read, buf, HDR2);
-        exit(1);
-    }
-
-    for (i = 0; i < HDR3_LEN; i++) {
-        bytes_read = 1;
-        rv = apr_socket_recv(newsock, buf, &bytes_read);
-        if (rv != APR_SUCCESS) {
-            fprintf(stderr, "apr_socket_recv()->%d/%s\n",
-                    rv,
-                    apr_strerror(rv, buf, sizeof buf));
-            exit(1);
-        }
-        if (bytes_read != 1) {
-            fprintf(stderr, "apr_socket_recv()->%ld bytes instead of 1\n",
-                    (long int)bytes_read);
-            exit(1);
-        }
-        if (buf[0] != HDR3_CHAR) {
-            fprintf(stderr,
-                    "problem with data read (byte %d of hdr 3):\n",
-                    i);
-            fprintf(stderr, "read `%c' (0x%x) from client; expected "
-                    "`%c'\n",
-                    buf[0], buf[0], HDR3_CHAR);
-            exit(1);
-        }
-    }
-        
-    for (i = 0; i < FILE_LENGTH; i++) {
-        bytes_read = 1;
-        rv = apr_socket_recv(newsock, buf, &bytes_read);
-        if (rv != APR_SUCCESS) {
-            fprintf(stderr, "apr_socket_recv()->%d/%s\n",
-                    rv,
-                    apr_strerror(rv, buf, sizeof buf));
-            exit(1);
-        }
-        if (bytes_read != 1) {
-            fprintf(stderr, "apr_socket_recv()->%ld bytes instead of 1\n",
-                    (long int)bytes_read);
-            exit(1);
-        }
-        if (buf[0] != FILE_DATA_CHAR) {
-            fprintf(stderr,
-                    "problem with data read (byte %d of file):\n",
-                    i);
-            fprintf(stderr, "read `%c' (0x%x) from client; expected "
-                    "`%c'\n",
-                    buf[0], buf[0], FILE_DATA_CHAR);
-            exit(1);
-        }
-    }
-        
-    assert(sizeof buf > strlen(TRL1));
-    bytes_read = strlen(TRL1);
-    rv = apr_socket_recv(newsock, buf, &bytes_read);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "apr_socket_recv()->%d/%s\n",
-                rv,
-		apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-    if (bytes_read != strlen(TRL1)) {
-        fprintf(stderr, "wrong data read (5)\n");
-        exit(1);
-    }
-    if (memcmp(buf, TRL1, strlen(TRL1))) {
-        fprintf(stderr, "wrong data read (6)\n");
-        fprintf(stderr, "received: `%.*s'\nexpected: `%s'\n",
-                (int)bytes_read, buf, TRL1);
-        exit(1);
-    }
-        
-    assert(sizeof buf > strlen(TRL2));
-    bytes_read = strlen(TRL2);
-    rv = apr_socket_recv(newsock, buf, &bytes_read);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "apr_socket_recv()->%d/%s\n",
-                rv,
-		apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-    if (bytes_read != strlen(TRL2)) {
-        fprintf(stderr, "wrong data read (7)\n");
-        exit(1);
-    }
-    if (memcmp(buf, TRL2, strlen(TRL2))) {
-        fprintf(stderr, "wrong data read (8)\n");
-        fprintf(stderr, "received: `%.*s'\nexpected: `%s'\n",
-                (int)bytes_read, buf, TRL2);
-        exit(1);
-    }
-
-    for (i = 0; i < TRL3_LEN; i++) {
-        bytes_read = 1;
-        rv = apr_socket_recv(newsock, buf, &bytes_read);
-        if (rv != APR_SUCCESS) {
-            fprintf(stderr, "apr_socket_recv()->%d/%s\n",
-                    rv,
-                    apr_strerror(rv, buf, sizeof buf));
-            exit(1);
-        }
-        if (bytes_read != 1) {
-            fprintf(stderr, "apr_socket_recv()->%ld bytes instead of 1\n",
-                    (long int)bytes_read);
-            exit(1);
-        }
-        if (buf[0] != TRL3_CHAR) {
-            fprintf(stderr,
-                    "problem with data read (byte %d of trl 3):\n",
-                    i);
-            fprintf(stderr, "read `%c' (0x%x) from client; expected "
-                    "`%c'\n",
-                    buf[0], buf[0], TRL3_CHAR);
-            exit(1);
-        }
-    }
-        
-    bytes_read = 1;
-    rv = apr_socket_recv(newsock, buf, &bytes_read);
-    if (rv != APR_EOF) {
-        fprintf(stderr, "apr_socket_recv()->%d/%s (expected APR_EOF)\n",
-                rv,
-		apr_strerror(rv, buf, sizeof buf));
-        exit(1);
-    }
-    if (bytes_read != 0) {
-        fprintf(stderr, "We expected to get 0 bytes read with APR_EOF\n"
-                "but instead we read %ld bytes (%c).\n",
-                (long int)bytes_read, buf[0]);
-        exit(1);
-    }
-
-    printf("server: apr_socket_sendfile() worked as expected!\n");
-
-    return 0;
-}
-
-int main(int argc, char *argv[])
-{
-#ifdef SIGPIPE
-    signal(SIGPIPE, SIG_IGN);
-#endif
-
-    /* Gee whiz this is goofy logic but I wanna drive sendfile right now, 
-     * not dork around with the command line!
-     */
-    if (argc >= 3 && !strcmp(argv[1], "client")) {
-        char *host = 0;
-        if (argv[3]) {
-            host = argv[3];
-        }	
-        if (!strcmp(argv[2], "blocking")) {
-            return client(BLK, host);
-        }
-        else if (!strcmp(argv[2], "timeout")) {
-            return client(TIMEOUT, host);
-        }
-        else if (!strcmp(argv[2], "nonblocking")) {
-            return client(NONBLK, host);
-        }
-    }
-    else if (argc == 2 && !strcmp(argv[1], "server")) {
-        return server();
-    }
-
-    fprintf(stderr, 
-            "Usage: %s client {blocking|nonblocking|timeout}\n"
-            "       %s server\n",
-            argv[0], argv[0]);
-    return -1;
-}
-
-#endif /* !APR_HAS_SENDFILE */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/server.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/server.c
deleted file mode 100644
index 03c10270..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/server.c
+++ /dev/null
@@ -1,167 +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.
- */
-
-#define APR_TEST_PREFIX "server: "
-
-#include "aprtest.h"
-#include <stdlib.h>
-#include "apr_network_io.h"
-#include "apr_getopt.h"
-#include "apr_poll.h"
-
-#define STRLEN 15
-
-int main(int argc, const char * const argv[])
-{
-    apr_pool_t *context;
-    apr_status_t rv;
-    apr_socket_t *sock;
-    apr_socket_t *sock2;
-    apr_size_t length;
-    apr_int32_t pollres;
-    apr_pollfd_t *sdset;
-    char datasend[STRLEN];
-    char datarecv[STRLEN] = "Recv data test";
-    const char *bind_to_ipaddr = NULL;
-    char *local_ipaddr, *remote_ipaddr;
-    apr_port_t local_port, remote_port;
-    apr_sockaddr_t *localsa = NULL, *remotesa;
-    apr_status_t stat;
-    int family = APR_UNSPEC;
-    int protocol;
-    apr_getopt_t *opt;
-    const char *optarg;
-    char optchar;
-
-    APR_TEST_INITIALIZE(rv, context);
-
-    APR_TEST_SUCCESS(rv, "Preparing getopt", 
-                     apr_getopt_init(&opt, context, argc, argv))
-    
-    while ((stat = apr_getopt(opt, "i:", &optchar, &optarg)) == APR_SUCCESS) {
-        switch(optchar) {
-        case 'i':
-            bind_to_ipaddr = optarg;
-            break;
-        }
-    }
-    if (stat != APR_EOF) {
-        fprintf(stderr,
-                "usage: %s [-i local-interface-address]\n",
-                argv[0]);
-        exit(-1);
-    }
-
-    if (bind_to_ipaddr) {
-        /* First, parse/resolve ipaddr so we know what address family of
-         * socket we need.  We'll use the returned sockaddr later when
-         * we bind.
-         */
-        APR_TEST_SUCCESS(rv, "Preparing sockaddr", 
-            apr_sockaddr_info_get(&localsa, bind_to_ipaddr, APR_UNSPEC, 8021, 0, context))
-        family = localsa->family;
-    }
-
-    APR_TEST_SUCCESS(rv, "Creating new socket", 
-        apr_socket_create_ex(&sock, family, SOCK_STREAM, APR_PROTO_TCP, context))
-
-    APR_TEST_SUCCESS(rv, "Setting option APR_SO_NONBLOCK",
-        apr_socket_opt_set(sock, APR_SO_NONBLOCK, 1))
-
-    APR_TEST_SUCCESS(rv, "Setting option APR_SO_REUSEADDR",
-        apr_socket_opt_set(sock, APR_SO_REUSEADDR, 1))
-
-    if (!localsa) {
-        apr_socket_addr_get(&localsa, APR_LOCAL, sock);
-        apr_sockaddr_port_set(localsa, 8021);
-    }
-
-    APR_TEST_SUCCESS(rv, "Binding socket to port",
-        apr_socket_bind(sock, localsa))
-    
-    APR_TEST_SUCCESS(rv, "Listening to socket",
-        apr_socket_listen(sock, 5))
-    
-    APR_TEST_BEGIN(rv, "Setting up for polling",
-        apr_poll_setup(&sdset, 1, context))
-    APR_TEST_END(rv, 
-        apr_poll_socket_add(sdset, sock, APR_POLLIN))
-    
-    pollres = 1; 
-    APR_TEST_BEGIN(rv, "Polling for socket",
-        apr_poll(sdset, 1, &pollres, -1))
-
-    if (pollres == 0) {
-        fprintf(stdout, "Failed\n");
-        apr_socket_close(sock);
-        fprintf(stderr, "Error: Unrecognized poll result, "
-                "expected 1, received %d\n", pollres);
-        exit(-1);
-    }
-    fprintf(stdout, "OK\n");
-
-    APR_TEST_SUCCESS(rv, "Accepting a connection",
-        apr_socket_accept(&sock2, sock, context))
-
-    apr_socket_protocol_get(sock2, &protocol);
-    if (protocol != APR_PROTO_TCP) {
-        fprintf(stderr, "Error: protocol not conveyed from listening socket "
-                "to connected socket!\n");
-        exit(1);
-    }
-    apr_socket_addr_get(&remotesa, APR_REMOTE, sock2);
-    apr_sockaddr_ip_get(&remote_ipaddr, remotesa);
-    apr_sockaddr_port_get(&remote_port, remotesa);
-    apr_socket_addr_get(&localsa, APR_LOCAL, sock2);
-    apr_sockaddr_ip_get(&local_ipaddr, localsa);
-    apr_sockaddr_port_get(&local_port, localsa);
-    fprintf(stdout, "Server socket: %s:%u -> %s:%u\n", local_ipaddr, 
-            local_port, remote_ipaddr, remote_port);
-
-    APR_TEST_SUCCESS(rv, "Setting timeout on client socket",
-        apr_socket_timeout_set(sock2, apr_time_from_sec(3)));
-
-    length = STRLEN;
-    APR_TEST_BEGIN(rv, "Receiving data from socket",
-        apr_socket_recv(sock2, datasend, &length))
-
-    if (strcmp(datasend, "Send data test")) {
-        fprintf(stdout, "Failed\n");
-        apr_socket_close(sock);
-        apr_socket_close(sock2);
-        fprintf(stderr, "Error: Unrecognized response;\n"
-                "Expected: \"Send data test\"\n"
-                "Received: \"%s\"\n", datarecv);
-        exit(-1);
-    }
-    fprintf(stdout, "OK\n");
-
-    length = STRLEN;
-    APR_TEST_SUCCESS(rv, "Sending data over socket",
-        apr_socket_send(sock2, datarecv, &length))
-    
-    APR_TEST_SUCCESS(rv, "Shutting down accepted socket",
-        apr_socket_shutdown(sock2, APR_SHUTDOWN_READ))
-
-    APR_TEST_SUCCESS(rv, "Closing duplicate socket",
-        apr_socket_close(sock2))
-    
-    APR_TEST_SUCCESS(rv, "Closing original socket",
-        apr_socket_close(sock))
-
-    return 0;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/test_apr.h b/rubbos/app/httpd-2.0.64/srclib/apr/test/test_apr.h
deleted file mode 100644
index 7bb8dab7..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/test_apr.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef APR_TEST_INCLUDES
-#define APR_TEST_INCLUDES
-
-#include "CuTest.h"
-#include "apr_pools.h"
-
-/* Some simple functions to make the test apps easier to write and
- * a bit more consistent...
- */
-
-extern apr_pool_t *p;
-
-CuSuite *getsuite(void);
-
-CuSuite *teststr(void);
-CuSuite *testtime(void);
-CuSuite *testvsn(void);
-CuSuite *testipsub(void);
-CuSuite *testmmap(void);
-CuSuite *testud(void);
-CuSuite *testtable(void);
-CuSuite *testhash(void);
-CuSuite *testsleep(void);
-CuSuite *testpool(void);
-CuSuite *testfmt(void);
-CuSuite *testfile(void);
-CuSuite *testdir(void);
-CuSuite *testfileinfo(void);
-CuSuite *testrand(void);
-CuSuite *testdso(void);
-CuSuite *testoc(void);
-CuSuite *testdup(void);
-CuSuite *testsockets(void);
-CuSuite *testproc(void);
-CuSuite *testprocmutex(void);
-CuSuite *testpoll(void);
-CuSuite *testlock(void);
-CuSuite *testsockopt(void);
-CuSuite *testpipe(void);
-CuSuite *testthread(void);
-CuSuite *testgetopt(void);
-CuSuite *testnames(void);
-CuSuite *testuser(void);
-CuSuite *testpath(void);
-CuSuite *testenv(void);
-
-/* Assert that RV is an APR_SUCCESS value; else fail giving strerror
- * for RV and CONTEXT message. */
-void apr_assert_success(CuTest* tc, const char *context, apr_status_t rv);
-
-
-#endif /* APR_TEST_INCLUDES */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testall.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testall.c
deleted file mode 100644
index c7e8fe9c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testall.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "test_apr.h"
-
-/* Top-level pool which can be used by tests. */
-apr_pool_t *p;
-
-void apr_assert_success(CuTest* tc, const char* context, apr_status_t rv)
-{
-    if (rv == APR_ENOTIMPL) {
-        CuNotImpl(tc, context);
-    }
-
-    if (rv != APR_SUCCESS) {
-        char buf[STRING_MAX], ebuf[128];
-        sprintf(buf, "%s (%d): %s\n", context, rv,
-                apr_strerror(rv, ebuf, sizeof ebuf));
-        CuFail(tc, buf);
-    }
-}
-
-static const struct testlist {
-    const char *testname;
-    CuSuite *(*func)(void);
-} tests[] = {
-    {"teststr", teststr},
-    {"testtime", testtime},
-    {"testvsn", testvsn},
-    {"testipsub", testipsub},
-    {"testmmap", testmmap},
-    {"testud", testud},
-    {"testtable", testtable},
-    {"testhash", testhash},
-    {"testsleep", testsleep},
-    {"testpool", testpool},
-    {"testfmt", testfmt},
-    {"testfile", testfile},
-    {"testfileinfo", testfileinfo},
-    {"testpipe", testpipe},
-    {"testdup", testdup},
-    {"testdir", testdir},
-    {"testrand", testrand},
-    {"testdso", testdso},
-    {"testoc", testoc},
-    {"testsockets", testsockets},
-    {"testsockopt", testsockopt},
-    {"testproc", testproc},
-    {"testprocmutex", testprocmutex},
-    {"testpoll", testpoll},
-    {"testlock", testlock},
-    {"testthread", testthread},
-    {"testargs", testgetopt},
-    {"testnames", testnames},
-    {"testuser", testuser},
-    {"testpath", testpath},
-    {"testenv", testenv},
-    {"LastTest", NULL}
-};
-
-int main(int argc, char *argv[])
-{
-    CuSuiteList *alltests = NULL;
-    CuString *output = CuStringNew();
-    int i;
-    int exclude = 0;
-    int list_provided = 0;
-
-    apr_initialize();
-    atexit(apr_terminate);
-
-    CuInit(argc, argv);
-
-    apr_pool_create(&p, NULL);
-
-    /* see if we're in exclude mode, see if list of testcases provided */
-    for (i = 1; i < argc; i++) {
-        if (!strcmp(argv[i], "-v")) {
-            continue;
-        }
-        if (!strcmp(argv[i], "-x")) {
-            exclude = 1;
-            continue;
-        }
-        if (!strcmp(argv[i], "-l")) {
-            for (i = 0; tests[i].func != NULL; i++) {
-                printf("%s\n", tests[i].testname);
-            }
-            exit(0);
-        }
-        if (argv[i][0] == '-') {
-            fprintf(stderr, "invalid option: `%s'\n", argv[i]);
-            exit(1);
-        }
-        list_provided = 1;
-    }
-
-    if (!list_provided) {
-        /* add everything */
-        alltests = CuSuiteListNew("All APR Tests");
-        for (i = 0; tests[i].func != NULL; i++) {
-            CuSuiteListAdd(alltests, tests[i].func());
-        }
-    }
-    else if (exclude) {
-        /* add everything but the tests listed */
-        alltests = CuSuiteListNew("Partial APR Tests");
-        for (i = 0; tests[i].func != NULL; i++) {
-            int this_test_excluded = 0;
-            int j;
-
-            for (j = 1; j < argc && !this_test_excluded; j++) {
-                if (!strcmp(argv[j], tests[i].testname)) {
-                    this_test_excluded = 1;
-                }
-            }
-            if (!this_test_excluded) {
-                CuSuiteListAdd(alltests, tests[i].func());
-            }
-        }
-    }
-    else {
-        /* add only the tests listed */
-        alltests = CuSuiteListNew("Partial APR Tests");
-        for (i = 1; i < argc; i++) {
-            int j;
-            int found = 0;
-
-            if (argv[i][0] == '-') {
-                continue;
-            }
-            for (j = 0; tests[j].func != NULL; j++) {
-                if (!strcmp(argv[i], tests[j].testname)) {
-                    CuSuiteListAdd(alltests, tests[j].func());
-                    found = 1;
-                }
-            }
-            if (!found) {
-                fprintf(stderr, "invalid test name: `%s'\n", argv[i]);
-                exit(1);
-            }
-        }
-    }
-    
-    CuSuiteListRunWithSummary(alltests);
-    i = CuSuiteListDetails(alltests, output);
-    printf("%s\n", output->buffer);
-
-    return i > 0 ? 1 : 0;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testall.dsp b/rubbos/app/httpd-2.0.64/srclib/apr/test/testall.dsp
deleted file mode 100644
index 12f031cb..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testall.dsp
+++ /dev/null
@@ -1,253 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testall" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) External Target" 0x0106
-
-CFG=testall - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "testall.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "testall.mak" CFG="testall - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "testall - Win32 Release" (based on "Win32 (x86) External Target")
-!MESSAGE "testall - Win32 Debug" (based on "Win32 (x86) External Target")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF  "$(CFG)" == "testall - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win all"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "testall.exe"
-# PROP BASE Bsc_Name "testall.bsc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win all"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "testall.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ELSEIF  "$(CFG)" == "testall - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ""
-# PROP BASE Intermediate_Dir ""
-# PROP BASE Cmd_Line "NMAKE /f Makefile.win all"
-# PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "testall.exe"
-# PROP BASE Bsc_Name "testall.bsc"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f Makefile.win all"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "testall.exe"
-# PROP Bsc_Name ""
-# PROP Target_Dir ""
-
-!ENDIF 
-
-# Begin Target
-
-# Name "testall - Win32 Release"
-# Name "testall - Win32 Debug"
-
-!IF  "$(CFG)" == "testall - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testall - Win32 Debug"
-
-!ENDIF 
-
-# Begin Source File
-
-SOURCE=.\Makefile.win
-# End Source File
-# Begin Source File
-
-SOURCE=.\testall.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testapp.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testargs.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testatomic.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testdir.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testdso.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testdup.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testfile.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testfileinfo.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testflock.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testfmt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testglobalmutex.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testhash.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testipsub.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testlock.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testlockperf.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testmmap.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testmutexscope.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testnames.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testoc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testpath.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testpipe.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testpoll.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testpools.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testproc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testprocmutex.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testrand.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testshm.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testshmconsumer.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testshmproducer.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testsleep.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testsock.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testsockets.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testsockopt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\teststr.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testtable.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testthread.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testtime.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testud.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testuser.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\testvsn.c
-# End Source File
-# End Target
-# End Project
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testall.dsw b/rubbos/app/httpd-2.0.64/srclib/apr/test/testall.dsw
deleted file mode 100644
index f4be05d9..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testall.dsw
+++ /dev/null
@@ -1,122 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "apr"="..\apr.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "apr_app"="..\build\apr_app.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name apr
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "testall"=".\testall.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name apr
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libapr"="..\libapr.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libapr_app"="..\build\libapr_app.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libapr
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "testapp"=".\testapp.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name apr
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name apr_app
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "testappnt"=".\testappnt.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name apr
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name apr_app
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testapp.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testapp.c
deleted file mode 100644
index 9e5bec3c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testapp.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <apr.h>
-#include <apr_general.h>
-
-int main(int argc, const char * const * argv, const char * const *env)
-{
-    apr_app_initialize(&argc, &argv, &env);
-
-
-    apr_terminate();
-}
\ No newline at end of file
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testapp.dsp b/rubbos/app/httpd-2.0.64/srclib/apr/test/testapp.dsp
deleted file mode 100644
index 93c4aa28..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testapp.dsp
+++ /dev/null
@@ -1,90 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testapp" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=testapp - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "testapp.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "testapp.mak" CFG="testapp - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "testapp - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "testapp - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "testapp - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"./testapp" /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
-
-!ELSEIF  "$(CFG)" == "testapp - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "."
-# PROP BASE Intermediate_Dir "."
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir "."
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c
-# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"./testapp" /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug
-
-!ENDIF 
-
-# Begin Target
-
-# Name "testapp - Win32 Release"
-# Name "testapp - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\testapp.c
-# End Source File
-# End Target
-# End Project
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testappnt.dsp b/rubbos/app/httpd-2.0.64/srclib/apr/test/testappnt.dsp
deleted file mode 100644
index f5cd4339..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testappnt.dsp
+++ /dev/null
@@ -1,101 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testappnt" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=testappnt - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "testappnt.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "testappnt.mak" CFG="testappnt - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "testappnt - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "testappnt - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "testappnt - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "WINNT" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I "../include" /D "NDEBUG" /D "WIN32" /D "WINNT" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"./testappnt" /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /entry:"wmainCRTStartup" /subsystem:console
-
-!ELSEIF  "$(CFG)" == "testappnt - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "."
-# PROP BASE Intermediate_Dir "."
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "."
-# PROP Intermediate_Dir "."
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c
-# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../include" /D "_DEBUG" /D "WIN32" /D "WINNT" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"./testappnt" /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /entry:"wmainCRTStartup" /subsystem:console /incremental:no /debug
-
-!ENDIF 
-
-# Begin Target
-
-# Name "testappnt - Win32 Release"
-# Name "testappnt - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\testapp.c
-
-!IF  "$(CFG)" == "testappnt - Win32 Release"
-
-# ADD CPP /Fo"testappnt"
-
-!ELSEIF  "$(CFG)" == "testappnt - Win32 Debug"
-
-# ADD CPP /Fo"testappnt"
-
-!ENDIF 
-
-# End Source File
-# End Target
-# End Project
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testargs.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testargs.c
deleted file mode 100644
index 73cd766a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testargs.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_getopt.h"
-#include "apr_strings.h"
-#include "test_apr.h"
-
-static void format_arg(char *str, char option, const char *arg)
-{
-    if (arg) {
-        apr_snprintf(str, 8196, "%soption: %c with %s\n", str, option, arg);
-    }
-    else {
-        apr_snprintf(str, 8196, "%soption: %c\n", str, option);
-    }
-}
-
-static void unknown_arg(void *str, const char *err, ...)
-{
-    va_list va;
-
-    va_start(va, err);
-    apr_vsnprintf(str, 8196, err, va);
-    va_end(va);
-}
-
-static void no_options_found(CuTest *tc)
-{
-    int largc = 5;
-    const char * const largv[] = {"testprog", "-a", "-b", "-c", "-d"};
-    apr_getopt_t *opt;
-    apr_status_t rv;
-    char data;
-    const char *optarg;
-    char str[8196];
-
-    str[0] = '\0';
-    rv = apr_getopt_init(&opt, p, largc, largv);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-   
-    while (apr_getopt(opt, "abcd", &data, &optarg) == APR_SUCCESS) {
-        switch (data) {
-            case 'a':
-            case 'b':
-            case 'c':
-            case 'd':
-            default:
-                format_arg(str, data, optarg);
-        }
-    }
-    CuAssertStrEquals(tc, "option: a\n"
-                          "option: b\n"
-                          "option: c\n"
-                          "option: d\n", str);
-}
-
-static void no_options(CuTest *tc)
-{
-    int largc = 5;
-    const char * const largv[] = {"testprog", "-a", "-b", "-c", "-d"};
-    apr_getopt_t *opt;
-    apr_status_t rv;
-    char data;
-    const char *optarg;
-    char str[8196];
-
-    str[0] = '\0';
-    rv = apr_getopt_init(&opt, p, largc, largv);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    opt->errfn = unknown_arg;
-    opt->errarg = str;
-   
-    while (apr_getopt(opt, "efgh", &data, &optarg) == APR_SUCCESS) {
-        switch (data) {
-            case 'a':
-            case 'b':
-            case 'c':
-            case 'd':
-                format_arg(str, data, optarg);
-                break;
-            default:
-                break;
-        }
-    }
-    CuAssertStrEquals(tc, "testprog: illegal option -- a\n", str);
-}
-
-static void required_option(CuTest *tc)
-{
-    int largc = 3;
-    const char * const largv[] = {"testprog", "-a", "foo"};
-    apr_getopt_t *opt;
-    apr_status_t rv;
-    char data;
-    const char *optarg;
-    char str[8196];
-
-    str[0] = '\0';
-    rv = apr_getopt_init(&opt, p, largc, largv);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    opt->errfn = unknown_arg;
-    opt->errarg = str;
-   
-    while (apr_getopt(opt, "a:", &data, &optarg) == APR_SUCCESS) {
-        switch (data) {
-            case 'a':
-                format_arg(str, data, optarg);
-                break;
-            default:
-                break;
-        }
-    }
-    CuAssertStrEquals(tc, "option: a with foo\n", str);
-}
-
-static void required_option_notgiven(CuTest *tc)
-{
-    int largc = 2;
-    const char * const largv[] = {"testprog", "-a"};
-    apr_getopt_t *opt;
-    apr_status_t rv;
-    char data;
-    const char *optarg;
-    char str[8196];
-
-    str[0] = '\0';
-    rv = apr_getopt_init(&opt, p, largc, largv);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    opt->errfn = unknown_arg;
-    opt->errarg = str;
-   
-    while (apr_getopt(opt, "a:", &data, &optarg) == APR_SUCCESS) {
-        switch (data) {
-            case 'a':
-                format_arg(str, data, optarg);
-                break;
-            default:
-                break;
-        }
-    }
-    CuAssertStrEquals(tc, "testprog: option requires an argument -- a\n", str);
-}
-
-static void optional_option(CuTest *tc)
-{
-    int largc = 3;
-    const char * const largv[] = {"testprog", "-a", "foo"};
-    apr_getopt_t *opt;
-    apr_status_t rv;
-    char data;
-    const char *optarg;
-    char str[8196];
-
-    str[0] = '\0';
-    rv = apr_getopt_init(&opt, p, largc, largv);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    opt->errfn = unknown_arg;
-    opt->errarg = str;
-   
-    while (apr_getopt(opt, "a::", &data, &optarg) == APR_SUCCESS) {
-        switch (data) {
-            case 'a':
-                format_arg(str, data, optarg);
-                break;
-            default:
-                break;
-        }
-    }
-    CuAssertStrEquals(tc, "option: a with foo\n", str);
-}
-
-static void optional_option_notgiven(CuTest *tc)
-{
-    int largc = 2;
-    const char * const largv[] = {"testprog", "-a"};
-    apr_getopt_t *opt;
-    apr_status_t rv;
-    char data;
-    const char *optarg;
-    char str[8196];
-
-    str[0] = '\0';
-    rv = apr_getopt_init(&opt, p, largc, largv);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    opt->errfn = unknown_arg;
-    opt->errarg = str;
-   
-    while (apr_getopt(opt, "a::", &data, &optarg) == APR_SUCCESS) {
-        switch (data) {
-            case 'a':
-                format_arg(str, data, optarg);
-                break;
-            default:
-                break;
-        }
-    }
-#if 0
-/*  Our version of getopt doesn't allow for optional arguments.  */
-    CuAssertStrEquals(tc, "option: a\n", str);
-#endif
-    CuAssertStrEquals(tc, "testprog: option requires an argument -- a\n", str);
-}
-
-CuSuite *testgetopt(void)
-{
-    CuSuite *suite = CuSuiteNew("Getopt");
-
-    SUITE_ADD_TEST(suite, no_options);
-    SUITE_ADD_TEST(suite, no_options_found);
-    SUITE_ADD_TEST(suite, required_option);
-    SUITE_ADD_TEST(suite, required_option_notgiven);
-    SUITE_ADD_TEST(suite, optional_option);
-    SUITE_ADD_TEST(suite, optional_option_notgiven);
-
-    return suite;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testatomic.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testatomic.c
deleted file mode 100644
index d226bd1b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testatomic.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "apr_thread_proc.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_atomic.h"
-#include "errno.h"
-#include "apr_time.h"
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#if !(defined WIN32) && !(defined NETWARE)
-#include <pthread.h>
-#endif
-
-apr_pool_t *context;
-apr_atomic_t y;      /* atomic locks */
-
-static apr_status_t check_basic_atomics(volatile apr_atomic_t*p)
-{
-    apr_atomic_t oldval;
-    apr_uint32_t casval = 0;
-    float object1, object2;
-#if !(defined NETWARE)
-    volatile void *casptr;
-#else
-    void *casptr;
-#endif
-    void *oldptr;
-
-    apr_atomic_set(&y, 2);
-    printf("%-60s", "testing apr_atomic_dec");
-    if (apr_atomic_dec(&y) == 0) {
-        fprintf(stderr, "Failed\noldval =%d should not be zero\n",
-                apr_atomic_read(&y));
-        return APR_EGENERAL;
-    }
-    if (apr_atomic_dec(&y) != 0) {
-        fprintf(stderr, "Failed\noldval =%d should be zero\n",
-                apr_atomic_read(&y));
-        return APR_EGENERAL;
-    }
-    printf("OK\n");
-
-    printf("%-60s", "testing CAS");
-    oldval = apr_atomic_cas(&casval, 12, 0);
-    if (oldval != 0) {
-        fprintf(stderr, "Failed\noldval =%d should be zero\n", oldval);
-        return APR_EGENERAL;
-    }
-    printf("OK\n");
-    printf("%-60s", "testing CAS - match non-null");
-    oldval = apr_atomic_cas(&casval, 23, 12);
-    if (oldval != 12) {
-        fprintf(stderr, "Failed\noldval =%d should be 12 y=%d\n",
-                oldval, casval);
-        return APR_EGENERAL;
-    }
-    printf("OK\n");
-    printf("%-60s", "testing CAS - no match");
-    oldval = apr_atomic_cas(&casval, 23, 12);
-    if (oldval != 23) {
-        fprintf(stderr, "Failed\noldval =%d should be 23 y=%d\n",
-                oldval, casval);
-        return APR_EGENERAL;
-    }
-    printf("OK\n");
-
-    printf("%-60s", "testing CAS for pointers");
-    casptr = NULL;
-    oldptr = apr_atomic_casptr(&casptr, &object1, 0);
-    if (oldptr != 0) {
-        fprintf(stderr, "Failed\noldval =%p should be zero\n", oldptr);
-        return APR_EGENERAL;
-    }
-    printf("OK\n");
-    printf("%-60s", "testing CAS for pointers - match non-null");
-    oldptr = apr_atomic_casptr(&casptr, &object2, &object1);
-    if (oldptr != &object1) {
-        fprintf(stderr, "Failed\noldval =%p should be %p\n", oldptr, &object1);
-        return APR_EGENERAL;
-    }
-    printf("OK\n");
-    printf("%-60s", "testing CAS for pointers - no match");
-    oldptr = apr_atomic_casptr(&casptr, &object2, &object1);
-    if (oldptr != &object2) {
-        fprintf(stderr, "Failed\noldval =%p should be %p\n", oldptr, &object2);
-        return APR_EGENERAL;
-    }
-    printf("OK\n");
-
-    printf("%-60s", "testing add");
-    apr_atomic_set(&y, 23);
-    apr_atomic_add(&y, 4);
-    if (apr_atomic_read(&y) != 27) {
-        fprintf(stderr,
-                "Failed\nAtomic Add doesn't add up ;( expected 27 got %d\n",
-                oldval);
-        return APR_EGENERAL;
-    }
- 
-    printf("OK\n");
-    printf("%-60s", "testing add/inc");
-    apr_atomic_set(&y, 0);
-    apr_atomic_add(&y, 20);
-    apr_atomic_inc(&y);
-    if (apr_atomic_read(&y) != 21) {
-        fprintf(stderr, "Failed.\natomics do not add up\n");
-        return APR_EGENERAL;
-    }
-    fprintf(stdout, "OK\n");
-
-    return APR_SUCCESS;
-}
-
-#if !APR_HAS_THREADS
-int main(void)
-{
-    apr_status_t rv;
-
-    apr_initialize();
-
-    fprintf(stderr,
-            "This program won't work fully on this platform because there is no "
-            "support for threads.\n");
-    if (apr_pool_create(&context, NULL) != APR_SUCCESS) {
-        fflush(stdout);
-        fprintf(stderr, "Failed.\nCould not initialize\n");
-        exit(-1);
-    }
-    rv = apr_atomic_init(context);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "Failed.\nCould not initialize atomics\n");
-        exit(-1);
-    }
-    rv = check_basic_atomics(&y);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "Failed.\n");
-        exit(-1);
-    }
-    return 0;
-}
-#else /* !APR_HAS_THREADS */
-
-void * APR_THREAD_FUNC thread_func_mutex(apr_thread_t *thd, void *data);
-void * APR_THREAD_FUNC thread_func_atomic(apr_thread_t *thd, void *data);
-void * APR_THREAD_FUNC thread_func_none(apr_thread_t *thd, void *data);
-
-apr_thread_mutex_t *thread_lock;
-volatile long x = 0; /* mutex locks */
-volatile long z = 0; /* no locks */
-int value = 0;
-apr_status_t exit_ret_val = 123; /* just some made up number to check on later */
-
-#define NUM_THREADS 50
-#define NUM_ITERATIONS 20000
-void * APR_THREAD_FUNC thread_func_mutex(apr_thread_t *thd, void *data)
-{
-    int i;
-
-    for (i = 0; i < NUM_ITERATIONS; i++) {
-        apr_thread_mutex_lock(thread_lock);
-        x++;
-        apr_thread_mutex_unlock(thread_lock);
-    }
-    apr_thread_exit(thd, exit_ret_val);
-    return NULL;
-} 
-
-void * APR_THREAD_FUNC thread_func_atomic(apr_thread_t *thd, void *data)
-{
-    int i;
-
-    for (i = 0; i < NUM_ITERATIONS ; i++) {
-        apr_atomic_inc(&y);
-        apr_atomic_add(&y, 2);
-        apr_atomic_dec(&y);
-        apr_atomic_dec(&y);
-    }
-    apr_thread_exit(thd, exit_ret_val);
-    return NULL;
-}
-
-void * APR_THREAD_FUNC thread_func_none(apr_thread_t *thd, void *data)
-{
-    int i;
-
-    for (i = 0; i < NUM_ITERATIONS ; i++) {
-        z++;
-    }
-    apr_thread_exit(thd, exit_ret_val);
-    return NULL;
-}
-
-int main(int argc, char**argv)
-{
-    apr_thread_t *t1[NUM_THREADS];
-    apr_thread_t *t2[NUM_THREADS];
-    apr_status_t r1[NUM_THREADS]; 
-    apr_status_t r2[NUM_THREADS]; 
-    apr_status_t s1[NUM_THREADS]; 
-    apr_status_t s2[NUM_THREADS];
-    apr_status_t rv;
-    int i;
-    int mutex;
-
-    apr_initialize();
-
-    if (argc == 2 && argv[1][0] == 'm') {
-        mutex = 1;
-    }
-    else {
-        mutex = 0;
-    }
-
-    printf("APR Atomic Test\n===============\n\n");
-#if !(defined WIN32) && !(defined NETWARE) && !(defined __MVS__) && !(defined DARWIN)
-    pthread_setconcurrency(8);
-#endif
-    printf("%-60s", "Initializing the context"); 
-    if (apr_pool_create(&context, NULL) != APR_SUCCESS) {
-        fflush(stdout);
-        fprintf(stderr, "Failed.\nCould not initialize\n");
-        exit(-1);
-    }
-    printf("OK\n");
-
-    if (mutex == 1) {
-        printf("%-60s", "Initializing the lock"); 
-        rv = apr_thread_mutex_create(&thread_lock, APR_THREAD_MUTEX_DEFAULT,
-                                     context);
-        if (rv != APR_SUCCESS) {
-            fflush(stdout);
-            fprintf(stderr, "Failed\nCould not create lock\n");
-            exit(-1);
-        }
-        printf("OK\n");
-    }
-    printf("%-60s", "Initializing the atomics"); 
-    rv = apr_atomic_init(context);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "Failed.\n");
-        exit(-1);
-    }
-    printf("OK\n");
-
-    rv = check_basic_atomics(&y);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "Failed.\n");
-        exit(-1);
-    }
-    apr_atomic_set(&y, 0);
-
-    printf("%-60s", "Starting all the threads"); 
-    for (i = 0; i < NUM_THREADS; i++) {
-        r1[i] = apr_thread_create(&t1[i], NULL, 
-                    (mutex == 1 ? thread_func_mutex : thread_func_atomic),
-                    NULL, context);
-        r2[i] = apr_thread_create(&t2[i], NULL, thread_func_none, NULL,
-                                  context);
-        if (r1[i] != APR_SUCCESS || r2[i] != APR_SUCCESS ) {
-            fflush(stdout);
-            fprintf(stderr, "Failed\nError starting thread in group %d\n",i);
-            exit(-1);
-        }
-    }
-    printf("OK\n");
-
-    printf("%-60s\n", "Waiting for threads to exit");
-    printf("%-60s", "(Note that this may take a while to complete.)");
-    fflush(stdout);
-
-    for (i = 0; i < NUM_THREADS; i++) {
-        apr_thread_join(&s1[i], t1[i]);
-        apr_thread_join(&s2[i], t2[i]);
-        if (s1[i] != exit_ret_val || s2[i] != exit_ret_val) {
-            fprintf(stderr, 
-                    "Invalid return value\n"
-                    "Got %d/%d, but expected %d for all \n",
-                    s1[i], s2[i], exit_ret_val);
-        }
-    }
-    printf("OK\n");
-
-    if (mutex == 1) {
-        printf("%-60s", "Checking if mutex locks worked"); 
-        if (x != NUM_THREADS * NUM_ITERATIONS) {
-            fflush(stdout);
-            fprintf(stderr, 
-                    "No!\nThe locks didn't work?? x = %ld instead of %ld\n",
-                    x,
-                    (long)NUM_THREADS * NUM_ITERATIONS);
-        }
-        else {
-            printf("OK\n");
-        }
-    }
-    else {
-        printf("%-60s", "Checking if atomic worked"); 
-        if (apr_atomic_read(&y) != NUM_THREADS * NUM_ITERATIONS) {
-            fflush(stdout);
-            fprintf(stderr, 
-                    "No!\nThe atomics didn't work?? y = %ld instead of %ld\n",
-                    (long)apr_atomic_read(&y),
-                    (long)NUM_THREADS * NUM_ITERATIONS);
-        }
-        else {
-            printf("OK\n");
-        }
-    }
-    printf("%-60s", "Checking if nolock worked"); 
-    if (z != NUM_THREADS * NUM_ITERATIONS) {
-        fflush(stdout);
-        fprintf(stderr, 
-                "no surprise\n"
-                "The no-locks didn't work. z = %ld instead of %ld\n", 
-                z, 
-                (long)NUM_THREADS * NUM_ITERATIONS);
-    }
-    else {
-        printf("OK\n");
-    }
-
-    return 0;
-}
-
-#endif /* !APR_HAS_THREADS */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testdir.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testdir.c
deleted file mode 100644
index 98506463..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testdir.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "apr_file_io.h"
-#include "apr_file_info.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "test_apr.h"
-
-static void test_mkdir(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_finfo_t finfo;
-
-    rv = apr_dir_make("data/testdir", APR_UREAD | APR_UWRITE | APR_UEXECUTE, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_stat(&finfo, "data/testdir", APR_FINFO_TYPE, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, APR_DIR, finfo.filetype);
-}
-
-static void test_mkdir_recurs(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_finfo_t finfo;
-
-    rv = apr_dir_make_recursive("data/one/two/three", 
-                                APR_UREAD | APR_UWRITE | APR_UEXECUTE, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_stat(&finfo, "data/one", APR_FINFO_TYPE, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, APR_DIR, finfo.filetype);
-
-    rv = apr_stat(&finfo, "data/one/two", APR_FINFO_TYPE, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, APR_DIR, finfo.filetype);
-
-    rv = apr_stat(&finfo, "data/one/two/three", APR_FINFO_TYPE, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, APR_DIR, finfo.filetype);
-}
-
-static void test_remove(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_finfo_t finfo;
-
-    rv = apr_dir_remove("data/testdir", p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_stat(&finfo, "data/testdir", APR_FINFO_TYPE, p);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_ENOENT(rv));
-}
-
-static void test_removeall_fail(CuTest *tc)
-{
-    apr_status_t rv;
-
-    rv = apr_dir_remove("data/one", p);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_ENOTEMPTY(rv));
-}
-
-static void test_removeall(CuTest *tc)
-{
-    apr_status_t rv;
-
-    rv = apr_dir_remove("data/one/two/three", p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_dir_remove("data/one/two", p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_dir_remove("data/one", p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-}
-
-static void test_remove_notthere(CuTest *tc)
-{
-    apr_status_t rv;
-
-    rv = apr_dir_remove("data/notthere", p);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_ENOENT(rv));
-}
-
-static void test_mkdir_twice(CuTest *tc)
-{
-    apr_status_t rv;
-
-    rv = apr_dir_make("data/testdir", APR_UREAD | APR_UWRITE | APR_UEXECUTE, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_dir_make("data/testdir", APR_UREAD | APR_UWRITE | APR_UEXECUTE, p);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_EEXIST(rv));
-
-    rv = apr_dir_remove("data/testdir", p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-}
-
-static void test_opendir(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_dir_t *dir;
-
-    rv = apr_dir_open(&dir, "data", p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    apr_dir_close(dir);
-}
-
-static void test_opendir_notthere(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_dir_t *dir;
-
-    rv = apr_dir_open(&dir, "notthere", p);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_ENOENT(rv));
-}
-
-static void test_closedir(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_dir_t *dir;
-
-    rv = apr_dir_open(&dir, "data", p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_dir_close(dir);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-}
-
-static void test_rewind(CuTest *tc)
-{
-    apr_dir_t *dir;
-    apr_finfo_t first, second;
-
-    apr_assert_success(tc, "apr_dir_open failed", apr_dir_open(&dir, "data", p));
-
-    apr_assert_success(tc, "apr_dir_read failed",
-                       apr_dir_read(&first, APR_FINFO_DIRENT, dir));
-
-    apr_assert_success(tc, "apr_dir_rewind failed", apr_dir_rewind(dir));
-
-    apr_assert_success(tc, "second apr_dir_read failed",
-                       apr_dir_read(&second, APR_FINFO_DIRENT, dir));
-
-    apr_assert_success(tc, "apr_dir_close failed", apr_dir_close(dir));
-
-    CuAssertStrEquals(tc, first.name, second.name);
-}
-
-/* Test for a (fixed) bug in apr_dir_read().  This bug only happened
-   in threadless cases. */
-static void test_uncleared_errno(CuTest *tc)
-{
-    apr_file_t *thefile = NULL;
-    apr_finfo_t finfo;
-    apr_int32_t finfo_flags = APR_FINFO_TYPE | APR_FINFO_NAME;
-    apr_dir_t *this_dir;
-    apr_status_t rv; 
-
-    rv = apr_dir_make("dir1", APR_OS_DEFAULT, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_dir_make("dir2", APR_OS_DEFAULT, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_file_open(&thefile, "dir1/file1",
-                       APR_READ | APR_WRITE | APR_CREATE, APR_OS_DEFAULT, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_file_close(thefile);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    /* Try to remove dir1.  This should fail because it's not empty.
-       However, on a platform with threads disabled (such as FreeBSD),
-       `errno' will be set as a result. */
-    rv = apr_dir_remove("dir1", p);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_ENOTEMPTY(rv));
-    
-    /* Read `.' and `..' out of dir2. */
-    rv = apr_dir_open(&this_dir, "dir2", p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_dir_read(&finfo, finfo_flags, this_dir);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_dir_read(&finfo, finfo_flags, this_dir);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    /* Now, when we attempt to do a third read of empty dir2, and the
-       underlying system readdir() returns NULL, the old value of
-       errno shouldn't cause a false alarm.  We should get an ENOENT
-       back from apr_dir_read, and *not* the old errno. */
-    rv = apr_dir_read(&finfo, finfo_flags, this_dir);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_ENOENT(rv));
-
-    rv = apr_dir_close(this_dir);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-		 
-    /* Cleanup */
-    rv = apr_file_remove("dir1/file1", p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_dir_remove("dir1", p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_dir_remove("dir2", p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-}
-
-static void test_rmkdir_nocwd(CuTest *tc)
-{
-    char *cwd, *path;
-    apr_status_t rv;
-
-    apr_assert_success(tc, "make temp dir",
-                       apr_dir_make("dir3", APR_OS_DEFAULT, p));
-
-    apr_assert_success(tc, "obtain cwd", apr_filepath_get(&cwd, 0, p));
-
-    apr_assert_success(tc, "determine path to temp dir",
-                       apr_filepath_merge(&path, cwd, "dir3", 0, p));
-
-    apr_assert_success(tc, "change to temp dir", apr_filepath_set(path, p));
-
-    rv = apr_dir_remove(path, p);
-    /* Some platforms cannot remove a directory which is in use. */
-    if (rv == APR_SUCCESS) {
-        CuAssert(tc, "fail to create dir",
-                 apr_dir_make_recursive("foobar", APR_OS_DEFAULT, 
-                                        p) != APR_SUCCESS);
-    }
-
-    apr_assert_success(tc, "restore cwd", apr_filepath_set(cwd, p));
-
-    if (rv) {
-        apr_dir_remove(path, p);
-        CuNotImpl(tc, "cannot remove in-use directory");
-    }
-}
-
-CuSuite *testdir(void)
-{
-    CuSuite *suite = CuSuiteNew("Directory");
-
-    SUITE_ADD_TEST(suite, test_mkdir);
-    SUITE_ADD_TEST(suite, test_mkdir_recurs);
-    SUITE_ADD_TEST(suite, test_remove);
-    SUITE_ADD_TEST(suite, test_removeall_fail);
-    SUITE_ADD_TEST(suite, test_removeall);
-    SUITE_ADD_TEST(suite, test_remove_notthere);
-    SUITE_ADD_TEST(suite, test_mkdir_twice);
-    SUITE_ADD_TEST(suite, test_rmkdir_nocwd);
-
-    SUITE_ADD_TEST(suite, test_rewind);
-
-    SUITE_ADD_TEST(suite, test_opendir);
-    SUITE_ADD_TEST(suite, test_opendir_notthere);
-    SUITE_ADD_TEST(suite, test_closedir);
-    SUITE_ADD_TEST(suite, test_uncleared_errno);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testdso.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testdso.c
deleted file mode 100644
index f30beb14..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testdso.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "test_apr.h"
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_errno.h"
-#include "apr_dso.h"
-#include "apr_strings.h"
-#include "apr_file_info.h"
-#include "apr.h"
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef NETWARE
-# define MOD_NAME "mod_test.nlm"
-#elif defined(BEOS) || defined(WIN32)
-# define MOD_NAME "mod_test.so"
-#elif defined(DARWIN)
-# define MOD_NAME ".libs/mod_test.so" 
-# define LIB_NAME ".libs/libmod_test.dylib" 
-#elif defined(__hpux__) || defined(__hpux)
-# define MOD_NAME ".libs/mod_test.sl"
-# define LIB_NAME ".libs/libmod_test.sl"
-#elif defined(_AIX) || defined(__bsdi__)
-# define MOD_NAME ".libs/libmod_test.so"
-# define LIB_NAME ".libs/libmod_test.so"
-#else /* Every other Unix */
-# define MOD_NAME ".libs/mod_test.so"
-# define LIB_NAME ".libs/libmod_test.so"
-#endif
-
-static char *modname;
-
-static void test_load_module(CuTest *tc)
-{
-    apr_dso_handle_t *h = NULL;
-    apr_status_t status;
-    char errstr[256];
-
-    status = apr_dso_load(&h, modname, p);
-    CuAssert(tc, apr_dso_error(h, errstr, 256), APR_SUCCESS == status);
-    CuAssertPtrNotNull(tc, h);
-
-    apr_dso_unload(h);
-}
-
-static void test_dso_sym(CuTest *tc)
-{
-    apr_dso_handle_t *h = NULL;
-    apr_dso_handle_sym_t func1 = NULL;
-    apr_status_t status;
-    void (*function)(char str[256]);
-    char teststr[256];
-    char errstr[256];
-
-    status = apr_dso_load(&h, modname, p);
-    CuAssert(tc, apr_dso_error(h, errstr, 256), APR_SUCCESS == status);
-    CuAssertPtrNotNull(tc, h);
-
-    status = apr_dso_sym(&func1, h, "print_hello");
-    CuAssert(tc, apr_dso_error(h, errstr, 256), APR_SUCCESS == status);
-    CuAssertPtrNotNull(tc, func1);
-
-    function = (void (*)(char *))func1;
-    (*function)(teststr);
-    CuAssertStrEquals(tc, "Hello - I'm a DSO!\n", teststr);
-
-    apr_dso_unload(h);
-}
-
-static void test_dso_sym_return_value(CuTest *tc)
-{
-    apr_dso_handle_t *h = NULL;
-    apr_dso_handle_sym_t func1 = NULL;
-    apr_status_t status;
-    int (*function)(int);
-    char errstr[256];
-
-    status = apr_dso_load(&h, modname, p);
-    CuAssert(tc, apr_dso_error(h, errstr, 256), APR_SUCCESS == status);
-    CuAssertPtrNotNull(tc, h);
-
-    status = apr_dso_sym(&func1, h, "count_reps");
-    CuAssert(tc, apr_dso_error(h, errstr, 256), APR_SUCCESS == status);
-    CuAssertPtrNotNull(tc, func1);
-
-    function = (int (*)(int))func1;
-    status = (*function)(5);
-    CuAssertIntEquals(tc, 5, status);
-
-    apr_dso_unload(h);
-}
-
-static void test_unload_module(CuTest *tc)
-{
-    apr_dso_handle_t *h = NULL;
-    apr_status_t status;
-    char errstr[256];
-    apr_dso_handle_sym_t func1 = NULL;
-
-    status = apr_dso_load(&h, modname, p);
-    CuAssert(tc, apr_dso_error(h, errstr, 256), APR_SUCCESS == status);
-    CuAssertPtrNotNull(tc, h);
-
-    status = apr_dso_unload(h);
-    CuAssert(tc, apr_dso_error(h, errstr, 256), APR_SUCCESS == status);
-
-    status = apr_dso_sym(&func1, h, "print_hello");
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_ESYMNOTFOUND(status));
-}
-
-
-#ifdef LIB_NAME
-static char *libname;
-
-static void test_load_library(CuTest *tc)
-{
-    apr_dso_handle_t *h = NULL;
-    apr_status_t status;
-    char errstr[256];
-
-    status = apr_dso_load(&h, libname, p);
-    CuAssert(tc, apr_dso_error(h, errstr, 256), APR_SUCCESS == status);
-    CuAssertPtrNotNull(tc, h);
-
-    apr_dso_unload(h);
-}
-
-static void test_dso_sym_library(CuTest *tc)
-{
-    apr_dso_handle_t *h = NULL;
-    apr_dso_handle_sym_t func1 = NULL;
-    apr_status_t status;
-    void (*function)(char str[256]);
-    char teststr[256];
-    char errstr[256];
-
-    status = apr_dso_load(&h, libname, p);
-    CuAssert(tc, apr_dso_error(h, errstr, 256), APR_SUCCESS == status);
-    CuAssertPtrNotNull(tc, h);
-
-    status = apr_dso_sym(&func1, h, "print_hello");
-    CuAssert(tc, apr_dso_error(h, errstr, 256), APR_SUCCESS == status);
-    CuAssertPtrNotNull(tc, func1);
-
-    function = (void (*)(char *))func1;
-    (*function)(teststr);
-    CuAssertStrEquals(tc, "Hello - I'm a DSO!\n", teststr);
-
-    apr_dso_unload(h);
-}
-
-static void test_dso_sym_return_value_library(CuTest *tc)
-{
-    apr_dso_handle_t *h = NULL;
-    apr_dso_handle_sym_t func1 = NULL;
-    apr_status_t status;
-    int (*function)(int);
-    char errstr[256];
-
-    status = apr_dso_load(&h, libname, p);
-    CuAssert(tc, apr_dso_error(h, errstr, 256), APR_SUCCESS == status);
-    CuAssertPtrNotNull(tc, h);
-
-    status = apr_dso_sym(&func1, h, "count_reps");
-    CuAssert(tc, apr_dso_error(h, errstr, 256), APR_SUCCESS == status);
-    CuAssertPtrNotNull(tc, func1);
-
-    function = (int (*)(int))func1;
-    status = (*function)(5);
-    CuAssertIntEquals(tc, 5, status);
-
-    apr_dso_unload(h);
-}
-
-static void test_unload_library(CuTest *tc)
-{
-    apr_dso_handle_t *h = NULL;
-    apr_status_t status;
-    char errstr[256];
-    apr_dso_handle_sym_t func1 = NULL;
-
-    status = apr_dso_load(&h, libname, p);
-    CuAssert(tc, apr_dso_error(h, errstr, 256), APR_SUCCESS == status);
-    CuAssertPtrNotNull(tc, h);
-
-    status = apr_dso_unload(h);
-    CuAssert(tc, apr_dso_error(h, errstr, 256), APR_SUCCESS == status);
-
-    status = apr_dso_sym(&func1, h, "print_hello");
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_ESYMNOTFOUND(status));
-}
-
-#endif /* def(LIB_NAME) */
-
-static void test_load_notthere(CuTest *tc)
-{
-    apr_dso_handle_t *h = NULL;
-    apr_status_t status;
-
-    status = apr_dso_load(&h, "No_File.so", p);
-
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_EDSOOPEN(status));
-    CuAssertPtrNotNull(tc, h);
-}    
-
-CuSuite *testdso(void)
-{
-    CuSuite *suite = CuSuiteNew("DSO");
-
-    apr_filepath_merge(&modname, NULL, MOD_NAME, 0, p);
-
-    SUITE_ADD_TEST(suite, test_load_module);
-    SUITE_ADD_TEST(suite, test_dso_sym);
-    SUITE_ADD_TEST(suite, test_dso_sym_return_value);
-    SUITE_ADD_TEST(suite, test_unload_module);
-
-#ifdef LIB_NAME
-    apr_filepath_merge(&libname, NULL, LIB_NAME, 0, p);
-
-    SUITE_ADD_TEST(suite, test_load_library);
-    SUITE_ADD_TEST(suite, test_dso_sym_library);
-    SUITE_ADD_TEST(suite, test_dso_sym_return_value_library);
-    SUITE_ADD_TEST(suite, test_unload_library);
-#endif
-
-    SUITE_ADD_TEST(suite, test_load_notthere);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testdup.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testdup.c
deleted file mode 100644
index 74f64aee..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testdup.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_errno.h"
-#include "apr_file_io.h"
-#include "test_apr.h"
-
-#define TEST "Testing\n"
-#define TEST2 "Testing again\n"
-#define FILEPATH "data/"
-
-static void test_file_dup(CuTest *tc)
-{
-    apr_file_t *file1 = NULL;
-    apr_file_t *file3 = NULL;
-    apr_status_t rv;
-    apr_finfo_t finfo;
-
-    /* First, create a new file, empty... */
-    rv = apr_file_open(&file1, FILEPATH "testdup.file", 
-                       APR_READ | APR_WRITE | APR_CREATE |
-                       APR_DELONCLOSE, APR_OS_DEFAULT, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, file1);
-
-    rv = apr_file_dup(&file3, file1, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, file3);
-
-    rv = apr_file_close(file1);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    /* cleanup after ourselves */
-    rv = apr_file_close(file3);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_stat(&finfo, FILEPATH "testdup.file", APR_FINFO_NORM, p);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_ENOENT(rv));
-}  
-
-static void test_file_readwrite(CuTest *tc)
-{
-    apr_file_t *file1 = NULL;
-    apr_file_t *file3 = NULL;
-    apr_status_t rv;
-    apr_finfo_t finfo;
-    apr_size_t txtlen = sizeof(TEST);
-    char buff[50];
-    apr_off_t fpos;
-
-    /* First, create a new file, empty... */
-    rv = apr_file_open(&file1, FILEPATH "testdup.readwrite.file", 
-                       APR_READ | APR_WRITE | APR_CREATE |
-                       APR_DELONCLOSE, APR_OS_DEFAULT, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, file1);
-
-    rv = apr_file_dup(&file3, file1, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, file3);
-
-    rv = apr_file_write(file3, TEST, &txtlen);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, sizeof(TEST), txtlen);
-
-    fpos = 0;
-    rv = apr_file_seek(file1, APR_SET, &fpos);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssert(tc, "File position mismatch, expected 0", fpos == 0);
-
-    txtlen = 50;
-    rv = apr_file_read(file1, buff, &txtlen);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, TEST, buff);
-
-    /* cleanup after ourselves */
-    rv = apr_file_close(file1);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_close(file3);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_stat(&finfo, FILEPATH "testdup.readwrite.file", APR_FINFO_NORM, p);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_ENOENT(rv));
-}  
-
-static void test_dup2(CuTest *tc)
-{
-    apr_file_t *testfile = NULL;
-    apr_file_t *errfile = NULL;
-    apr_file_t *saveerr = NULL;
-    apr_status_t rv;
-
-    rv = apr_file_open(&testfile, FILEPATH "testdup2.file", 
-                       APR_READ | APR_WRITE | APR_CREATE |
-                       APR_DELONCLOSE, APR_OS_DEFAULT, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, testfile);
-
-    rv = apr_file_open_stderr(&errfile, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    /* Set aside the real errfile */
-    rv = apr_file_dup(&saveerr, errfile, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, saveerr);
-
-    rv = apr_file_dup2(errfile, testfile, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, errfile);
-
-    apr_file_close(testfile);
-
-    rv = apr_file_dup2(errfile, saveerr, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, errfile);
-}
-
-static void test_dup2_readwrite(CuTest *tc)
-{
-    apr_file_t *errfile = NULL;
-    apr_file_t *testfile = NULL;
-    apr_file_t *saveerr = NULL;
-    apr_status_t rv;
-    apr_size_t txtlen = sizeof(TEST);
-    char buff[50];
-    apr_off_t fpos;
-
-    rv = apr_file_open(&testfile, FILEPATH "testdup2.readwrite.file", 
-                       APR_READ | APR_WRITE | APR_CREATE |
-                       APR_DELONCLOSE, APR_OS_DEFAULT, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, testfile);
-
-    rv = apr_file_open_stderr(&errfile, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    /* Set aside the real errfile */
-    rv = apr_file_dup(&saveerr, errfile, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, saveerr);
-
-    rv = apr_file_dup2(errfile, testfile, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, errfile);
-
-    txtlen = sizeof(TEST2);
-    rv = apr_file_write(errfile, TEST2, &txtlen);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, sizeof(TEST2), txtlen);
-
-    fpos = 0;
-    rv = apr_file_seek(testfile, APR_SET, &fpos);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssert(tc, "File position mismatch, expected 0", fpos == 0);
-
-    txtlen = 50;
-    rv = apr_file_read(testfile, buff, &txtlen);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, TEST2, buff);
-      
-    apr_file_close(testfile);
-
-    rv = apr_file_dup2(errfile, saveerr, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, errfile);
-}
-
-CuSuite *testdup(void)
-{
-    CuSuite *suite = CuSuiteNew("File duplication");
-
-    SUITE_ADD_TEST(suite, test_file_dup);
-    SUITE_ADD_TEST(suite, test_file_readwrite);
-    SUITE_ADD_TEST(suite, test_dup2);
-    SUITE_ADD_TEST(suite, test_dup2_readwrite);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testenv.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testenv.c
deleted file mode 100644
index 6bc97a11..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testenv.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_env.h"
-#include "apr_errno.h"
-#include "test_apr.h"
-
-#define TEST_ENVVAR_NAME "apr_test_envvar"
-#define TEST_ENVVAR2_NAME "apr_test_envvar2"
-#define TEST_ENVVAR_VALUE "Just a value that we'll check"
-
-static int have_env_set;
-static int have_env_get;
-static int have_env_del;
-
-static void test_setenv(CuTest *tc)
-{
-    apr_status_t rv;
-
-    rv = apr_env_set(TEST_ENVVAR_NAME, TEST_ENVVAR_VALUE, p);
-    have_env_set = (rv != APR_ENOTIMPL);
-    if (!have_env_set) {
-        CuNotImpl(tc, "apr_env_set");
-        return;
-    }
-    apr_assert_success(tc, "set environment variable", rv);
-}
-
-static void test_getenv(CuTest *tc)
-{
-    char *value;
-    apr_status_t rv;
-
-    if (!have_env_set) {
-        CuNotImpl(tc, "apr_env_set (skip test for apr_env_get)");
-        return;
-    }
-
-    rv = apr_env_get(&value, TEST_ENVVAR_NAME, p);
-    have_env_get = (rv != APR_ENOTIMPL);
-    if (!have_env_get) {
-        CuNotImpl(tc, "apr_env_get");
-        return;
-    }
-    apr_assert_success(tc, "get environment variable", rv);
-    CuAssertStrEquals(tc, TEST_ENVVAR_VALUE, value);
-}
-
-static void test_delenv(CuTest *tc)
-{
-    char *value;
-    apr_status_t rv;
-
-    if (!have_env_set) {
-        CuNotImpl(tc, "apr_env_set (skip test for apr_env_delete)");
-        return;
-    }
-
-    rv = apr_env_delete(TEST_ENVVAR_NAME, p);
-    have_env_del = (rv != APR_ENOTIMPL);
-    if (!have_env_del) {
-        CuNotImpl(tc, "apr_env_delete");
-        return;
-    }
-    apr_assert_success(tc, "delete environment variable", rv);
-
-    if (!have_env_get) {
-        CuNotImpl(tc, "apr_env_get (skip sanity check for apr_env_delete)");
-        return;
-    }
-    rv = apr_env_get(&value, TEST_ENVVAR_NAME, p);
-    CuAssertIntEquals(tc, APR_ENOENT, rv);
-}
-
-/** http://issues.apache.org/bugzilla/show_bug.cgi?id=40764 */
-static void test_emptyenv(CuTest *tc)
-{
-    char *value;
-    apr_status_t rv;
-
-    if (!(have_env_set && have_env_get)) {
-        CuNotImpl(tc, "apr_env_set (skip test_emptyenv)");
-        return;
-    }
-    /** Set empty string and test that rv != ENOENT) */
-    rv = apr_env_set(TEST_ENVVAR_NAME, "", p);
-    apr_assert_success(tc, "set environment variable", rv);
-    rv = apr_env_get(&value, TEST_ENVVAR_NAME, p);
-    apr_assert_success(tc, "get environment variable", rv);
-    CuAssertStrEquals(tc, "", value);
-
-    if (!have_env_del) {
-        CuNotImpl(tc, "apr_env_del (skip recycle test_emptyenv)");
-        return;
-    }
-    /** Delete and retest */
-    rv = apr_env_delete(TEST_ENVVAR_NAME, p);
-    apr_assert_success(tc, "delete environment variable", rv);
-    rv = apr_env_get(&value, TEST_ENVVAR_NAME, p);
-    CuAssertIntEquals(tc, APR_ENOENT, rv);
-
-    /** Set second variable + test*/
-    rv = apr_env_set(TEST_ENVVAR2_NAME, TEST_ENVVAR_VALUE, p);
-    apr_assert_success(tc, "set second environment variable", rv);
-    rv = apr_env_get(&value, TEST_ENVVAR2_NAME, p);
-    apr_assert_success(tc, "get second environment variable", rv);
-    CuAssertStrEquals(tc, TEST_ENVVAR_VALUE, value);
-
-    /** Finally, test ENOENT (first variable) followed by second != ENOENT) */
-    rv = apr_env_get(&value, TEST_ENVVAR_NAME, p);
-    CuAssertIntEquals(tc, APR_ENOENT, rv);
-    rv = apr_env_get(&value, TEST_ENVVAR2_NAME, p);
-    apr_assert_success(tc, "verify second environment variable", rv);
-    CuAssertStrEquals(tc, TEST_ENVVAR_VALUE, value);
-
-    /** Cleanup */
-    apr_env_delete(TEST_ENVVAR2_NAME, p);
-}
-
-CuSuite *testenv(void)
-{
-    CuSuite *suite = CuSuiteNew("Environment");
-
-    SUITE_ADD_TEST(suite, test_setenv);
-    SUITE_ADD_TEST(suite, test_getenv);
-    SUITE_ADD_TEST(suite, test_delenv);
-    SUITE_ADD_TEST(suite, test_emptyenv);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testfile.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testfile.c
deleted file mode 100644
index 4e842f97..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testfile.c
+++ /dev/null
@@ -1,782 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_file_io.h"
-#include "apr_file_info.h"
-#include "apr_network_io.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_poll.h"
-#include "apr_lib.h"
-#include "test_apr.h"
-
-#define DIRNAME "data"
-#define FILENAME DIRNAME "/file_datafile.txt"
-#define TESTSTR  "This is the file data file."
-
-#define TESTREAD_BLKSIZE 1024
-#define APR_BUFFERSIZE   4096 /* This should match APR's buffer size. */
-
-
-
-static void test_open_noreadwrite(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_file_t *thefile = NULL;
-
-    rv = apr_file_open(&thefile, FILENAME,
-                       APR_CREATE | APR_EXCL, 
-                       APR_UREAD | APR_UWRITE | APR_GREAD, p);
-    CuAssertTrue(tc, rv != APR_SUCCESS);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_EACCES(rv));
-    CuAssertPtrEquals(tc, NULL, thefile); 
-}
-
-static void test_open_excl(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_file_t *thefile = NULL;
-
-    rv = apr_file_open(&thefile, FILENAME,
-                       APR_CREATE | APR_EXCL | APR_WRITE, 
-                       APR_UREAD | APR_UWRITE | APR_GREAD, p);
-    CuAssertTrue(tc, rv != APR_SUCCESS);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_EEXIST(rv));
-    CuAssertPtrEquals(tc, NULL, thefile); 
-}
-
-static void test_open_read(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_file_t *filetest = NULL;
-
-    rv = apr_file_open(&filetest, FILENAME, 
-                       APR_READ, 
-                       APR_UREAD | APR_UWRITE | APR_GREAD, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, filetest);
-    apr_file_close(filetest);
-}
-
-static void test_read(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_size_t nbytes = 256;
-    char *str = apr_pcalloc(p, nbytes + 1);
-    apr_file_t *filetest = NULL;
-    
-    rv = apr_file_open(&filetest, FILENAME, 
-                       APR_READ, 
-                       APR_UREAD | APR_UWRITE | APR_GREAD, p);
-
-    apr_assert_success(tc, "Opening test file " FILENAME, rv);
-    rv = apr_file_read(filetest, str, &nbytes);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, strlen(TESTSTR), nbytes);
-    CuAssertStrEquals(tc, TESTSTR, str);
-
-    apr_file_close(filetest);
-}
-
-static void test_filename(CuTest *tc)
-{
-    const char *str;
-    apr_status_t rv;
-    apr_file_t *filetest = NULL;
-    
-    rv = apr_file_open(&filetest, FILENAME, 
-                       APR_READ, 
-                       APR_UREAD | APR_UWRITE | APR_GREAD, p);
-    apr_assert_success(tc, "Opening test file " FILENAME, rv);
-
-    rv = apr_file_name_get(&str, filetest);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, FILENAME, str);
-
-    apr_file_close(filetest);
-}
-    
-static void test_fileclose(CuTest *tc)
-{
-    char str;
-    apr_status_t rv;
-    apr_size_t one = 1;
-    apr_file_t *filetest = NULL;
-    
-    rv = apr_file_open(&filetest, FILENAME, 
-                       APR_READ, 
-                       APR_UREAD | APR_UWRITE | APR_GREAD, p);
-    apr_assert_success(tc, "Opening test file " FILENAME, rv);
-
-    rv = apr_file_close(filetest);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    /* We just closed the file, so this should fail */
-    rv = apr_file_read(filetest, &str, &one);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_EBADF(rv));
-}
-
-static void test_file_remove(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_file_t *filetest = NULL;
-
-    rv = apr_file_remove(FILENAME, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_open(&filetest, FILENAME, APR_READ, 
-                       APR_UREAD | APR_UWRITE | APR_GREAD, p);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_ENOENT(rv));
-}
-
-static void test_open_write(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_file_t *filetest = NULL;
-
-    filetest = NULL;
-    rv = apr_file_open(&filetest, FILENAME, 
-                       APR_WRITE, 
-                       APR_UREAD | APR_UWRITE | APR_GREAD, p);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_ENOENT(rv));
-    CuAssertPtrEquals(tc, NULL, filetest);
-}
-
-static void test_open_writecreate(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_file_t *filetest = NULL;
-
-    filetest = NULL;
-    rv = apr_file_open(&filetest, FILENAME, 
-                       APR_WRITE | APR_CREATE, 
-                       APR_UREAD | APR_UWRITE | APR_GREAD, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    apr_file_close(filetest);
-}
-
-static void test_write(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_size_t bytes = strlen(TESTSTR);
-    apr_file_t *filetest = NULL;
-
-    rv = apr_file_open(&filetest, FILENAME, 
-                       APR_WRITE | APR_CREATE, 
-                       APR_UREAD | APR_UWRITE | APR_GREAD, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_write(filetest, TESTSTR, &bytes);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    apr_file_close(filetest);
-}
-
-static void test_open_readwrite(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_file_t *filetest = NULL;
-
-    filetest = NULL;
-    rv = apr_file_open(&filetest, FILENAME, 
-                       APR_READ | APR_WRITE, 
-                       APR_UREAD | APR_UWRITE | APR_GREAD, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, filetest);
-
-    apr_file_close(filetest);
-}
-
-static void test_seek(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_off_t offset = 5;
-    apr_size_t nbytes = 256;
-    char *str = apr_pcalloc(p, nbytes + 1);
-    apr_file_t *filetest = NULL;
-
-    rv = apr_file_open(&filetest, FILENAME, 
-                       APR_READ, 
-                       APR_UREAD | APR_UWRITE | APR_GREAD, p);
-    apr_assert_success(tc, "Open test file " FILENAME, rv);
-
-    rv = apr_file_read(filetest, str, &nbytes);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, strlen(TESTSTR), nbytes);
-    CuAssertStrEquals(tc, TESTSTR, str);
-
-    memset(str, 0, nbytes + 1);
-
-    rv = apr_file_seek(filetest, SEEK_SET, &offset);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    
-    rv = apr_file_read(filetest, str, &nbytes);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, strlen(TESTSTR) - 5, nbytes);
-    CuAssertStrEquals(tc, TESTSTR + 5, str);
-
-    apr_file_close(filetest);
-
-    /* Test for regression of sign error bug with SEEK_END and
-       buffered files. */
-    rv = apr_file_open(&filetest, FILENAME,
-                       APR_READ | APR_BUFFERED,
-                       APR_UREAD | APR_UWRITE | APR_GREAD, p);
-    apr_assert_success(tc, "Open test file " FILENAME, rv);
-
-    offset = -5;
-    rv = apr_file_seek(filetest, SEEK_END, &offset);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, strlen(TESTSTR) - 5, offset);
-
-    memset(str, 0, nbytes + 1);
-    nbytes = 256;
-    rv = apr_file_read(filetest, str, &nbytes);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, 5, nbytes);
-    CuAssertStrEquals(tc, TESTSTR + strlen(TESTSTR) - 5, str);
-
-    apr_file_close(filetest);
-}                
-
-static void test_userdata_set(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_file_t *filetest = NULL;
-
-    rv = apr_file_open(&filetest, FILENAME, 
-                       APR_WRITE, 
-                       APR_UREAD | APR_UWRITE | APR_GREAD, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_data_set(filetest, "This is a test",
-                           "test", apr_pool_cleanup_null);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    apr_file_close(filetest);
-}
-
-static void test_userdata_get(CuTest *tc)
-{
-    apr_status_t rv;
-    char *teststr;
-    apr_file_t *filetest = NULL;
-
-    rv = apr_file_open(&filetest, FILENAME, 
-                       APR_WRITE, 
-                       APR_UREAD | APR_UWRITE | APR_GREAD, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_data_set(filetest, "This is a test",
-                           "test", apr_pool_cleanup_null);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_data_get((void **)&teststr, "test", filetest);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, "This is a test", teststr);
-
-    apr_file_close(filetest);
-}
-
-static void test_userdata_getnokey(CuTest *tc)
-{
-    apr_status_t rv;
-    char *teststr;
-    apr_file_t *filetest = NULL;
-
-    rv = apr_file_open(&filetest, FILENAME, 
-                       APR_WRITE, 
-                       APR_UREAD | APR_UWRITE | APR_GREAD, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_data_get((void **)&teststr, "nokey", filetest);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrEquals(tc, NULL, teststr);
-    apr_file_close(filetest);
-}
-
-static void test_getc(CuTest *tc)
-{
-    apr_file_t *f = NULL;
-    apr_status_t rv;
-    char ch;
-
-    rv = apr_file_open(&f, FILENAME, APR_READ, 0, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    apr_file_getc(&ch, f);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, (int)TESTSTR[0], (int)ch);
-    apr_file_close(f);
-}
-
-static void test_ungetc(CuTest *tc)
-{
-    apr_file_t *f = NULL;
-    apr_status_t rv;
-    char ch;
-
-    rv = apr_file_open(&f, FILENAME, APR_READ, 0, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    apr_file_getc(&ch, f);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, (int)TESTSTR[0], (int)ch);
-
-    apr_file_ungetc('X', f);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    apr_file_getc(&ch, f);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, 'X', (int)ch);
-
-    apr_file_close(f);
-}
-
-static void test_gets(CuTest *tc)
-{
-    apr_file_t *f = NULL;
-    apr_status_t rv;
-    char *str = apr_palloc(p, 256);
-
-    rv = apr_file_open(&f, FILENAME, APR_READ, 0, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_gets(str, 256, f);
-    /* Only one line in the test file, so APR will encounter EOF on the first
-     * call to gets, but we should get APR_SUCCESS on this call and
-     * APR_EOF on the next.
-     */
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, TESTSTR, str);
-    rv = apr_file_gets(str, 256, f);
-    CuAssertIntEquals(tc, APR_EOF, rv);
-    CuAssertStrEquals(tc, "", str);
-    apr_file_close(f);
-}
-
-static void test_bigread(CuTest *tc)
-{
-    apr_file_t *f = NULL;
-    apr_status_t rv;
-    char buf[APR_BUFFERSIZE * 2];
-    apr_size_t nbytes;
-
-    /* Create a test file with known content.
-     */
-    rv = apr_file_open(&f, "data/created_file", 
-                       APR_CREATE | APR_WRITE | APR_TRUNCATE, 
-                       APR_UREAD | APR_UWRITE, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    nbytes = APR_BUFFERSIZE;
-    memset(buf, 0xFE, nbytes);
-
-    rv = apr_file_write(f, buf, &nbytes);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, APR_BUFFERSIZE, nbytes);
-
-    rv = apr_file_close(f);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    f = NULL;
-    rv = apr_file_open(&f, "data/created_file", APR_READ, 0, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    nbytes = sizeof buf;
-    rv = apr_file_read(f, buf, &nbytes);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, APR_BUFFERSIZE, nbytes);
-
-    rv = apr_file_close(f);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_remove("data/created_file", p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-}
-
-/* Test that the contents of file FNAME are equal to data EXPECT of
- * length EXPECTLEN. */
-static void file_contents_equal(CuTest *tc,
-                                const char *fname,
-                                const void *expect,
-                                apr_size_t expectlen)
-{
-    void *actual = apr_palloc(p, expectlen);
-    apr_file_t *f;
-    apr_status_t rv;
-    int rc;
-    
-    rv = apr_file_open(&f, fname, APR_READ|APR_BUFFERED, 0, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_read_full(f, actual, expectlen, NULL);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rc = memcmp(expect, actual, expectlen);
-    CuAssertIntEquals(tc, 0, rc);
-
-    rv = apr_file_close(f);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-}
-
-#define LINE1 "this is a line of text\n"
-#define LINE2 "this is a second line of text\n"
-
-static void test_writev_buffered(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_file_t *f;
-    apr_size_t nbytes;
-    struct iovec vec[2];
-    const char *fname = "data/testwritev_buffered.dat";
-
-    rv = apr_file_open(&f, fname,
-                       APR_WRITE | APR_CREATE | APR_TRUNCATE |
-                       APR_BUFFERED, APR_OS_DEFAULT, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    nbytes = strlen(TESTSTR);
-    rv = apr_file_write(f, TESTSTR, &nbytes);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    vec[0].iov_base = LINE1;
-    vec[0].iov_len = strlen(LINE1);
-    vec[1].iov_base = LINE2;
-    vec[1].iov_len = strlen(LINE2);
-
-    rv = apr_file_writev(f, vec, 2, &nbytes);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_close(f);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    file_contents_equal(tc, fname, TESTSTR LINE1 LINE2,
-                        strlen(TESTSTR) + strlen(LINE1) + strlen(LINE2));
-}
-
-static void test_writev_buffered_seek(CuTest *tc)
-{
-    apr_file_t *f;
-    apr_status_t rv;
-    apr_off_t off = 0;
-    struct iovec vec[3];
-    apr_size_t nbytes = strlen(TESTSTR);
-    char *str = apr_pcalloc(p, nbytes+1);
-    const char *fname = "data/testwritev_buffered.dat";
-
-    rv = apr_file_open(&f, fname,
-                       APR_WRITE | APR_READ | APR_BUFFERED,
-                       APR_OS_DEFAULT, p);
-
-    rv = apr_file_read(f, str, &nbytes);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, TESTSTR, str);
-
-    rv = apr_file_seek(f, APR_SET, &off);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    vec[0].iov_base = LINE1;
-    vec[0].iov_len = strlen(LINE1);
-    vec[1].iov_base = LINE2;
-    vec[1].iov_len = strlen(LINE2);
-    vec[2].iov_base = TESTSTR;
-    vec[2].iov_len = strlen(TESTSTR);
-
-    rv = apr_file_writev(f, vec, 3, &nbytes);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_close(f);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    file_contents_equal(tc, fname, LINE1 LINE2 TESTSTR,
-                        strlen(LINE1) + strlen(LINE2) + strlen(TESTSTR));
-
-    rv = apr_file_remove(fname, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-}
-
-/* This is a horrible name for this function.  We are testing APR, not how
- * Apache uses APR.  And, this function tests _way_ too much stuff.
- */
-static void test_mod_neg(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_file_t *f;
-    const char *s;
-    int i;
-    apr_size_t nbytes;
-    char buf[8192];
-    apr_off_t cur;
-    const char *fname = "data/modneg.dat";
-
-    rv = apr_file_open(&f, fname, 
-                       APR_CREATE | APR_WRITE, APR_UREAD | APR_UWRITE, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    s = "body56789\n";
-    nbytes = strlen(s);
-    rv = apr_file_write(f, s, &nbytes);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, strlen(s), nbytes);
-    
-    for (i = 0; i < 7980; i++) {
-        s = "0";
-        nbytes = strlen(s);
-        rv = apr_file_write(f, s, &nbytes);
-        CuAssertIntEquals(tc, APR_SUCCESS, rv);
-        CuAssertIntEquals(tc, strlen(s), nbytes);
-    }
-    
-    s = "end456789\n";
-    nbytes = strlen(s);
-    rv = apr_file_write(f, s, &nbytes);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, strlen(s), nbytes);
-
-    for (i = 0; i < 10000; i++) {
-        s = "1";
-        nbytes = strlen(s);
-        rv = apr_file_write(f, s, &nbytes);
-        CuAssertIntEquals(tc, APR_SUCCESS, rv);
-        CuAssertIntEquals(tc, strlen(s), nbytes);
-    }
-    
-    rv = apr_file_close(f);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_open(&f, fname, APR_READ, 0, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_gets(buf, 11, f);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, "body56789\n", buf);
-
-    cur = 0;
-    rv = apr_file_seek(f, APR_CUR, &cur);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssert(tc, "File Pointer Mismatch, expected 10", cur == 10);
-
-    nbytes = sizeof(buf);
-    rv = apr_file_read(f, buf, &nbytes);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, nbytes, sizeof(buf));
-
-    cur = -((apr_off_t)nbytes - 7980);
-    rv = apr_file_seek(f, APR_CUR, &cur);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssert(tc, "File Pointer Mismatch, expected 7990", cur == 7990);
-
-    rv = apr_file_gets(buf, 11, f);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, "end456789\n", buf);
-
-    rv = apr_file_close(f);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_remove(fname, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-}
-
-static void test_truncate(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_file_t *f;
-    const char *fname = "data/testtruncate.dat";
-    const char *s;
-    apr_size_t nbytes;
-    apr_finfo_t finfo;
-
-    apr_file_remove(fname, p);
-
-    rv = apr_file_open(&f, fname,
-                       APR_CREATE | APR_WRITE, APR_UREAD | APR_UWRITE, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    
-    s = "some data";
-    nbytes = strlen(s);
-    rv = apr_file_write(f, s, &nbytes);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, strlen(s), nbytes);
-
-    rv = apr_file_close(f);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_open(&f, fname,
-                       APR_TRUNCATE | APR_WRITE, APR_UREAD | APR_UWRITE, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_close(f);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_stat(&finfo, fname, APR_FINFO_SIZE, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssert(tc, "File size mismatch, expected 0 (empty)", finfo.size == 0);
-
-    rv = apr_file_remove(fname, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-}
-
-static void test_fail_write_flush(CuTest *tc)
-{
-    apr_file_t *f;
-    const char *fname = "data/testflush.dat";
-    apr_status_t rv;
-    char buf[APR_BUFFERSIZE];
-    int n;
-
-    apr_file_remove(fname, p);
-
-    apr_assert_success(tc, "open test file",
-                       apr_file_open(&f, fname,
-                                     APR_CREATE|APR_READ|APR_BUFFERED,
-                                     APR_UREAD|APR_UWRITE, p));
-
-    memset(buf, 'A', sizeof buf);
-
-    /* Try three writes.  One of these should fail when it exceeds the
-     * internal buffer and actually tries to write to the file, which
-     * was opened read-only and hence should be unwritable. */
-    for (n = 0, rv = APR_SUCCESS; n < 4 && rv == APR_SUCCESS; n++) {
-        apr_size_t bytes = sizeof buf;
-        rv = apr_file_write(f, buf, &bytes);
-    }
-
-    CuAssert(tc, "failed to write to read-only buffered fd",
-             rv != APR_SUCCESS);
-
-    apr_file_close(f);
-    apr_file_remove(fname, p);
-}
-
-static void test_fail_read_flush(CuTest *tc)
-{
-    apr_file_t *f;
-    const char *fname = "data/testflush.dat";
-    apr_status_t rv;
-    char buf[2];
-
-    apr_file_remove(fname, p);
-
-    apr_assert_success(tc, "open test file",
-                       apr_file_open(&f, fname,
-                                     APR_CREATE|APR_READ|APR_BUFFERED,
-                                     APR_UREAD|APR_UWRITE, p));
-
-    /* this write should be buffered. */
-    apr_assert_success(tc, "buffered write should succeed",
-                       apr_file_puts("hello", f));
-
-    /* Now, trying a read should fail since the write must be flushed,
-     * and should fail with something other than EOF since the file is
-     * opened read-only. */
-    rv = apr_file_read_full(f, buf, 2, NULL);
-
-    CuAssert(tc, "read should flush buffered write and fail",
-             rv != APR_SUCCESS && rv != APR_EOF);
-
-    /* Likewise for gets */
-    rv = apr_file_gets(buf, 2, f);
-
-    CuAssert(tc, "gets should flush buffered write and fail",
-             rv != APR_SUCCESS && rv != APR_EOF);
-
-    apr_file_close(f);
-    apr_file_remove(fname, p);
-}
-
-static void test_xthread(CuTest *tc)
-{
-    apr_file_t *f;
-    const char *fname = "data/testxthread.dat";
-    apr_status_t rv;
-    apr_int32_t flags = APR_CREATE|APR_READ|APR_WRITE|APR_APPEND|APR_XTHREAD;
-    char buf[128] = { 0 };
-
-    /* Test for bug 38438, opening file with append + xthread and seeking to 
-       the end of the file resulted in writes going to the beginning not the
-       end. */
-
-    apr_file_remove(fname, p);
-
-    rv = apr_file_open(&f, fname, flags, APR_UREAD|APR_UWRITE, p);
-    CuAssert(tc, "open test file", rv == APR_SUCCESS);
-
-    rv = apr_file_puts("hello", f);
-    CuAssert(tc, "write should succeed", rv == APR_SUCCESS);
-
-    apr_file_close(f);
-    
-    rv = apr_file_open(&f, fname, flags, APR_UREAD|APR_UWRITE, p);
-    CuAssert(tc, "open test file", rv == APR_SUCCESS);
-
-    /* Seek to the end. */
-    {
-        apr_off_t offset = 0;
-
-        rv = apr_file_seek(f, APR_END, &offset);
-    }
-
-    rv = apr_file_puts("world", f);
-    CuAssert(tc, "more writes should succeed", rv == APR_SUCCESS);
-
-    /* Back to the beginning. */
-    {
-        apr_off_t offset = 0;
-        
-        rv = apr_file_seek(f, APR_SET, &offset);
-    }
-    
-    apr_file_read_full(f, buf, sizeof(buf), NULL);
-
-    CuAssertStrEquals(tc, "helloworld", buf);
-
-    apr_file_close(f);
-}
-
-CuSuite *testfile(void)
-{
-    CuSuite *suite = CuSuiteNew("File I/O");
-
-    SUITE_ADD_TEST(suite, test_open_noreadwrite);
-    SUITE_ADD_TEST(suite, test_open_excl);
-    SUITE_ADD_TEST(suite, test_open_read);
-    SUITE_ADD_TEST(suite, test_open_readwrite);
-    SUITE_ADD_TEST(suite, test_read); 
-    SUITE_ADD_TEST(suite, test_seek);
-    SUITE_ADD_TEST(suite, test_filename);
-    SUITE_ADD_TEST(suite, test_fileclose);
-    SUITE_ADD_TEST(suite, test_file_remove);
-    SUITE_ADD_TEST(suite, test_open_write);
-    SUITE_ADD_TEST(suite, test_open_writecreate);
-    SUITE_ADD_TEST(suite, test_write);
-    SUITE_ADD_TEST(suite, test_userdata_set);
-    SUITE_ADD_TEST(suite, test_userdata_get);
-    SUITE_ADD_TEST(suite, test_userdata_getnokey);
-    SUITE_ADD_TEST(suite, test_getc);
-    SUITE_ADD_TEST(suite, test_ungetc);
-    SUITE_ADD_TEST(suite, test_gets);
-    SUITE_ADD_TEST(suite, test_bigread);
-    SUITE_ADD_TEST(suite, test_writev_buffered);
-    SUITE_ADD_TEST(suite, test_writev_buffered_seek);
-    SUITE_ADD_TEST(suite, test_mod_neg);
-    SUITE_ADD_TEST(suite, test_truncate);
-    SUITE_ADD_TEST(suite, test_fail_write_flush);
-    SUITE_ADD_TEST(suite, test_fail_read_flush);
-    SUITE_ADD_TEST(suite, test_xthread);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testfileinfo.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testfileinfo.c
deleted file mode 100644
index 00ad9631..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testfileinfo.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_file_io.h"
-#include "apr_file_info.h"
-#include "apr_strings.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_poll.h"
-#include "apr_lib.h"
-#include "test_apr.h"
-
-#define FILENAME "data/file_datafile.txt"
-#define NEWFILENAME "data/new_datafile.txt"
-#define NEWFILEDATA "This is new text in a new file."
-
-static const struct view_fileinfo
-{
-    apr_int32_t bits;
-    char *description;
-} vfi[] = {
-    {APR_FINFO_MTIME,  "MTIME"},
-    {APR_FINFO_CTIME,  "CTIME"},
-    {APR_FINFO_ATIME,  "ATIME"},
-    {APR_FINFO_SIZE,   "SIZE"},
-    {APR_FINFO_DEV,    "DEV"},
-    {APR_FINFO_INODE,  "INODE"},
-    {APR_FINFO_NLINK,  "NLINK"},
-    {APR_FINFO_TYPE,   "TYPE"},
-    {APR_FINFO_USER,   "USER"}, 
-    {APR_FINFO_GROUP,  "GROUP"}, 
-    {APR_FINFO_UPROT,  "UPROT"}, 
-    {APR_FINFO_GPROT,  "GPROT"},
-    {APR_FINFO_WPROT,  "WPROT"},
-    {0,                NULL}
-}; 
-
-static void finfo_equal(CuTest *tc, apr_finfo_t f1, apr_finfo_t f2)
-{
-    /* Minimum supported flags across all platforms (APR_FINFO_MIN) */
-    CuAssert(tc, "apr_stat and apr_getfileinfo must return APR_FINFO_TYPE",
-             (f1.valid & f2.valid & APR_FINFO_TYPE));
-    CuAssert(tc, "apr_stat and apr_getfileinfo differ in filetype",
-             f1.filetype == f2.filetype);
-    CuAssert(tc, "apr_stat and apr_getfileinfo must return APR_FINFO_SIZE",
-             (f1.valid & f2.valid & APR_FINFO_SIZE));
-    CuAssert(tc, "apr_stat and apr_getfileinfo differ in size",
-             f1.size == f2.size);
-    CuAssert(tc, "apr_stat and apr_getfileinfo must return APR_FINFO_ATIME",
-             (f1.valid & f2.valid & APR_FINFO_ATIME));
-    CuAssert(tc, "apr_stat and apr_getfileinfo differ in atime",
-             f1.atime == f2.atime);
-    CuAssert(tc, "apr_stat and apr_getfileinfo must return APR_FINFO_MTIME",
-             (f1.valid & f2.valid & APR_FINFO_MTIME));
-    CuAssert(tc, "apr_stat and apr_getfileinfo differ in mtime",
-             f1.mtime == f2.mtime);
-    CuAssert(tc, "apr_stat and apr_getfileinfo must return APR_FINFO_CTIME",
-             (f1.valid & f2.valid & APR_FINFO_CTIME));
-    CuAssert(tc, "apr_stat and apr_getfileinfo differ in ctime",
-             f1.ctime == f2.ctime);
-
-    if (f1.valid & f2.valid & APR_FINFO_NAME)
-        CuAssert(tc, "apr_stat and apr_getfileinfo differ in name",
-                 !strcmp(f1.name, f2.name));
-    if (f1.fname && f2.fname)
-        CuAssert(tc, "apr_stat and apr_getfileinfo differ in fname",
-                 !strcmp(f1.fname, f2.fname));
-
-    /* Additional supported flags not supported on all platforms */
-    if (f1.valid & f2.valid & APR_FINFO_USER)
-        CuAssert(tc, "apr_stat and apr_getfileinfo differ in user",
-                 !apr_uid_compare(f1.user, f2.user));
-    if (f1.valid & f2.valid & APR_FINFO_GROUP)
-        CuAssert(tc, "apr_stat and apr_getfileinfo differ in group",
-                 !apr_gid_compare(f1.group, f2.group));
-    if (f1.valid & f2.valid & APR_FINFO_INODE)
-        CuAssert(tc, "apr_stat and apr_getfileinfo differ in inode",
-                 f1.inode == f2.inode);
-    if (f1.valid & f2.valid & APR_FINFO_DEV)
-        CuAssert(tc, "apr_stat and apr_getfileinfo differ in device",
-                 f1.device == f2.device);
-    if (f1.valid & f2.valid & APR_FINFO_NLINK)
-        CuAssert(tc, "apr_stat and apr_getfileinfo differ in nlink",
-                 f1.nlink == f2.nlink);
-    if (f1.valid & f2.valid & APR_FINFO_CSIZE)
-        CuAssert(tc, "apr_stat and apr_getfileinfo differ in csize",
-                 f1.csize == f2.csize);
-    if (f1.valid & f2.valid & APR_FINFO_PROT)
-        CuAssert(tc, "apr_stat and apr_getfileinfo differ in protection",
-                 f1.protection == f2.protection);
-}
-
-static void test_info_get(CuTest *tc)
-{
-    apr_file_t *thefile;
-    apr_finfo_t finfo;
-    apr_status_t rv;
-
-    rv = apr_file_open(&thefile, FILENAME, APR_READ, APR_OS_DEFAULT, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_info_get(&finfo, APR_FINFO_NORM, thefile);
-    if (rv  == APR_INCOMPLETE) {
-        char *str;
-	int i;
-        str = apr_pstrdup(p, "APR_INCOMPLETE:  Missing ");
-        for (i = 0; vfi[i].bits; ++i) {
-            if (vfi[i].bits & ~finfo.valid) {
-                str = apr_pstrcat(p, str, vfi[i].description, " ", NULL);
-            }
-        }
-        CuFail(tc, str);
-    }
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    apr_file_close(thefile);
-}
-
-static void test_stat(CuTest *tc)
-{
-    apr_finfo_t finfo;
-    apr_status_t rv;
-
-    rv = apr_stat(&finfo, FILENAME, APR_FINFO_NORM, p);
-    if (rv  == APR_INCOMPLETE) {
-        char *str;
-	int i;
-        str = apr_pstrdup(p, "APR_INCOMPLETE:  Missing ");
-        for (i = 0; vfi[i].bits; ++i) {
-            if (vfi[i].bits & ~finfo.valid) {
-                str = apr_pstrcat(p, str, vfi[i].description, " ", NULL);
-            }
-        }
-        CuFail(tc, str);
-    }
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-}
-
-static void test_stat_eq_finfo(CuTest *tc)
-{
-    apr_file_t *thefile;
-    apr_finfo_t finfo;
-    apr_finfo_t stat_finfo;
-    apr_status_t rv;
-
-    rv = apr_file_open(&thefile, FILENAME, APR_READ, APR_OS_DEFAULT, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_file_info_get(&finfo, APR_FINFO_NORM, thefile);
-
-    /* Opening the file may have toggled the atime member (time last
-     * accessed), so fetch our apr_stat() after getting the fileinfo 
-     * of the open file...
-     */
-    rv = apr_stat(&stat_finfo, FILENAME, APR_FINFO_NORM, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    apr_file_close(thefile);
-
-    finfo_equal(tc, stat_finfo, finfo);
-}
-
-static void test_buffered_write_size(CuTest *tc)
-{
-    const apr_size_t data_len = strlen(NEWFILEDATA);
-    apr_file_t *thefile;
-    apr_finfo_t finfo;
-    apr_status_t rv;
-    apr_size_t bytes;
-
-    rv = apr_file_open(&thefile, NEWFILENAME,
-                       APR_READ | APR_WRITE | APR_CREATE | APR_TRUNCATE
-                       | APR_BUFFERED | APR_DELONCLOSE,
-                       APR_OS_DEFAULT, p);
-    apr_assert_success(tc, "open file", rv);
-
-    /* A funny thing happened to me the other day: I wrote something
-     * into a buffered file, then asked for its size using
-     * apr_file_info_get; and guess what? The size was 0! That's not a
-     * nice way to behave.
-     */
-    bytes = data_len;
-    rv = apr_file_write(thefile, NEWFILEDATA, &bytes);
-    apr_assert_success(tc, "write file contents", rv);
-    CuAssertTrue(tc, data_len == bytes);
-
-    rv = apr_file_info_get(&finfo, APR_FINFO_SIZE, thefile);
-    apr_assert_success(tc, "get file size", rv);
-    CuAssertTrue(tc, bytes == (apr_size_t) finfo.size);
-    apr_file_close(thefile);
-}
-
-static void test_mtime_set(CuTest *tc)
-{
-    apr_file_t *thefile;
-    apr_finfo_t finfo;
-    apr_time_t epoch = 0;
-    apr_status_t rv;
-
-    /* This test sort of depends on the system clock being at least
-     * marginally ccorrect; We'll be setting the modification time to
-     * the epoch.
-     */
-    rv = apr_file_open(&thefile, NEWFILENAME,
-                       APR_READ | APR_WRITE | APR_CREATE | APR_TRUNCATE
-                       | APR_BUFFERED | APR_DELONCLOSE,
-                       APR_OS_DEFAULT, p);
-    apr_assert_success(tc, "open file", rv);
-
-    /* Check that the current mtime is not the epoch */
-    rv = apr_stat(&finfo, NEWFILENAME, APR_FINFO_MTIME, p);
-    if (rv  == APR_INCOMPLETE) {
-        char *str;
-	int i;
-        str = apr_pstrdup(p, "APR_INCOMPLETE:  Missing ");
-        for (i = 0; vfi[i].bits; ++i) {
-            if (vfi[i].bits & ~finfo.valid) {
-                str = apr_pstrcat(p, str, vfi[i].description, " ", NULL);
-            }
-        }
-        CuFail(tc, str);
-    }
-    apr_assert_success(tc, "get initial mtime", rv);
-    CuAssertTrue(tc, finfo.mtime != epoch);
-
-    /* Reset the mtime to the epoch and verify the result.
-     * Note: we blindly assume that if the first apr_stat succeeded,
-     * the second one will, too.
-     */
-    rv = apr_file_mtime_set(NEWFILENAME, epoch, p);
-    apr_assert_success(tc, "set mtime", rv);
-
-    rv = apr_stat(&finfo, NEWFILENAME, APR_FINFO_MTIME, p);
-    apr_assert_success(tc, "get modified mtime", rv);
-    CuAssertTrue(tc, finfo.mtime == epoch);
-
-    apr_file_close(thefile);
-}
-
-CuSuite *testfileinfo(void)
-{
-    CuSuite *suite = CuSuiteNew("File Info");
-
-    SUITE_ADD_TEST(suite, test_info_get);
-    SUITE_ADD_TEST(suite, test_stat);
-    SUITE_ADD_TEST(suite, test_stat_eq_finfo);
-    SUITE_ADD_TEST(suite, test_buffered_write_size);
-    SUITE_ADD_TEST(suite, test_mtime_set);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testflock.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testflock.c
deleted file mode 100644
index 86f25ba2..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testflock.c
+++ /dev/null
@@ -1,156 +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.
- */
-
-/*
- * USAGE
- *
- * Start one process, no args, and place it into the background. Start a
- * second process with the "-r" switch to attempt a read on the file
- * created by the first process.
- *
- * $ ./testflock &
- * ...messages...
- * $ ./testflock -r
- * ...messages...
- *
- * The first process will sleep for 30 seconds while holding a lock. The
- * second process will attempt to grab it (non-blocking) and fail. It
- * will then grab it with a blocking scheme. When the first process' 30
- * seconds are up, it will exit (thus releasing its lock). The second
- * process will acquire the lock, then exit.
- */
-
-#include "apr_pools.h"
-#include "apr_file_io.h"
-#include "apr_time.h"
-#include "apr_general.h"
-#include "apr_getopt.h"
-#include "apr_strings.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-
-const char *testfile = "testfile.tmp";
-
-static apr_pool_t *pool = NULL;
-
-static void errmsg(const char *msg)
-{
-    if (pool != NULL)
-        apr_pool_destroy(pool);
-    fprintf(stderr, msg);
-    exit(1);
-}
-
-static void errmsg2(const char *msg, apr_status_t rv)
-{
-    char *newmsg;
-    char errstr[120];
-
-    apr_strerror(rv, errstr, sizeof errstr);
-    newmsg = apr_psprintf(pool, "%s: %s (%d)\n",
-                          msg, errstr, rv);
-    errmsg(newmsg);
-    exit(1);
-}
-
-static void do_read(void)
-{
-    apr_file_t *file;
-    apr_status_t status;
-
-    if (apr_file_open(&file, testfile, APR_WRITE,
-                 APR_OS_DEFAULT, pool) != APR_SUCCESS)
-        errmsg("Could not open test file.\n");
-    printf("Test file opened.\n");
-
-    status = apr_file_lock(file, APR_FLOCK_EXCLUSIVE | APR_FLOCK_NONBLOCK);
-    if (!APR_STATUS_IS_EAGAIN(status)) {
-        char msg[200];
-        errmsg(apr_psprintf(pool, "Expected APR_EAGAIN. Got %d: %s.\n",
-                            status, apr_strerror(status, msg, sizeof(msg))));
-    }
-    printf("First attempt: we were properly locked out.\nWaiting for lock...");
-    fflush(stdout);
-
-    if (apr_file_lock(file, APR_FLOCK_EXCLUSIVE) != APR_SUCCESS)
-        errmsg("Could not establish lock on test file.");
-    printf(" got it.\n");
-
-    (void) apr_file_close(file);
-    printf("Exiting.\n");
-}
-
-static void do_write(void)
-{
-    apr_file_t *file;
-    apr_status_t rv;
-
-    if (apr_file_open(&file, testfile, APR_WRITE|APR_CREATE, APR_OS_DEFAULT,
-                 pool) != APR_SUCCESS)
-        errmsg("Could not create file.\n");
-    printf("Test file created.\n");
-
-    if ((rv = apr_file_lock(file, APR_FLOCK_EXCLUSIVE)) != APR_SUCCESS)
-        errmsg2("Could not lock the file", rv);
-    printf("Lock created.\nSleeping...");
-    fflush(stdout);
-
-    apr_sleep(apr_time_from_sec(30));
-
-    (void) apr_file_close(file);
-    printf(" done.\nExiting.\n");
-}
-
-int main(int argc, const char * const *argv)
-{
-    int reader = 0;
-    apr_status_t status;
-    char optchar;
-    const char *optarg;
-    apr_getopt_t *opt;
-
-    if (apr_initialize() != APR_SUCCESS)
-        errmsg("Could not initialize APR.\n");
-    atexit(apr_terminate);
-
-    if (apr_pool_create(&pool, NULL) != APR_SUCCESS)
-        errmsg("Could not create global pool.\n");
-
-    if (apr_getopt_init(&opt, pool, argc, argv) != APR_SUCCESS)
-        errmsg("Could not parse options.\n");
-
-    while ((status = apr_getopt(opt, "rf:", &optchar, &optarg)) == APR_SUCCESS) {
-        if (optchar == 'r')
-            ++reader;
-        else if (optchar == 'f')
-            testfile = optarg;
-    }
-    if (status != APR_SUCCESS && status != APR_EOF) {
-        char msgbuf[80];
-
-        fprintf(stderr, "error: %s\n",
-                apr_strerror(status, msgbuf, sizeof msgbuf));
-        exit(1);
-    }
-
-    if (reader)
-        do_read();
-    else
-        do_write();
-
-    return 0;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testfmt.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testfmt.c
deleted file mode 100644
index eff39e0d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testfmt.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "test_apr.h"
-#include "apr.h"
-#include "apr_portable.h"
-#include "apr_strings.h"
-
-static void ssize_t_fmt(CuTest *tc)
-{
-    char buf[100];
-    apr_ssize_t var = 0;
-
-    sprintf(buf, "%" APR_SSIZE_T_FMT, var);
-    CuAssertStrEquals(tc, "0", buf);
-    apr_snprintf(buf, sizeof(buf), "%" APR_SSIZE_T_FMT, var);
-    CuAssertStrEquals(tc, "0", buf);
-}
-
-static void size_t_fmt(CuTest *tc)
-{
-    char buf[100];
-    apr_size_t var = 0;
-
-    sprintf(buf, "%" APR_SIZE_T_FMT, var);
-    CuAssertStrEquals(tc, "0", buf);
-    apr_snprintf(buf, sizeof(buf), "%" APR_SIZE_T_FMT, var);
-    CuAssertStrEquals(tc, "0", buf);
-}
-
-static void off_t_fmt(CuTest *tc)
-{
-    char buf[100];
-    apr_off_t var = 0;
-
-    sprintf(buf, "%" APR_OFF_T_FMT, var);
-    CuAssertStrEquals(tc, "0", buf);
-    apr_snprintf(buf, sizeof(buf), "%" APR_OFF_T_FMT, var);
-    CuAssertStrEquals(tc, "0", buf);
-}
-
-static void pid_t_fmt(CuTest *tc)
-{
-    char buf[100];
-    pid_t var = 0;
-
-    sprintf(buf, "%" APR_PID_T_FMT, var);
-    CuAssertStrEquals(tc, "0", buf);
-    apr_snprintf(buf, sizeof(buf), "%" APR_PID_T_FMT, var);
-    CuAssertStrEquals(tc, "0", buf);
-}
-
-static void int64_t_fmt(CuTest *tc)
-{
-    char buf[100];
-    apr_int64_t var = 0;
-
-    sprintf(buf, "%" APR_INT64_T_FMT, var);
-    CuAssertStrEquals(tc, "0", buf);
-    apr_snprintf(buf, sizeof(buf), "%" APR_INT64_T_FMT, var);
-    CuAssertStrEquals(tc, "0", buf);
-}
-
-static void uint64_t_fmt(CuTest *tc)
-{
-    char buf[100];
-    apr_uint64_t var = 14000000;
-
-    sprintf(buf, "%" APR_UINT64_T_FMT, var);
-    CuAssertStrEquals(tc, "14000000", buf);
-    apr_snprintf(buf, sizeof(buf), "%" APR_UINT64_T_FMT, var);
-    CuAssertStrEquals(tc, "14000000", buf);
-}
-
-static void uint64_t_hex_fmt(CuTest *tc)
-{
-    char buf[100];
-    apr_uint64_t var = 14000000;
-
-    sprintf(buf, "%" APR_UINT64_T_HEX_FMT, var);
-    CuAssertStrEquals(tc, "d59f80", buf);
-    apr_snprintf(buf, sizeof(buf), "%" APR_UINT64_T_HEX_FMT, var);
-    CuAssertStrEquals(tc, "d59f80", buf);
-}
-
-CuSuite *testfmt(void)
-{
-    CuSuite *suite = CuSuiteNew("Formats");
-
-    SUITE_ADD_TEST(suite, ssize_t_fmt);
-    SUITE_ADD_TEST(suite, size_t_fmt);
-    SUITE_ADD_TEST(suite, off_t_fmt);
-    SUITE_ADD_TEST(suite, pid_t_fmt);
-    SUITE_ADD_TEST(suite, int64_t_fmt);
-    SUITE_ADD_TEST(suite, uint64_t_fmt);
-    SUITE_ADD_TEST(suite, uint64_t_hex_fmt);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testglobalmutex.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testglobalmutex.c
deleted file mode 100644
index 7ac3b518..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testglobalmutex.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_shm.h"
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-#include "apr_global_mutex.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_getopt.h"
-#include "errno.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include "test_apr.h"
-
-
-#define MAX_ITER 4000
-#define MAX_COUNTER (MAX_ITER * 4)
-
-apr_global_mutex_t *global_lock;
-apr_pool_t *pool;
-volatile int *x;
-
-static int make_child(apr_proc_t **proc, apr_pool_t *p)
-{
-    int i = 0;
-    *proc = apr_pcalloc(p, sizeof(**proc));
-
-    /* slight delay to allow things to settle */
-    apr_sleep (1);
-
-    if (apr_proc_fork(*proc, p) == APR_INCHILD) {
-        apr_initialize();
-        
-        apr_global_mutex_child_init(&global_lock, NULL, p);
-
-        while (1) {
-            apr_global_mutex_lock(global_lock); 
-            if (i == MAX_ITER) {
-                apr_global_mutex_unlock(global_lock); 
-                exit(1);
-            }
-            i++;
-            (*x)++;
-            apr_global_mutex_unlock(global_lock); 
-        }
-        exit(1);
-    }
-    return APR_SUCCESS;
-}
-
-static apr_status_t test_exclusive(const char *lockname)
-{
-    apr_proc_t *p1, *p2, *p3, *p4;
-    apr_status_t s1, s2, s3, s4;
- 
-    printf("Exclusive lock test\n");
-    printf("%-60s", "    Initializing the lock");
-    s1 = apr_global_mutex_create(&global_lock, lockname, APR_LOCK_DEFAULT, pool);
- 
-    if (s1 != APR_SUCCESS) {
-        printf("Failed!\n");
-        return s1;
-    }
-    printf("OK\n");
- 
-    printf("%-60s", "    Starting all of the processes");
-    fflush(stdout);
-    s1 = make_child(&p1, pool);
-    s2 = make_child(&p2, pool);
-    s3 = make_child(&p3, pool);
-    s4 = make_child(&p4, pool);
-    if (s1 != APR_SUCCESS || s2 != APR_SUCCESS ||
-        s3 != APR_SUCCESS || s4 != APR_SUCCESS) {
-        printf("Failed!\n");
-        return s1;
-    }
-    printf("OK\n");
- 
-    printf("%-60s", "    Waiting for processes to exit");
-    s1 = apr_proc_wait(p1, NULL, NULL, APR_WAIT);
-    s2 = apr_proc_wait(p2, NULL, NULL, APR_WAIT);
-    s3 = apr_proc_wait(p3, NULL, NULL, APR_WAIT);
-    s4 = apr_proc_wait(p4, NULL, NULL, APR_WAIT);
-    printf("OK\n");
- 
-    if ((*x) != MAX_COUNTER) {
-        fprintf(stderr, "Locks don't appear to work!  x = %d instead of %d\n",
-                (*x), MAX_COUNTER);
-    }
-    else {
-        printf("Test passed\n");
-    }
-    return APR_SUCCESS;
-}
-
-int main(int argc, const char * const *argv)
-{
-    apr_status_t rv;
-    char errmsg[200];
-    const char *lockname = NULL;
-    const char *shmname = "shm.file";
-    apr_getopt_t *opt;
-    char optchar;
-    const char *optarg;
-    apr_shm_t *shm;
-
-    printf("APR Proc Mutex Test\n==============\n\n");
-        
-    apr_initialize();
-    atexit(apr_terminate);
-
-    if (apr_pool_create(&pool, NULL) != APR_SUCCESS)
-        exit(-1);
-
-    if ((rv = apr_getopt_init(&opt, pool, argc, argv)) != APR_SUCCESS) {
-        fprintf(stderr, "Could not set up to parse options: [%d] %s\n",
-                rv, apr_strerror(rv, errmsg, sizeof errmsg));
-        exit(-1);
-    }
-        
-    while ((rv = apr_getopt(opt, "f:", &optchar, &optarg)) == APR_SUCCESS) {
-        if (optchar == 'f') {
-            lockname = optarg;
-        }
-    }
-
-    if (rv != APR_SUCCESS && rv != APR_EOF) {
-        fprintf(stderr, "Could not parse options: [%d] %s\n",
-                rv, apr_strerror(rv, errmsg, sizeof errmsg));
-        exit(-1);
-    }
-
-    apr_shm_create(&shm, sizeof(int), shmname, pool);
-    x = apr_shm_baseaddr_get(shm);
-
-    if ((rv = test_exclusive(lockname)) != APR_SUCCESS) {
-        fprintf(stderr,"Exclusive Lock test failed : [%d] %s\n",
-                rv, apr_strerror(rv, (char*)errmsg, 200));
-        exit(-2);
-    }
-    
-    return 0;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testhash.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testhash.c
deleted file mode 100644
index 6962236e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testhash.c
+++ /dev/null
@@ -1,403 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "test_apr.h"
-#include "apr.h"
-#include "apr_strings.h"
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_hash.h"
-
-static void dump_hash(apr_pool_t *p, apr_hash_t *h, char *str) 
-{
-    apr_hash_index_t *hi;
-    char *val, *key;
-    apr_ssize_t len;
-    int i = 0;
-
-    str[0] = '\0';
-
-    for (hi = apr_hash_first(p, h); hi; hi = apr_hash_next(hi)) {
-        apr_hash_this(hi,(void*) &key, &len, (void*) &val);
-        apr_snprintf(str, 8196, "%sKey %s (%" APR_SSIZE_T_FMT ") Value %s\n", 
-                     str, key, len, val);
-        i++;
-    }
-    apr_snprintf(str, 8196, "%s#entries %d\n", str, i);
-}
-
-static void sum_hash(apr_pool_t *p, apr_hash_t *h, int *pcount, int *keySum, int *valSum) 
-{
-    apr_hash_index_t *hi;
-    void *val, *key;
-    int count = 0;
-
-    *keySum = 0;
-    *valSum = 0;
-    *pcount = 0;
-    for (hi = apr_hash_first(p, h); hi; hi = apr_hash_next(hi)) {
-        apr_hash_this(hi, (void*)&key, NULL, &val);
-        *valSum += *(int *)val;
-        *keySum += *(int *)key;
-        count++;
-    }
-    *pcount=count;
-}
-
-static void hash_make(CuTest *tc)
-{
-    apr_hash_t *h = NULL;
-
-    h = apr_hash_make(p);
-    CuAssertPtrNotNull(tc, h);
-}
-
-static void hash_set(CuTest *tc)
-{
-    apr_hash_t *h = NULL;
-    char *result = NULL;
-
-    h = apr_hash_make(p);
-    CuAssertPtrNotNull(tc, h);
-
-    apr_hash_set(h, "key", APR_HASH_KEY_STRING, "value");
-    result = apr_hash_get(h, "key", APR_HASH_KEY_STRING);
-    CuAssertStrEquals(tc, "value", result);
-}
-
-static void hash_reset(CuTest *tc)
-{
-    apr_hash_t *h = NULL;
-    char *result = NULL;
-
-    h = apr_hash_make(p);
-    CuAssertPtrNotNull(tc, h);
-
-    apr_hash_set(h, "key", APR_HASH_KEY_STRING, "value");
-    result = apr_hash_get(h, "key", APR_HASH_KEY_STRING);
-    CuAssertStrEquals(tc, "value", result);
-
-    apr_hash_set(h, "key", APR_HASH_KEY_STRING, "new");
-    result = apr_hash_get(h, "key", APR_HASH_KEY_STRING);
-    CuAssertStrEquals(tc, "new", result);
-}
-
-static void same_value(CuTest *tc)
-{
-    apr_hash_t *h = NULL;
-    char *result = NULL;
-
-    h = apr_hash_make(p);
-    CuAssertPtrNotNull(tc, h);
-
-    apr_hash_set(h, "same1", APR_HASH_KEY_STRING, "same");
-    result = apr_hash_get(h, "same1", APR_HASH_KEY_STRING);
-    CuAssertStrEquals(tc, "same", result);
-
-    apr_hash_set(h, "same2", APR_HASH_KEY_STRING, "same");
-    result = apr_hash_get(h, "same2", APR_HASH_KEY_STRING);
-    CuAssertStrEquals(tc, "same", result);
-}
-
-static void key_space(CuTest *tc)
-{
-    apr_hash_t *h = NULL;
-    char *result = NULL;
-
-    h = apr_hash_make(p);
-    CuAssertPtrNotNull(tc, h);
-
-    apr_hash_set(h, "key with space", APR_HASH_KEY_STRING, "value");
-    result = apr_hash_get(h, "key with space", APR_HASH_KEY_STRING);
-    CuAssertStrEquals(tc, "value", result);
-}
-
-/* This is kind of a hack, but I am just keeping an existing test.  This is
- * really testing apr_hash_first, apr_hash_next, and apr_hash_this which 
- * should be tested in three separate tests, but this will do for now.
- */
-static void hash_traverse(CuTest *tc)
-{
-    apr_hash_t *h;
-    char str[8196];
-
-    h = apr_hash_make(p);
-    CuAssertPtrNotNull(tc, h);
-
-    apr_hash_set(h, "OVERWRITE", APR_HASH_KEY_STRING, "should not see this");
-    apr_hash_set(h, "FOO3", APR_HASH_KEY_STRING, "bar3");
-    apr_hash_set(h, "FOO3", APR_HASH_KEY_STRING, "bar3");
-    apr_hash_set(h, "FOO1", APR_HASH_KEY_STRING, "bar1");
-    apr_hash_set(h, "FOO2", APR_HASH_KEY_STRING, "bar2");
-    apr_hash_set(h, "FOO4", APR_HASH_KEY_STRING, "bar4");
-    apr_hash_set(h, "SAME1", APR_HASH_KEY_STRING, "same");
-    apr_hash_set(h, "SAME2", APR_HASH_KEY_STRING, "same");
-    apr_hash_set(h, "OVERWRITE", APR_HASH_KEY_STRING, "Overwrite key");
-
-    dump_hash(p, h, str);
-    CuAssertStrEquals(tc, "Key FOO1 (4) Value bar1\n"
-                          "Key FOO2 (4) Value bar2\n"
-                          "Key OVERWRITE (9) Value Overwrite key\n"
-                          "Key FOO3 (4) Value bar3\n"
-                          "Key SAME1 (5) Value same\n"
-                          "Key FOO4 (4) Value bar4\n"
-                          "Key SAME2 (5) Value same\n"
-                          "#entries 7\n", str);
-}
-
-/* This is kind of a hack, but I am just keeping an existing test.  This is
- * really testing apr_hash_first, apr_hash_next, and apr_hash_this which 
- * should be tested in three separate tests, but this will do for now.
- */
-static void summation_test(CuTest *tc)
-{
-    apr_hash_t *h;
-    int sumKeys, sumVal, trySumKey, trySumVal;
-    int i, j, *val, *key;
-
-    h =apr_hash_make(p);
-    CuAssertPtrNotNull(tc, h);
-
-    sumKeys = 0;
-    sumVal = 0;
-    trySumKey = 0;
-    trySumVal = 0;
-
-    for (i = 0; i < 100; i++) {
-        j = i * 10 + 1;
-        sumKeys += j;
-        sumVal += i;
-        key = apr_palloc(p, sizeof(int));
-        *key = j;
-        val = apr_palloc(p, sizeof(int));
-        *val = i;
-        apr_hash_set(h, key, sizeof(int), val);
-    }
-
-    sum_hash(p, h, &i, &trySumKey, &trySumVal);
-    CuAssertIntEquals(tc, 100, i);
-    CuAssertIntEquals(tc, sumVal, trySumVal);
-    CuAssertIntEquals(tc, sumKeys, trySumKey);
-}
-
-static void delete_key(CuTest *tc)
-{
-    apr_hash_t *h = NULL;
-    char *result = NULL;
-
-    h = apr_hash_make(p);
-    CuAssertPtrNotNull(tc, h);
-
-    apr_hash_set(h, "key", APR_HASH_KEY_STRING, "value");
-    apr_hash_set(h, "key2", APR_HASH_KEY_STRING, "value2");
-
-    result = apr_hash_get(h, "key", APR_HASH_KEY_STRING);
-    CuAssertStrEquals(tc, "value", result);
-
-    result = apr_hash_get(h, "key2", APR_HASH_KEY_STRING);
-    CuAssertStrEquals(tc, "value2", result);
-
-    apr_hash_set(h, "key", APR_HASH_KEY_STRING, NULL);
-
-    result = apr_hash_get(h, "key", APR_HASH_KEY_STRING);
-    CuAssertPtrEquals(tc, NULL, result);
-
-    result = apr_hash_get(h, "key2", APR_HASH_KEY_STRING);
-    CuAssertStrEquals(tc, "value2", result);
-}
-
-static void hash_count_0(CuTest *tc)
-{
-    apr_hash_t *h = NULL;
-    int count;
-
-    h = apr_hash_make(p);
-    CuAssertPtrNotNull(tc, h);
-
-    count = apr_hash_count(h);
-    CuAssertIntEquals(tc, 0, count);
-}
-
-static void hash_count_1(CuTest *tc)
-{
-    apr_hash_t *h = NULL;
-    int count;
-
-    h = apr_hash_make(p);
-    CuAssertPtrNotNull(tc, h);
-
-    apr_hash_set(h, "key", APR_HASH_KEY_STRING, "value");
-
-    count = apr_hash_count(h);
-    CuAssertIntEquals(tc, 1, count);
-}
-
-static void hash_count_5(CuTest *tc)
-{
-    apr_hash_t *h = NULL;
-    int count;
-
-    h = apr_hash_make(p);
-    CuAssertPtrNotNull(tc, h);
-
-    apr_hash_set(h, "key1", APR_HASH_KEY_STRING, "value1");
-    apr_hash_set(h, "key2", APR_HASH_KEY_STRING, "value2");
-    apr_hash_set(h, "key3", APR_HASH_KEY_STRING, "value3");
-    apr_hash_set(h, "key4", APR_HASH_KEY_STRING, "value4");
-    apr_hash_set(h, "key5", APR_HASH_KEY_STRING, "value5");
-
-    count = apr_hash_count(h);
-    CuAssertIntEquals(tc, 5, count);
-}
-
-static void overlay_empty(CuTest *tc)
-{
-    apr_hash_t *base = NULL;
-    apr_hash_t *overlay = NULL;
-    apr_hash_t *result = NULL;
-    int count;
-    char str[8196];
-
-    base = apr_hash_make(p);
-    overlay = apr_hash_make(p);
-    CuAssertPtrNotNull(tc, base);
-    CuAssertPtrNotNull(tc, overlay);
-
-    apr_hash_set(base, "key1", APR_HASH_KEY_STRING, "value1");
-    apr_hash_set(base, "key2", APR_HASH_KEY_STRING, "value2");
-    apr_hash_set(base, "key3", APR_HASH_KEY_STRING, "value3");
-    apr_hash_set(base, "key4", APR_HASH_KEY_STRING, "value4");
-    apr_hash_set(base, "key5", APR_HASH_KEY_STRING, "value5");
-
-    result = apr_hash_overlay(p, overlay, base);
-
-    count = apr_hash_count(result);
-    CuAssertIntEquals(tc, 5, count);
-
-    dump_hash(p, result, str);
-    CuAssertStrEquals(tc, "Key key1 (4) Value value1\n"
-                          "Key key2 (4) Value value2\n"
-                          "Key key3 (4) Value value3\n"
-                          "Key key4 (4) Value value4\n"
-                          "Key key5 (4) Value value5\n"
-                          "#entries 5\n", str);
-}
-
-static void overlay_2unique(CuTest *tc)
-{
-    apr_hash_t *base = NULL;
-    apr_hash_t *overlay = NULL;
-    apr_hash_t *result = NULL;
-    int count;
-    char str[8196];
-
-    base = apr_hash_make(p);
-    overlay = apr_hash_make(p);
-    CuAssertPtrNotNull(tc, base);
-    CuAssertPtrNotNull(tc, overlay);
-
-    apr_hash_set(base, "base1", APR_HASH_KEY_STRING, "value1");
-    apr_hash_set(base, "base2", APR_HASH_KEY_STRING, "value2");
-    apr_hash_set(base, "base3", APR_HASH_KEY_STRING, "value3");
-    apr_hash_set(base, "base4", APR_HASH_KEY_STRING, "value4");
-    apr_hash_set(base, "base5", APR_HASH_KEY_STRING, "value5");
-
-    apr_hash_set(overlay, "overlay1", APR_HASH_KEY_STRING, "value1");
-    apr_hash_set(overlay, "overlay2", APR_HASH_KEY_STRING, "value2");
-    apr_hash_set(overlay, "overlay3", APR_HASH_KEY_STRING, "value3");
-    apr_hash_set(overlay, "overlay4", APR_HASH_KEY_STRING, "value4");
-    apr_hash_set(overlay, "overlay5", APR_HASH_KEY_STRING, "value5");
-
-    result = apr_hash_overlay(p, overlay, base);
-
-    count = apr_hash_count(result);
-    CuAssertIntEquals(tc, 10, count);
-
-    dump_hash(p, result, str);
-    /* I don't know why these are out of order, but they are.  I would probably
-     * consider this a bug, but others should comment.
-     */
-    CuAssertStrEquals(tc, "Key base5 (5) Value value5\n"
-                          "Key overlay1 (8) Value value1\n"
-                          "Key overlay2 (8) Value value2\n"
-                          "Key overlay3 (8) Value value3\n"
-                          "Key overlay4 (8) Value value4\n"
-                          "Key overlay5 (8) Value value5\n"
-                          "Key base1 (5) Value value1\n"
-                          "Key base2 (5) Value value2\n"
-                          "Key base3 (5) Value value3\n"
-                          "Key base4 (5) Value value4\n"
-                          "#entries 10\n", str);
-}
-
-static void overlay_same(CuTest *tc)
-{
-    apr_hash_t *base = NULL;
-    apr_hash_t *result = NULL;
-    int count;
-    char str[8196];
-
-    base = apr_hash_make(p);
-    CuAssertPtrNotNull(tc, base);
-
-    apr_hash_set(base, "base1", APR_HASH_KEY_STRING, "value1");
-    apr_hash_set(base, "base2", APR_HASH_KEY_STRING, "value2");
-    apr_hash_set(base, "base3", APR_HASH_KEY_STRING, "value3");
-    apr_hash_set(base, "base4", APR_HASH_KEY_STRING, "value4");
-    apr_hash_set(base, "base5", APR_HASH_KEY_STRING, "value5");
-
-    result = apr_hash_overlay(p, base, base);
-
-    count = apr_hash_count(result);
-    CuAssertIntEquals(tc, 5, count);
-
-    dump_hash(p, result, str);
-    /* I don't know why these are out of order, but they are.  I would probably
-     * consider this a bug, but others should comment.
-     */
-    CuAssertStrEquals(tc, "Key base5 (5) Value value5\n"
-                          "Key base1 (5) Value value1\n"
-                          "Key base2 (5) Value value2\n"
-                          "Key base3 (5) Value value3\n"
-                          "Key base4 (5) Value value4\n"
-                          "#entries 5\n", str);
-}
-        
-CuSuite *testhash(void)
-{
-    CuSuite *suite = CuSuiteNew("Hash");
-
-    SUITE_ADD_TEST(suite, hash_make);
-    SUITE_ADD_TEST(suite, hash_set);
-    SUITE_ADD_TEST(suite, hash_reset);
-    SUITE_ADD_TEST(suite, same_value);
-    SUITE_ADD_TEST(suite, key_space);
-    SUITE_ADD_TEST(suite, delete_key);
-
-    SUITE_ADD_TEST(suite, hash_count_0);
-    SUITE_ADD_TEST(suite, hash_count_1);
-    SUITE_ADD_TEST(suite, hash_count_5);
-
-    SUITE_ADD_TEST(suite, hash_traverse);
-    SUITE_ADD_TEST(suite, summation_test);
-
-    SUITE_ADD_TEST(suite, overlay_empty);
-    SUITE_ADD_TEST(suite, overlay_2unique);
-    SUITE_ADD_TEST(suite, overlay_same);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testipsub.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testipsub.c
deleted file mode 100644
index 8238fffd..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testipsub.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "test_apr.h"
-#include "apr_general.h"
-#include "apr_network_io.h"
-#include "apr_errno.h"
-
-static void test_bad_input(CuTest *tc)
-{
-    struct {
-        const char *ipstr;
-        const char *mask;
-        apr_status_t expected_rv;
-    } testcases[] =
-    {
-        /* so we have a few good inputs in here; sue me */
-        {"my.host.name",       NULL,               APR_EINVAL}
-        ,{"127.0.0.256",       NULL,               APR_EBADIP}
-        ,{"127.0.0.1",         NULL,               APR_SUCCESS}
-        ,{"127.0.0.1",         "32",               APR_SUCCESS}
-        ,{"127.0.0.1",         "1",                APR_SUCCESS}
-        ,{"127.0.0.1",         "15",               APR_SUCCESS}
-        ,{"127.0.0.1",         "-1",               APR_EBADMASK}
-        ,{"127.0.0.1",         "0",                APR_EBADMASK}
-        ,{"127.0.0.1",         "33",               APR_EBADMASK}
-        ,{"127.0.0.1",         "255.0.0.0",        APR_SUCCESS}
-        ,{"127.0.0.1",         "255.0",            APR_EBADMASK}
-        ,{"127.0.0.1",         "255.255.256.0",    APR_EBADMASK}
-        ,{"127.0.0.1",         "abc",              APR_EBADMASK}
-        ,{"127",               NULL,               APR_SUCCESS}
-        ,{"127.0.0.1.2",       NULL,               APR_EBADIP}
-        ,{"127.0.0.1.2",       "8",                APR_EBADIP}
-        ,{"127",               "255.0.0.0",        APR_EBADIP} /* either EBADIP or EBADMASK seems fine */
-#if APR_HAVE_IPV6
-        ,{"::1",               NULL,               APR_SUCCESS}
-        ,{"::1",               "20",               APR_SUCCESS}
-        ,{"::ffff:9.67.113.15", NULL,              APR_EBADIP} /* yes, this is goodness */
-        ,{"fe80::",            "16",               APR_SUCCESS}
-        ,{"fe80::",            "255.0.0.0",        APR_EBADMASK}
-        ,{"fe80::1",           "0",                APR_EBADMASK}
-        ,{"fe80::1",           "-1",               APR_EBADMASK}
-        ,{"fe80::1",           "1",                APR_SUCCESS}
-        ,{"fe80::1",           "33",               APR_SUCCESS}
-        ,{"fe80::1",           "128",              APR_SUCCESS}
-        ,{"fe80::1",           "129",              APR_EBADMASK}
-#else
-        /* do some IPv6 stuff and verify that it fails with APR_EBADIP */
-        ,{"::ffff:9.67.113.15", NULL,              APR_EBADIP}
-#endif
-    };
-    int i;
-    apr_ipsubnet_t *ipsub;
-    apr_status_t rv;
-
-    for (i = 0; i < (sizeof testcases / sizeof testcases[0]); i++) {
-        rv = apr_ipsubnet_create(&ipsub, testcases[i].ipstr, testcases[i].mask, p);
-        CuAssertIntEquals(tc, rv, testcases[i].expected_rv);
-    }
-}
-
-static void test_singleton_subnets(CuTest *tc)
-{
-    const char *v4addrs[] = {
-        "127.0.0.1", "129.42.18.99", "63.161.155.20", "207.46.230.229", "64.208.42.36",
-        "198.144.203.195", "192.18.97.241", "198.137.240.91", "62.156.179.119", 
-        "204.177.92.181"
-    };
-    apr_ipsubnet_t *ipsub;
-    apr_sockaddr_t *sa;
-    apr_status_t rv;
-    int i, j, rc;
-
-    for (i = 0; i < sizeof v4addrs / sizeof v4addrs[0]; i++) {
-        rv = apr_ipsubnet_create(&ipsub, v4addrs[i], NULL, p);
-        CuAssertTrue(tc, rv == APR_SUCCESS);
-        for (j = 0; j < sizeof v4addrs / sizeof v4addrs[0]; j++) {
-            rv = apr_sockaddr_info_get(&sa, v4addrs[j], APR_INET, 0, 0, p);
-            CuAssertTrue(tc, rv == APR_SUCCESS);
-            rc = apr_ipsubnet_test(ipsub, sa);
-            if (!strcmp(v4addrs[i], v4addrs[j])) {
-                CuAssertTrue(tc, rc != 0);
-            }
-            else {
-                CuAssertTrue(tc, rc == 0);
-            }
-        }
-    }
-
-    /* same for v6? */
-}
-
-static void test_interesting_subnets(CuTest *tc)
-{
-    struct {
-        const char *ipstr, *mask;
-        int family;
-        char *in_subnet, *not_in_subnet;
-    } testcases[] =
-    {
-        {"9.67",              NULL,            APR_INET,  "9.67.113.15",         "10.1.2.3"}
-        ,{"9.67.0.0",         "16",            APR_INET,  "9.67.113.15",         "10.1.2.3"}
-        ,{"9.67.0.0",         "255.255.0.0",   APR_INET,  "9.67.113.15",         "10.1.2.3"}
-        ,{"9.67.113.99",      "16",            APR_INET,  "9.67.113.15",         "10.1.2.3"}
-        ,{"9.67.113.99",      "255.255.255.0", APR_INET,  "9.67.113.15",         "10.1.2.3"}
-#if APR_HAVE_IPV6
-        ,{"fe80::",           "8",             APR_INET6, "fe80::1",             "ff01::1"}
-        ,{"ff01::",           "8",             APR_INET6, "ff01::1",             "fe80::1"}
-        ,{"3FFE:8160::",      "28",            APR_INET6, "3ffE:816e:abcd:1234::1", "3ffe:8170::1"}
-        ,{"127.0.0.1",        NULL,            APR_INET6, "::ffff:127.0.0.1",    "fe80::1"}
-        ,{"127.0.0.1",        "8",             APR_INET6, "::ffff:127.0.0.1",    "fe80::1"}
-#endif
-    };
-    apr_ipsubnet_t *ipsub;
-    apr_sockaddr_t *sa;
-    apr_status_t rv;
-    int i, rc;
-
-    for (i = 0; i < sizeof testcases / sizeof testcases[0]; i++) {
-        rv = apr_ipsubnet_create(&ipsub, testcases[i].ipstr, testcases[i].mask, p);
-        CuAssertTrue(tc, rv == APR_SUCCESS);
-        rv = apr_sockaddr_info_get(&sa, testcases[i].in_subnet, testcases[i].family, 0, 0, p);
-        CuAssertTrue(tc, rv == APR_SUCCESS);
-        rc = apr_ipsubnet_test(ipsub, sa);
-        CuAssertTrue(tc, rc != 0);
-        rv = apr_sockaddr_info_get(&sa, testcases[i].not_in_subnet, testcases[i].family, 0, 0, p);
-        CuAssertTrue(tc, rv == APR_SUCCESS);
-        rc = apr_ipsubnet_test(ipsub, sa);
-        CuAssertTrue(tc, rc == 0);
-    }
-}
-
-static void test_badmask_str(CuTest *tc)
-{
-    char buf[128];
-
-    CuAssertStrEquals(tc, apr_strerror(APR_EBADMASK, buf, sizeof buf),
-                      "The specified network mask is invalid.");
-}
-
-static void test_badip_str(CuTest *tc)
-{
-    char buf[128];
-
-    CuAssertStrEquals(tc, apr_strerror(APR_EBADIP, buf, sizeof buf),
-                      "The specified IP address is invalid.");
-}
-
-CuSuite *testipsub(void)
-{
-    CuSuite *suite = CuSuiteNew("IP subnets");
-
-    SUITE_ADD_TEST(suite, test_bad_input);
-    SUITE_ADD_TEST(suite, test_singleton_subnets);
-    SUITE_ADD_TEST(suite, test_interesting_subnets);
-    SUITE_ADD_TEST(suite, test_badmask_str);
-    SUITE_ADD_TEST(suite, test_badip_str);
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testlock.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testlock.c
deleted file mode 100644
index 134426c4..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testlock.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-#include "apr_thread_mutex.h"
-#include "apr_thread_rwlock.h"
-#include "apr_thread_cond.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_getopt.h"
-#include "test_apr.h"
-
-#if APR_HAS_THREADS
-
-#define MAX_ITER 40000
-#define MAX_COUNTER 100000
-#define MAX_RETRY 5
-
-static void *APR_THREAD_FUNC thread_rwlock_func(apr_thread_t *thd, void *data);
-static void *APR_THREAD_FUNC thread_mutex_function(apr_thread_t *thd, void *data);
-static void *APR_THREAD_FUNC thread_cond_producer(apr_thread_t *thd, void *data);
-static void *APR_THREAD_FUNC thread_cond_consumer(apr_thread_t *thd, void *data);
-
-static apr_thread_mutex_t *thread_mutex;
-static apr_thread_rwlock_t *rwlock;
-static int i = 0, x = 0;
-
-static int buff[MAX_COUNTER];
-
-struct {
-    apr_thread_mutex_t *mutex;
-    int                nput;
-    int                nval;
-} put;
-
-struct {
-    apr_thread_mutex_t *mutex;
-    apr_thread_cond_t  *cond;
-    int                nready;
-} nready;
-
-static apr_thread_mutex_t *timeout_mutex;
-static apr_thread_cond_t *timeout_cond;
-
-static void *APR_THREAD_FUNC thread_rwlock_func(apr_thread_t *thd, void *data)
-{
-    int exitLoop = 1;
-
-    while (1)
-    {
-        apr_thread_rwlock_rdlock(rwlock);
-        if (i == MAX_ITER)
-            exitLoop = 0;
-        apr_thread_rwlock_unlock(rwlock);
-
-        if (!exitLoop)
-            break;
-
-        apr_thread_rwlock_wrlock(rwlock);
-        if (i != MAX_ITER)
-        {
-            i++;
-            x++;
-        }
-        apr_thread_rwlock_unlock(rwlock);
-    }
-    return NULL;
-} 
-
-static void *APR_THREAD_FUNC thread_mutex_function(apr_thread_t *thd, void *data)
-{
-    int exitLoop = 1;
-
-    /* slight delay to allow things to settle */
-    apr_sleep (1);
-    
-    while (1)
-    {
-        apr_thread_mutex_lock(thread_mutex);
-        if (i == MAX_ITER)
-            exitLoop = 0;
-        else 
-        {
-            i++;
-            x++;
-        }
-        apr_thread_mutex_unlock(thread_mutex);
-
-        if (!exitLoop)
-            break;
-    }
-    return NULL;
-} 
-
-static void *APR_THREAD_FUNC thread_cond_producer(apr_thread_t *thd, void *data)
-{
-    for (;;) {
-        apr_thread_mutex_lock(put.mutex);
-        if (put.nput >= MAX_COUNTER) {
-            apr_thread_mutex_unlock(put.mutex);
-            return NULL;
-        }
-        buff[put.nput] = put.nval;
-        put.nput++;
-        put.nval++;
-        apr_thread_mutex_unlock(put.mutex);
-
-        apr_thread_mutex_lock(nready.mutex);
-        if (nready.nready == 0)
-            apr_thread_cond_signal(nready.cond);
-        nready.nready++;
-        apr_thread_mutex_unlock(nready.mutex);
-
-        *((int *) data) += 1;
-    }
-
-    return NULL;
-}
-
-static void *APR_THREAD_FUNC thread_cond_consumer(apr_thread_t *thd, void *data)
-{
-    int i;
-
-    for (i = 0; i < MAX_COUNTER; i++) {
-        apr_thread_mutex_lock(nready.mutex);
-        while (nready.nready == 0)
-            apr_thread_cond_wait(nready.cond, nready.mutex);
-        nready.nready--;
-        apr_thread_mutex_unlock(nready.mutex);
-
-        if (buff[i] != i)
-            printf("buff[%d] = %d\n", i, buff[i]);
-    }
-
-    return NULL;
-}
-
-static void test_thread_mutex(CuTest *tc)
-{
-    apr_thread_t *t1, *t2, *t3, *t4;
-    apr_status_t s1, s2, s3, s4;
-
-    s1 = apr_thread_mutex_create(&thread_mutex, APR_THREAD_MUTEX_DEFAULT, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, s1);
-    CuAssertPtrNotNull(tc, thread_mutex);
-
-    i = 0;
-    x = 0;
-
-    s1 = apr_thread_create(&t1, NULL, thread_mutex_function, NULL, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, s1);
-    s2 = apr_thread_create(&t2, NULL, thread_mutex_function, NULL, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, s2);
-    s3 = apr_thread_create(&t3, NULL, thread_mutex_function, NULL, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, s3);
-    s4 = apr_thread_create(&t4, NULL, thread_mutex_function, NULL, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, s4);
-
-    apr_thread_join(&s1, t1);
-    apr_thread_join(&s2, t2);
-    apr_thread_join(&s3, t3);
-    apr_thread_join(&s4, t4);
-
-    CuAssertIntEquals(tc, MAX_ITER, x);
-}
-
-static void test_thread_rwlock(CuTest *tc)
-{
-    apr_thread_t *t1, *t2, *t3, *t4;
-    apr_status_t s1, s2, s3, s4;
-
-    s1 = apr_thread_rwlock_create(&rwlock, p);
-    apr_assert_success(tc, "rwlock_create", s1);
-    CuAssertPtrNotNull(tc, rwlock);
-
-    i = 0;
-    x = 0;
-
-    s1 = apr_thread_create(&t1, NULL, thread_rwlock_func, NULL, p);
-    apr_assert_success(tc, "create thread 1", s1);
-    s2 = apr_thread_create(&t2, NULL, thread_rwlock_func, NULL, p);
-    apr_assert_success(tc, "create thread 2", s2);
-    s3 = apr_thread_create(&t3, NULL, thread_rwlock_func, NULL, p);
-    apr_assert_success(tc, "create thread 3", s3);
-    s4 = apr_thread_create(&t4, NULL, thread_rwlock_func, NULL, p);
-    apr_assert_success(tc, "create thread 4", s4);
-
-    apr_thread_join(&s1, t1);
-    apr_thread_join(&s2, t2);
-    apr_thread_join(&s3, t3);
-    apr_thread_join(&s4, t4);
-
-    CuAssertIntEquals(tc, MAX_ITER, x);
-
-    apr_thread_rwlock_destroy(rwlock);
-}
-
-static void test_cond(CuTest *tc)
-{
-    apr_thread_t *p1, *p2, *p3, *p4, *c1;
-    apr_status_t s0, s1, s2, s3, s4;
-    int count1, count2, count3, count4;
-    int sum;
-
-    s1 = apr_thread_mutex_create(&put.mutex, APR_THREAD_MUTEX_DEFAULT, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, s1);
-    CuAssertPtrNotNull(tc, put.mutex);
-
-    s1 = apr_thread_mutex_create(&nready.mutex, APR_THREAD_MUTEX_DEFAULT, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, s1);
-    CuAssertPtrNotNull(tc, nready.mutex);
-
-    s1 = apr_thread_cond_create(&nready.cond, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, s1);
-    CuAssertPtrNotNull(tc, nready.cond);
-
-    count1 = count2 = count3 = count4 = 0;
-    put.nput = put.nval = 0;
-    nready.nready = 0;
-    i = 0;
-    x = 0;
-
-    s0 = apr_thread_create(&p1, NULL, thread_cond_producer, &count1, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, s0);
-    s1 = apr_thread_create(&p2, NULL, thread_cond_producer, &count2, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, s1);
-    s2 = apr_thread_create(&p3, NULL, thread_cond_producer, &count3, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, s2);
-    s3 = apr_thread_create(&p4, NULL, thread_cond_producer, &count4, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, s3);
-    s4 = apr_thread_create(&c1, NULL, thread_cond_consumer, NULL, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, s4);
-
-    apr_thread_join(&s0, p1);
-    apr_thread_join(&s1, p2);
-    apr_thread_join(&s2, p3);
-    apr_thread_join(&s3, p4);
-    apr_thread_join(&s4, c1);
-
-    sum = count1 + count2 + count3 + count4;
-    /*
-    printf("count1 = %d count2 = %d count3 = %d count4 = %d\n",
-            count1, count2, count3, count4);
-    */
-    CuAssertIntEquals(tc, MAX_COUNTER, sum);
-}
-
-static void test_timeoutcond(CuTest *tc)
-{
-    apr_status_t s;
-    apr_interval_time_t timeout;
-    apr_time_t begin, end;
-    int i;
-
-    s = apr_thread_mutex_create(&timeout_mutex, APR_THREAD_MUTEX_DEFAULT, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, s);
-    CuAssertPtrNotNull(tc, timeout_mutex);
-
-    s = apr_thread_cond_create(&timeout_cond, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, s);
-    CuAssertPtrNotNull(tc, timeout_cond);
-
-    timeout = apr_time_from_sec(5);
-
-    for (i = 0; i < MAX_RETRY; i++) {
-        apr_thread_mutex_lock(timeout_mutex);
-
-        begin = apr_time_now();
-        s = apr_thread_cond_timedwait(timeout_cond, timeout_mutex, timeout);
-        end = apr_time_now();
-        apr_thread_mutex_unlock(timeout_mutex);
-        
-        if (s != APR_SUCCESS && !APR_STATUS_IS_TIMEUP(s)) {
-            continue;
-        }
-        CuAssertIntEquals(tc, 1, APR_STATUS_IS_TIMEUP(s));
-        CuAssert(tc, "Timer returned too late", end - begin - timeout < 100000);
-        break;
-    }
-    CuAssert(tc, "Too many retries", i < MAX_RETRY);
-}
-
-#endif /* !APR_HAS_THREADS */
-
-#if !APR_HAS_THREADS
-static void threads_not_impl(CuTest *tc)
-{
-    CuNotImpl(tc, "Threads not implemented on this platform");
-}
-#endif
-
-
-CuSuite *testlock(void)
-{
-    CuSuite *suite = CuSuiteNew("Thread Locks");
-
-#if !APR_HAS_THREADS
-    SUITE_ADD_TEST(suite, threads_not_impl);
-#else
-    SUITE_ADD_TEST(suite, test_thread_mutex);
-    SUITE_ADD_TEST(suite, test_thread_rwlock);
-    SUITE_ADD_TEST(suite, test_cond);
-    SUITE_ADD_TEST(suite, test_timeoutcond);
-#endif
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testlockperf.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testlockperf.c
deleted file mode 100644
index ba785775..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testlockperf.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_thread_proc.h"
-#include "apr_thread_mutex.h"
-#include "apr_thread_rwlock.h"
-#include "apr_file_io.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_getopt.h"
-#include "errno.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include "test_apr.h"
-
-#if !APR_HAS_THREADS
-int main(void)
-{
-    printf("This program won't work on this platform because there is no "
-           "support for threads.\n");
-    return 0;
-}
-#else /* !APR_HAS_THREADS */
-
-#define MAX_COUNTER 1000000
-#define MAX_THREADS 6
-
-static long mutex_counter;
-
-static apr_thread_mutex_t *thread_lock;
-void * APR_THREAD_FUNC thread_mutex_func(apr_thread_t *thd, void *data);
-apr_status_t test_thread_mutex(int num_threads); /* apr_thread_mutex_t */
-
-static apr_thread_rwlock_t *thread_rwlock;
-void * APR_THREAD_FUNC thread_rwlock_func(apr_thread_t *thd, void *data);
-apr_status_t test_thread_rwlock(int num_threads); /* apr_thread_rwlock_t */
-
-int test_thread_mutex_nested(int num_threads);
-
-apr_pool_t *pool;
-int i = 0, x = 0;
-
-void * APR_THREAD_FUNC thread_mutex_func(apr_thread_t *thd, void *data)
-{
-    int i;
-
-    for (i = 0; i < MAX_COUNTER; i++) {
-        apr_thread_mutex_lock(thread_lock);
-        mutex_counter++;
-        apr_thread_mutex_unlock(thread_lock);
-    }
-    return NULL;
-}
-
-void * APR_THREAD_FUNC thread_rwlock_func(apr_thread_t *thd, void *data)
-{
-    int i;
-
-    for (i = 0; i < MAX_COUNTER; i++) {
-        apr_thread_rwlock_wrlock(thread_rwlock);
-        mutex_counter++;
-        apr_thread_rwlock_unlock(thread_rwlock);
-    }
-    return NULL;
-}
-
-int test_thread_mutex(int num_threads)
-{
-    apr_thread_t *t[MAX_THREADS];
-    apr_status_t s[MAX_THREADS];
-    apr_time_t time_start, time_stop;
-    int i;
-
-    mutex_counter = 0;
-
-    printf("apr_thread_mutex_t Tests\n");
-    printf("%-60s", "    Initializing the apr_thread_mutex_t (UNNESTED)");
-    s[0] = apr_thread_mutex_create(&thread_lock, APR_THREAD_MUTEX_UNNESTED, pool);
-    if (s[0] != APR_SUCCESS) {
-        printf("Failed!\n");
-        return s[0];
-    }
-    printf("OK\n");
-
-    apr_thread_mutex_lock(thread_lock);
-    /* set_concurrency(4)? -aaron */
-    printf("    Starting %d threads    ", num_threads); 
-    for (i = 0; i < num_threads; ++i) {
-        s[i] = apr_thread_create(&t[i], NULL, thread_mutex_func, NULL, pool);
-        if (s[i] != APR_SUCCESS) {
-            printf("Failed!\n");
-            return s[i];
-        }
-    }
-    printf("OK\n");
-
-    time_start = apr_time_now();
-    apr_thread_mutex_unlock(thread_lock);
-
-    /* printf("%-60s", "    Waiting for threads to exit"); */
-    for (i = 0; i < num_threads; ++i) {
-        apr_thread_join(&s[i], t[i]);
-    }
-    /* printf("OK\n"); */
-
-    time_stop = apr_time_now();
-    printf("microseconds: %" APR_INT64_T_FMT " usec\n",
-           (time_stop - time_start));
-    if (mutex_counter != MAX_COUNTER * num_threads)
-        printf("error: counter = %ld\n", mutex_counter);
-
-    return APR_SUCCESS;
-}
-
-int test_thread_mutex_nested(int num_threads)
-{
-    apr_thread_t *t[MAX_THREADS];
-    apr_status_t s[MAX_THREADS];
-    apr_time_t time_start, time_stop;
-    int i;
-
-    mutex_counter = 0;
-
-    printf("apr_thread_mutex_t Tests\n");
-    printf("%-60s", "    Initializing the apr_thread_mutex_t (NESTED)");
-    s[0] = apr_thread_mutex_create(&thread_lock, APR_THREAD_MUTEX_NESTED, pool);
-    if (s[0] != APR_SUCCESS) {
-        printf("Failed!\n");
-        return s[0];
-    }
-    printf("OK\n");
-
-    apr_thread_mutex_lock(thread_lock);
-    /* set_concurrency(4)? -aaron */
-    printf("    Starting %d threads    ", num_threads); 
-    for (i = 0; i < num_threads; ++i) {
-        s[i] = apr_thread_create(&t[i], NULL, thread_mutex_func, NULL, pool);
-        if (s[i] != APR_SUCCESS) {
-            printf("Failed!\n");
-            return s[i];
-        }
-    }
-    printf("OK\n");
-
-    time_start = apr_time_now();
-    apr_thread_mutex_unlock(thread_lock);
-
-    /* printf("%-60s", "    Waiting for threads to exit"); */
-    for (i = 0; i < num_threads; ++i) {
-        apr_thread_join(&s[i], t[i]);
-    }
-    /* printf("OK\n"); */
-
-    time_stop = apr_time_now();
-    printf("microseconds: %" APR_INT64_T_FMT " usec\n",
-           (time_stop - time_start));
-    if (mutex_counter != MAX_COUNTER * num_threads)
-        printf("error: counter = %ld\n", mutex_counter);
-
-    return APR_SUCCESS;
-}
-
-int test_thread_rwlock(int num_threads)
-{
-    apr_thread_t *t[MAX_THREADS];
-    apr_status_t s[MAX_THREADS];
-    apr_time_t time_start, time_stop;
-    int i;
-
-    mutex_counter = 0;
-
-    printf("apr_thread_rwlock_t Tests\n");
-    printf("%-60s", "    Initializing the apr_thread_rwlock_t");
-    s[0] = apr_thread_rwlock_create(&thread_rwlock, pool);
-    if (s[0] != APR_SUCCESS) {
-        printf("Failed!\n");
-        return s[0];
-    }
-    printf("OK\n");
-
-    apr_thread_rwlock_wrlock(thread_rwlock);
-    /* set_concurrency(4)? -aaron */
-    printf("    Starting %d threads    ", num_threads); 
-    for (i = 0; i < num_threads; ++i) {
-        s[i] = apr_thread_create(&t[i], NULL, thread_rwlock_func, NULL, pool);
-        if (s[i] != APR_SUCCESS) {
-            printf("Failed!\n");
-            return s[i];
-        }
-    }
-    printf("OK\n");
-
-    time_start = apr_time_now();
-    apr_thread_rwlock_unlock(thread_rwlock);
-
-    /* printf("%-60s", "    Waiting for threads to exit"); */
-    for (i = 0; i < num_threads; ++i) {
-        apr_thread_join(&s[i], t[i]);
-    }
-    /* printf("OK\n"); */
-
-    time_stop = apr_time_now();
-    printf("microseconds: %" APR_INT64_T_FMT " usec\n",
-           (time_stop - time_start));
-    if (mutex_counter != MAX_COUNTER * num_threads)
-        printf("error: counter = %ld\n", mutex_counter);
-
-    return APR_SUCCESS;
-}
-
-int main(int argc, const char * const *argv)
-{
-    apr_status_t rv;
-    char errmsg[200];
-    const char *lockname = "multi.lock";
-    apr_getopt_t *opt;
-    char optchar;
-    const char *optarg;
-
-    printf("APR Lock Performance Test\n==============\n\n");
-        
-    apr_initialize();
-    atexit(apr_terminate);
-
-    if (apr_pool_create(&pool, NULL) != APR_SUCCESS)
-        exit(-1);
-
-    if ((rv = apr_getopt_init(&opt, pool, argc, argv)) != APR_SUCCESS) {
-        fprintf(stderr, "Could not set up to parse options: [%d] %s\n",
-                rv, apr_strerror(rv, errmsg, sizeof errmsg));
-        exit(-1);
-    }
-        
-    while ((rv = apr_getopt(opt, "f:", &optchar, &optarg)) == APR_SUCCESS) {
-        if (optchar == 'f') {
-            lockname = optarg;
-        }
-    }
-
-    if (rv != APR_SUCCESS && rv != APR_EOF) {
-        fprintf(stderr, "Could not parse options: [%d] %s\n",
-                rv, apr_strerror(rv, errmsg, sizeof errmsg));
-        exit(-1);
-    }
-
-    for (i = 1; i <= MAX_THREADS; ++i) {
-        if ((rv = test_thread_mutex(i)) != APR_SUCCESS) {
-            fprintf(stderr,"thread_mutex test failed : [%d] %s\n",
-                    rv, apr_strerror(rv, (char*)errmsg, 200));
-            exit(-3);
-        }
-
-        if ((rv = test_thread_mutex_nested(i)) != APR_SUCCESS) {
-            fprintf(stderr,"thread_mutex (NESTED) test failed : [%d] %s\n",
-                    rv, apr_strerror(rv, (char*)errmsg, 200));
-            exit(-4);
-        }
-
-        if ((rv = test_thread_rwlock(i)) != APR_SUCCESS) {
-            fprintf(stderr,"thread_rwlock test failed : [%d] %s\n",
-                    rv, apr_strerror(rv, (char*)errmsg, 200));
-            exit(-6);
-        }
-    }
-
-    return 0;
-}
-
-#endif /* !APR_HAS_THREADS */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testmmap.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testmmap.c
deleted file mode 100644
index 012d8d0e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testmmap.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "test_apr.h"
-#include "apr_mmap.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_file_io.h"
-#include "apr_strings.h"
-
-/* hmmm, what is a truly portable define for the max path
- * length on a platform?
- */
-#define PATH_LEN 255
-#define TEST_STRING "This is the MMAP data file."APR_EOL_STR
-
-#if !APR_HAS_MMAP
-static void not_implemented(CuTest *tc)
-{
-    CuNotImpl(tc, "User functions");
-}
-
-#else
-
-static apr_mmap_t *themmap = NULL;
-static apr_file_t *thefile = NULL;
-static char *file1;
-static apr_finfo_t finfo;
-static int fsize;
-
-static void create_filename(CuTest *tc)
-{
-    char *oldfileptr;
-
-    apr_filepath_get(&file1, 0, p);
-#ifndef NETWARE
-#ifdef WIN32
-    CuAssertTrue(tc, file1[1] == ':');
-#else
-    CuAssertTrue(tc, file1[0] == '/');
-#endif
-#endif
-    CuAssertTrue(tc, file1[strlen(file1) - 1] != '/');
-
-    oldfileptr = file1;
-    file1 = apr_pstrcat(p, file1,"/data/mmap_datafile.txt" ,NULL);
-    CuAssertTrue(tc, oldfileptr != file1);
-}
-
-static void test_file_close(CuTest *tc)
-{
-    apr_status_t rv;
-
-    rv = apr_file_close(thefile);
-    CuAssertIntEquals(tc, rv, APR_SUCCESS);
-}
-   
-static void test_file_open(CuTest *tc)
-{
-    apr_status_t rv;
-
-    rv = apr_file_open(&thefile, file1, APR_READ, APR_UREAD | APR_GREAD, p);
-    CuAssertIntEquals(tc, rv, APR_SUCCESS);
-    CuAssertPtrNotNull(tc, thefile);
-}
-   
-static void test_get_filesize(CuTest *tc)
-{
-    apr_status_t rv;
-
-    rv = apr_file_info_get(&finfo, APR_FINFO_NORM, thefile);
-    CuAssertIntEquals(tc, rv, APR_SUCCESS);
-    CuAssert(tc, "File size mismatch", fsize == finfo.size);
-}
-
-static void test_mmap_create(CuTest *tc)
-{
-    apr_status_t rv;
-
-    rv = apr_mmap_create(&themmap, thefile, 0, (apr_size_t)finfo.size, 
-		                 APR_MMAP_READ, p);
-    CuAssertPtrNotNull(tc, themmap);
-    CuAssertIntEquals(tc, rv, APR_SUCCESS);
-}
-
-static void test_mmap_contents(CuTest *tc)
-{
-    
-    CuAssertPtrNotNull(tc, themmap);
-    CuAssertPtrNotNull(tc, themmap->mm);
-    CuAssertIntEquals(tc, fsize, themmap->size);
-
-    /* Must use nEquals since the string is not guaranteed to be NULL terminated */
-    CuAssertStrNEquals(tc, themmap->mm, TEST_STRING, fsize);
-}
-
-static void test_mmap_delete(CuTest *tc)
-{
-    apr_status_t rv;
-
-    CuAssertPtrNotNull(tc, themmap);
-    rv = apr_mmap_delete(themmap);
-    CuAssertIntEquals(tc, rv, APR_SUCCESS);
-}
-
-static void test_mmap_offset(CuTest *tc)
-{
-    apr_status_t rv;
-    void *addr;
-
-    CuAssertPtrNotNull(tc, themmap);
-    rv = apr_mmap_offset(&addr, themmap, 5);
-
-    /* Must use nEquals since the string is not guaranteed to be NULL terminated */
-    CuAssertStrNEquals(tc, addr, TEST_STRING + 5, fsize-5);
-}
-#endif
-
-CuSuite *testmmap(void)
-{
-    CuSuite *suite = CuSuiteNew("MMAP");
-
-#if APR_HAS_MMAP    
-    fsize = strlen(TEST_STRING);
-
-    SUITE_ADD_TEST(suite, create_filename);
-    SUITE_ADD_TEST(suite, test_file_open);
-    SUITE_ADD_TEST(suite, test_get_filesize);
-    SUITE_ADD_TEST(suite, test_mmap_create);
-    SUITE_ADD_TEST(suite, test_mmap_contents);
-    SUITE_ADD_TEST(suite, test_mmap_offset);
-    SUITE_ADD_TEST(suite, test_mmap_delete);
-    SUITE_ADD_TEST(suite, test_file_close);
-#else
-    SUITE_ADD_TEST(suite, not_implemented);
-#endif
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testmutexscope.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testmutexscope.c
deleted file mode 100644
index 0ea08cc6..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testmutexscope.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "apr.h"
-#include "apr_general.h"
-#include "apr_proc_mutex.h"
-#include "apr_global_mutex.h"
-#include "apr_thread_proc.h"
-
-#if !APR_HAS_THREADS
-int main(void)
-{
-    printf("This test requires APR thread support.\n");
-    return 0;
-}
-
-#else /* APR_HAS_THREADS */
-
-static apr_thread_mutex_t *thread_mutex;
-static apr_proc_mutex_t *proc_mutex;
-static apr_global_mutex_t *global_mutex;
-static apr_pool_t *p;
-static volatile int counter;
-typedef enum {TEST_GLOBAL, TEST_PROC} test_mode_e;
-
-static void lock_init(apr_lockmech_e mech, test_mode_e test_mode)
-{
-    if (test_mode == TEST_PROC) {
-        assert(apr_proc_mutex_create(&proc_mutex,
-                                     NULL,
-                                     mech,
-                                     p) == APR_SUCCESS);
-    }
-    else {
-        assert(apr_global_mutex_create(&global_mutex,
-                                       NULL,
-                                       mech,
-                                       p) == APR_SUCCESS);
-    }
-}
-
-static void lock_destroy(test_mode_e test_mode)
-{
-    if (test_mode == TEST_PROC) {
-        assert(apr_proc_mutex_destroy(proc_mutex) == APR_SUCCESS);
-    }
-    else {
-        assert(apr_global_mutex_destroy(global_mutex) == APR_SUCCESS);
-    }
-}
-
-static void lock_grab(test_mode_e test_mode)
-{
-    if (test_mode == TEST_PROC) {
-        assert(apr_proc_mutex_lock(proc_mutex) == APR_SUCCESS);
-    }
-    else {
-        assert(apr_global_mutex_lock(global_mutex) == APR_SUCCESS);
-    }
-}
-
-static void lock_release(test_mode_e test_mode)
-{
-    if (test_mode == TEST_PROC) {
-        assert(apr_proc_mutex_unlock(proc_mutex) == APR_SUCCESS);
-    }
-    else {
-        assert(apr_global_mutex_unlock(global_mutex) == APR_SUCCESS);
-    }
-}
-
-static void * APR_THREAD_FUNC eachThread(apr_thread_t *id, void *p)
-{
-    test_mode_e test_mode = (test_mode_e)p;
-
-    lock_grab(test_mode);
-    ++counter;
-    assert(apr_thread_mutex_lock(thread_mutex) == APR_SUCCESS);
-    assert(apr_thread_mutex_unlock(thread_mutex) == APR_SUCCESS);
-    lock_release(test_mode);
-    return NULL;
-}
-
-static void test_mech_mode(apr_lockmech_e mech, const char *mech_name,
-                           test_mode_e test_mode)
-{
-  apr_thread_t *threads[20];
-  int numThreads = 5;
-  int i;
-  apr_status_t rv;
-
-  printf("Trying %s mutexes with mechanism `%s'...\n",
-         test_mode == TEST_GLOBAL ? "global" : "proc", mech_name);
-
-  assert(numThreads <= sizeof(threads) / sizeof(threads[0]));
-
-  assert(apr_pool_create(&p, NULL) == APR_SUCCESS);
-
-  assert(apr_thread_mutex_create(&thread_mutex, 0, p) == APR_SUCCESS);
-  assert(apr_thread_mutex_lock(thread_mutex) == APR_SUCCESS);
-  
-  lock_init(mech, test_mode);
-
-  counter = 0;
-
-  i = 0;
-  while (i < numThreads)
-  {
-    rv = apr_thread_create(&threads[i],
-                           NULL,
-                           eachThread,
-                           (void *)test_mode,
-                           p);
-    if (rv != APR_SUCCESS) {
-      fprintf(stderr, "apr_thread_create->%d\n", rv);
-      exit(1);
-    }
-    ++i;
-  }
-
-  apr_sleep(apr_time_from_sec(5));
-
-  if (test_mode == TEST_PROC) {
-      printf("  Mutex mechanism `%s' is %sglobal in scope on this platform.\n",
-             mech_name, counter == 1 ? "" : "not ");
-  }
-  else {
-      if (counter != 1) {
-          fprintf(stderr, "\n!!!apr_global_mutex operations are broken on this "
-                  "platform for mutex mechanism `%s'!\n"
-                  "They don't block out threads within the same process.\n",
-                  mech_name);
-          fprintf(stderr, "counter value: %d\n", counter);
-          exit(1);
-      }
-      else {
-          printf("  no problems encountered...\n");
-      }
-  }
-  
-  assert(apr_thread_mutex_unlock(thread_mutex) == APR_SUCCESS);
-
-  i = 0;
-  while (i < numThreads)
-  {
-    apr_status_t ignored;
-
-    rv = apr_thread_join(&ignored,
-                         threads[i]);
-    assert(rv == APR_SUCCESS);
-    ++i;
-  }
-
-  lock_destroy(test_mode);
-  apr_thread_mutex_destroy(thread_mutex);
-  apr_pool_destroy(p);
-}
-
-static void test_mech(apr_lockmech_e mech, const char *mech_name)
-{
-    test_mech_mode(mech, mech_name, TEST_PROC);
-    test_mech_mode(mech, mech_name, TEST_GLOBAL);
-}
-
-int main(void)
-{
-    struct {
-        apr_lockmech_e mech;
-        const char *mech_name;
-    } lockmechs[] = {
-        {APR_LOCK_DEFAULT, "default"}
-#if APR_HAS_FLOCK_SERIALIZE
-        ,{APR_LOCK_FLOCK, "flock"}
-#endif
-#if APR_HAS_SYSVSEM_SERIALIZE
-        ,{APR_LOCK_SYSVSEM, "sysvsem"}
-#endif
-#if APR_HAS_POSIXSEM_SERIALIZE
-        ,{APR_LOCK_POSIXSEM, "posix"}
-#endif
-#if APR_HAS_FCNTL_SERIALIZE
-        ,{APR_LOCK_FCNTL, "fcntl"}
-#endif
-#if APR_HAS_PROC_PTHREAD_SERIALIZE
-        ,{APR_LOCK_PROC_PTHREAD, "proc_pthread"}
-#endif
-    };
-    int i;
-        
-    assert(apr_initialize() == APR_SUCCESS);
-
-    for (i = 0; i < sizeof(lockmechs) / sizeof(lockmechs[0]); i++) {
-        test_mech(lockmechs[i].mech, lockmechs[i].mech_name);
-    }
-    
-    apr_terminate();
-    return 0;
-}
-
-#endif /* APR_HAS_THREADS */
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testnames.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testnames.c
deleted file mode 100644
index 8df4b083..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testnames.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "test_apr.h"
-#include "apr_file_io.h"
-#include "apr_file_info.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_lib.h"
-
-#if WIN32
-#define ABS_ROOT "C:/"
-#elif defined(NETWARE)
-#define ABS_ROOT "SYS:/"
-#else
-#define ABS_ROOT "/"
-#endif
-
-static void merge_aboveroot(CuTest *tc)
-{
-    apr_status_t rv;
-    char *dstpath = NULL;
-    char errmsg[256];
-
-    rv = apr_filepath_merge(&dstpath, ABS_ROOT"foo", ABS_ROOT"bar", APR_FILEPATH_NOTABOVEROOT,
-                            p);
-    apr_strerror(rv, errmsg, sizeof(errmsg));
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_EABOVEROOT(rv));
-    CuAssertPtrEquals(tc, NULL, dstpath);
-    CuAssertStrEquals(tc, "The given path was above the root path", errmsg);
-}
-
-static void merge_belowroot(CuTest *tc)
-{
-    apr_status_t rv;
-    char *dstpath = NULL;
-
-    rv = apr_filepath_merge(&dstpath, ABS_ROOT"foo", ABS_ROOT"foo/bar", 
-                            APR_FILEPATH_NOTABOVEROOT, p);
-    CuAssertPtrNotNull(tc, dstpath);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, ABS_ROOT"foo/bar", dstpath);
-}
-
-static void merge_noflag(CuTest *tc)
-{
-    apr_status_t rv;
-    char *dstpath = NULL;
-
-    rv = apr_filepath_merge(&dstpath, ABS_ROOT"foo", ABS_ROOT"foo/bar", 0, p);
-    CuAssertPtrNotNull(tc, dstpath);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, ABS_ROOT"foo/bar", dstpath);
-}
-
-static void merge_dotdot(CuTest *tc)
-{
-    apr_status_t rv;
-    char *dstpath = NULL;
-
-    rv = apr_filepath_merge(&dstpath, ABS_ROOT"foo/bar", "../baz", 0, p);
-    CuAssertPtrNotNull(tc, dstpath);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, ABS_ROOT"foo/baz", dstpath);
-
-    rv = apr_filepath_merge(&dstpath, "", "../test", 0, p);
-    CuAssertIntEquals(tc, 0, APR_SUCCESS);
-    CuAssertStrEquals(tc, "../test", dstpath);
-
-    /* Very dangerous assumptions here about what the cwd is.  However, let's assume
-     * that the testall is invoked from within apr/test/ so the following test should
-     * return ../test unless a previously fixed bug remains or the developer changes
-     * the case of the test directory:
-     */
-    rv = apr_filepath_merge(&dstpath, "", "../test", APR_FILEPATH_TRUENAME, p);
-    CuAssertIntEquals(tc, 0, APR_SUCCESS);
-    CuAssertStrEquals(tc, "../test", dstpath);
-}
-
-static void merge_dotdot_dotdot_dotdot(CuTest *tc)
-{
-    apr_status_t rv;
-    char *dstpath = NULL;
-
-    rv = apr_filepath_merge(&dstpath, "", 
-                            "../../..", APR_FILEPATH_TRUENAME, p);
-    CuAssertPtrNotNull(tc, dstpath);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, "../../..", dstpath);
-
-    rv = apr_filepath_merge(&dstpath, "", 
-                            "../../../", APR_FILEPATH_TRUENAME, p);
-    CuAssertPtrNotNull(tc, dstpath);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, "../../../", dstpath);
-}
-
-static void merge_secure(CuTest *tc)
-{
-    apr_status_t rv;
-    char *dstpath = NULL;
-
-    rv = apr_filepath_merge(&dstpath, ABS_ROOT"foo/bar", "../bar/baz", 0, p);
-    CuAssertPtrNotNull(tc, dstpath);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, ABS_ROOT"foo/bar/baz", dstpath);
-}
-
-static void merge_notrel(CuTest *tc)
-{
-    apr_status_t rv;
-    char *dstpath = NULL;
-
-    rv = apr_filepath_merge(&dstpath, ABS_ROOT"foo/bar", "../baz",
-                            APR_FILEPATH_NOTRELATIVE, p);
-    CuAssertPtrNotNull(tc, dstpath);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, ABS_ROOT"foo/baz", dstpath);
-}
-
-static void merge_notrelfail(CuTest *tc)
-{
-    apr_status_t rv;
-    char *dstpath = NULL;
-    char errmsg[256];
-
-    rv = apr_filepath_merge(&dstpath, "foo/bar", "../baz", 
-                            APR_FILEPATH_NOTRELATIVE, p);
-    apr_strerror(rv, errmsg, sizeof(errmsg));
-
-    CuAssertPtrEquals(tc, NULL, dstpath);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_ERELATIVE(rv));
-    CuAssertStrEquals(tc, "The given path is relative", errmsg);
-}
-
-static void merge_notabsfail(CuTest *tc)
-{
-    apr_status_t rv;
-    char *dstpath = NULL;
-    char errmsg[256];
-
-    rv = apr_filepath_merge(&dstpath, ABS_ROOT"foo/bar", "../baz", 
-                            APR_FILEPATH_NOTABSOLUTE, p);
-    apr_strerror(rv, errmsg, sizeof(errmsg));
-
-    CuAssertPtrEquals(tc, NULL, dstpath);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_EABSOLUTE(rv));
-    CuAssertStrEquals(tc, "The given path is absolute", errmsg);
-}
-
-static void merge_notabs(CuTest *tc)
-{
-    apr_status_t rv;
-    char *dstpath = NULL;
-
-    rv = apr_filepath_merge(&dstpath, "foo/bar", "../baz", 
-                            APR_FILEPATH_NOTABSOLUTE, p);
-
-    CuAssertPtrNotNull(tc, dstpath);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, "foo/baz", dstpath);
-}
-
-static void root_absolute(CuTest *tc)
-{
-    apr_status_t rv;
-    const char *root = NULL;
-    const char *path = ABS_ROOT"foo/bar";
-
-    rv = apr_filepath_root(&root, &path, 0, p);
-
-    CuAssertPtrNotNull(tc, root);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, ABS_ROOT, root);
-}
-
-static void root_relative(CuTest *tc)
-{
-    apr_status_t rv;
-    const char *root = NULL;
-    const char *path = "foo/bar";
-    char errmsg[256];
-
-    rv = apr_filepath_root(&root, &path, 0, p);
-    apr_strerror(rv, errmsg, sizeof(errmsg));
-
-    CuAssertPtrEquals(tc, NULL, root);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_ERELATIVE(rv));
-    CuAssertStrEquals(tc, "The given path is relative", errmsg);
-}
-
-
-static void root_from_cwd_and_back(CuTest *tc)
-{
-    apr_status_t rv;
-    const char *root = NULL;
-    const char *path = "//";
-    char *origpath;
-    char *testpath;
-
-    CuAssertIntEquals(tc, APR_SUCCESS, apr_filepath_get(&origpath, 0, p));
-    path = origpath;
-    rv = apr_filepath_root(&root, &path, APR_FILEPATH_TRUENAME, p);
-
-#if defined(WIN32) || defined(OS2)
-    CuAssertIntEquals(tc, origpath[0], root[0]);
-    CuAssertIntEquals(tc, ':', root[1]);
-    CuAssertIntEquals(tc, '/', root[2]);
-    CuAssertIntEquals(tc, 0, root[3]);
-    CuAssertStrEquals(tc, origpath + 3, path);
-#elif defined(NETWARE)
-    CuAssertIntEquals(tc, origpath[0], root[0]);
-    {
-    char *pt = strchr(root, ':');
-    CuAssertPtrNotNull(tc, pt);
-    CuAssertIntEquals(tc, ':', pt[0]);
-    CuAssertIntEquals(tc, '/', pt[1]);
-    CuAssertIntEquals(tc, 0, pt[2]);
-    pt = strchr(origpath, ':');
-    CuAssertPtrNotNull(tc, pt);
-    CuAssertStrEquals(tc, (pt+2), path);
-    }
-#else
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, "/", root);
-    CuAssertStrEquals(tc, origpath + 1, path);
-#endif
-
-    rv = apr_filepath_merge(&testpath, root, path, 
-                            APR_FILEPATH_TRUENAME
-                          | APR_FILEPATH_NOTABOVEROOT
-                          | APR_FILEPATH_NOTRELATIVE, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, origpath, testpath);
-}
-
-
-CuSuite *testnames(void)
-{
-    CuSuite *suite = CuSuiteNew("Path names");
-
-    SUITE_ADD_TEST(suite, merge_aboveroot);
-    SUITE_ADD_TEST(suite, merge_belowroot);
-    SUITE_ADD_TEST(suite, merge_noflag);
-    SUITE_ADD_TEST(suite, merge_dotdot);
-    SUITE_ADD_TEST(suite, merge_secure);
-    SUITE_ADD_TEST(suite, merge_notrel);
-    SUITE_ADD_TEST(suite, merge_notrelfail);
-    SUITE_ADD_TEST(suite, merge_notabs);
-    SUITE_ADD_TEST(suite, merge_notabsfail);
-    SUITE_ADD_TEST(suite, merge_dotdot_dotdot_dotdot);
-
-    SUITE_ADD_TEST(suite, root_absolute);
-    SUITE_ADD_TEST(suite, root_relative);
-    SUITE_ADD_TEST(suite, root_from_cwd_and_back);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testoc.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testoc.c
deleted file mode 100644
index bebf4822..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testoc.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "test_apr.h"
-#include "apr_thread_proc.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_strings.h"
-
-#if APR_HAS_OTHER_CHILD
-
-/* XXX I'm sure there has to be a better way to do this ... */
-#ifdef WIN32
-#define EXTENSION ".exe"
-#elif NETWARE
-#define EXTENSION ".nlm"
-#else
-#define EXTENSION
-#endif
-
-static char reasonstr[256];
-
-static void ocmaint(int reason, void *data, int status)
-{
-    switch (reason) {
-    case APR_OC_REASON_DEATH:
-        apr_cpystrn(reasonstr, "APR_OC_REASON_DEATH", 
-                    strlen("APR_OC_REASON_DEATH") + 1);
-        break;
-    case APR_OC_REASON_LOST:
-        apr_cpystrn(reasonstr, "APR_OC_REASON_LOST", 
-                    strlen("APR_OC_REASON_LOST") + 1);
-        break;
-    case APR_OC_REASON_UNWRITABLE:
-        apr_cpystrn(reasonstr, "APR_OC_REASON_UNWRITEABLE", 
-                    strlen("APR_OC_REASON_UNWRITEABLE") + 1);
-        break;
-    case APR_OC_REASON_RESTART:
-        apr_cpystrn(reasonstr, "APR_OC_REASON_RESTART", 
-                    strlen("APR_OC_REASON_RESTART") + 1);
-        break;
-    }
-}
-
-#ifndef SIGKILL
-#define SIGKILL 1
-#endif
-
-/* It would be great if we could stress this stuff more, and make the test
- * more granular.
- */
-static void test_child_kill(CuTest *tc)
-{
-    apr_file_t *std = NULL;
-    apr_proc_t newproc;
-    apr_procattr_t *procattr = NULL;
-    const char *args[3];
-    apr_status_t rv;
-
-    args[0] = apr_pstrdup(p, "occhild" EXTENSION);
-    args[1] = apr_pstrdup(p, "-X");
-    args[2] = NULL;
-
-    rv = apr_procattr_create(&procattr, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_procattr_io_set(procattr, APR_FULL_BLOCK, APR_NO_PIPE, 
-                             APR_NO_PIPE);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_proc_create(&newproc, "./occhild" EXTENSION, args, NULL, procattr, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, newproc.in);
-    CuAssertPtrEquals(tc, NULL, newproc.out);
-    CuAssertPtrEquals(tc, NULL, newproc.err);
-
-    std = newproc.in;
-
-    apr_proc_other_child_register(&newproc, ocmaint, NULL, std, p);
-
-    apr_sleep(apr_time_from_sec(1));
-    rv = apr_proc_kill(&newproc, SIGKILL);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    
-    /* allow time for things to settle... */
-    apr_sleep(apr_time_from_sec(3));
-    
-    apr_proc_other_child_check();
-    CuAssertStrEquals(tc, "APR_OC_REASON_DEATH", reasonstr);
-}    
-#else
-
-static void oc_not_impl(CuTest *tc)
-{
-    CuNotImpl(tc, "Other child logic not implemented on this platform");
-}
-#endif
-
-CuSuite *testoc(void)
-{
-    CuSuite *suite = CuSuiteNew("Other Child");
-
-#if !APR_HAS_OTHER_CHILD
-    SUITE_ADD_TEST(suite, oc_not_impl);
-#else
-
-    SUITE_ADD_TEST(suite, test_child_kill); 
-
-#endif
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testpath.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testpath.c
deleted file mode 100644
index e41e26ac..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testpath.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "test_apr.h"
-#include "apr_file_info.h"
-#include "apr_errno.h"
-#include "apr_pools.h"
-#include "apr_tables.h"
-
-#if defined(WIN32) || defined(NETWARE) || defined(OS2)
-#define PSEP ";"
-#define DSEP "\\"
-#else
-#define PSEP ":"
-#define DSEP "/"
-#endif
-
-#define PX ""
-#define P1 "first path"
-#define P2 "second" DSEP "path"
-#define P3 "th ird" DSEP "path"
-#define P4 "fourth" DSEP "pa th"
-#define P5 "fifthpath"
-
-static const char *parts_in[] = { P1, P2, P3, PX, P4, P5 };
-static const char *path_in = P1 PSEP P2 PSEP P3 PSEP PX PSEP P4 PSEP P5;
-static const int  parts_in_count = sizeof(parts_in)/sizeof(*parts_in);
-
-static const char *parts_out[] = { P1, P2, P3, P4, P5 };
-static const char *path_out = P1 PSEP P2 PSEP P3 PSEP P4 PSEP P5;
-static const int  parts_out_count = sizeof(parts_out)/sizeof(*parts_out);
-
-static void list_split_multi(CuTest *tc)
-{
-    int i;
-    apr_status_t rv;
-    apr_array_header_t *pathelts;
-
-    pathelts = NULL;
-    rv = apr_filepath_list_split(&pathelts, path_in, p);
-    CuAssertPtrNotNull(tc, pathelts);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, parts_out_count, pathelts->nelts);
-    for (i = 0; i < pathelts->nelts; ++i)
-        CuAssertStrEquals(tc, parts_out[i], ((char**)pathelts->elts)[i]);
-}
-
-static void list_split_single(CuTest *tc)
-{
-    int i;
-    apr_status_t rv;
-    apr_array_header_t *pathelts;
-
-    for (i = 0; i < parts_in_count; ++i)
-    {
-        pathelts = NULL;
-        rv = apr_filepath_list_split(&pathelts, parts_in[i], p);
-        CuAssertPtrNotNull(tc, pathelts);
-        CuAssertIntEquals(tc, APR_SUCCESS, rv);
-        if (parts_in[i][0] == '\0')
-            CuAssertIntEquals(tc, 0, pathelts->nelts);
-        else
-        {
-            CuAssertIntEquals(tc, 1, pathelts->nelts);
-            CuAssertStrEquals(tc, parts_in[i], *(char**)pathelts->elts);
-        }
-    }
-}
-
-static void list_merge_multi(CuTest *tc)
-{
-    int i;
-    char *liststr;
-    apr_status_t rv;
-    apr_array_header_t *pathelts;
-
-    pathelts = apr_array_make(p, parts_in_count, sizeof(const char*));
-    for (i = 0; i < parts_in_count; ++i)
-        *(const char**)apr_array_push(pathelts) = parts_in[i];
-
-    liststr = NULL;
-    rv = apr_filepath_list_merge(&liststr, pathelts, p);
-    CuAssertPtrNotNull(tc, liststr);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, liststr, path_out);
-}
-
-static void list_merge_single(CuTest *tc)
-{
-    int i;
-    char *liststr;
-    apr_status_t rv;
-    apr_array_header_t *pathelts;
-
-    pathelts = apr_array_make(p, 1, sizeof(const char*));
-    apr_array_push(pathelts);
-    for (i = 0; i < parts_in_count; ++i)
-    {
-        *(const char**)pathelts->elts = parts_in[i];
-        liststr = NULL;
-        rv = apr_filepath_list_merge(&liststr, pathelts, p);
-        if (parts_in[i][0] == '\0')
-            CuAssertPtrEquals(tc, NULL, liststr);
-        else
-        {
-            CuAssertPtrNotNull(tc, liststr);
-            CuAssertIntEquals(tc, APR_SUCCESS, rv);
-            CuAssertStrEquals(tc, liststr, parts_in[i]);
-        }
-    }
-}
-
-
-CuSuite *testpath(void)
-{
-    CuSuite *suite = CuSuiteNew("Path lists");
-
-    SUITE_ADD_TEST(suite, list_split_multi);
-    SUITE_ADD_TEST(suite, list_split_single);
-    SUITE_ADD_TEST(suite, list_merge_multi);
-    SUITE_ADD_TEST(suite, list_merge_single);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testpipe.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testpipe.c
deleted file mode 100644
index 79adf56b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testpipe.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdlib.h>
-
-#include "test_apr.h"
-#include "apr_file_io.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_thread_proc.h"
-#include "apr_strings.h"
-
-static apr_file_t *readp = NULL;
-static apr_file_t *writep = NULL;
-
-static void create_pipe(CuTest *tc)
-{
-    apr_status_t rv;
-
-    rv = apr_file_pipe_create(&readp, &writep, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, readp);
-    CuAssertPtrNotNull(tc, writep);
-}   
-
-static void close_pipe(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_size_t nbytes = 256;
-    char buf[256];
-
-    rv = apr_file_close(readp);
-    rv = apr_file_close(writep);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_read(readp, buf, &nbytes);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_EBADF(rv));
-}   
-
-static void set_timeout(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_file_t *readp = NULL;
-    apr_file_t *writep = NULL;
-    apr_interval_time_t timeout;
-
-    rv = apr_file_pipe_create(&readp, &writep, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, readp);
-    CuAssertPtrNotNull(tc, writep);
-
-    rv = apr_file_pipe_timeout_get(readp, &timeout);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssert(tc, "Timeout mismatch, expected -1", timeout == -1);
-
-    rv = apr_file_pipe_timeout_set(readp, apr_time_from_sec(1));
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_pipe_timeout_get(readp, &timeout);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssert(tc, "Timeout mismatch, expected 1 second", 
-		     timeout == apr_time_from_sec(1));
-}
-
-static void read_write(CuTest *tc)
-{
-    apr_status_t rv;
-    char *buf;
-    apr_size_t nbytes;
-    
-    nbytes = strlen("this is a test");
-    buf = (char *)apr_palloc(p, nbytes + 1);
-
-    rv = apr_file_pipe_create(&readp, &writep, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, readp);
-    CuAssertPtrNotNull(tc, writep);
-
-    rv = apr_file_pipe_timeout_set(readp, apr_time_from_sec(1));
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_read(readp, buf, &nbytes);
-    if (!rv) {
-      CuAssertIntEquals(tc, 1, APR_STATUS_IS_TIMEUP(rv));
-      CuAssertIntEquals(tc, 0, nbytes);
-    }
-}
-
-static void read_write_notimeout(CuTest *tc)
-{
-    apr_status_t rv;
-    char *buf = "this is a test";
-    char *input;
-    apr_size_t nbytes;
-    
-    nbytes = strlen("this is a test");
-
-    rv = apr_file_pipe_create(&readp, &writep, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, readp);
-    CuAssertPtrNotNull(tc, writep);
-
-    rv = apr_file_write(writep, buf, &nbytes);
-    CuAssertIntEquals(tc, strlen("this is a test"), nbytes);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    nbytes = 256;
-    input = apr_pcalloc(p, nbytes + 1);
-    rv = apr_file_read(readp, input, &nbytes);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, strlen("this is a test"), nbytes);
-    CuAssertStrEquals(tc, "this is a test", input);
-}
-
-/* XXX FIXME */
-#ifdef WIN32
-#define EXTENSION ".exe"
-#elif NETWARE
-#define EXTENSION ".nlm"
-#else
-#define EXTENSION
-#endif
-
-static void test_pipe_writefull(CuTest *tc)
-{
-    int iterations = 1000;
-    int i;
-    int bytes_per_iteration = 8000;
-    char *buf = (char *)malloc(bytes_per_iteration);
-    char responsebuf[128];
-    apr_size_t nbytes;
-    int bytes_processed;
-    apr_proc_t proc = {0};
-    apr_procattr_t *procattr;
-    const char *args[2];
-    apr_status_t rv;
-    
-    rv = apr_procattr_create(&procattr, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_procattr_io_set(procattr, APR_CHILD_BLOCK, APR_CHILD_BLOCK,
-                             APR_CHILD_BLOCK);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_procattr_error_check_set(procattr, 1);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    args[0] = "readchild" EXTENSION;
-    args[1] = NULL;
-    rv = apr_proc_create(&proc, "./readchild" EXTENSION, args, NULL, procattr, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_pipe_timeout_set(proc.in, apr_time_from_sec(10));
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_file_pipe_timeout_set(proc.out, apr_time_from_sec(10));
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    i = iterations;
-    do {
-        rv = apr_file_write_full(proc.in, buf, bytes_per_iteration, NULL);
-        CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    } while (--i);
-
-    free(buf);
-
-    rv = apr_file_close(proc.in);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    
-    nbytes = sizeof(responsebuf);
-    rv = apr_file_read(proc.out, responsebuf, &nbytes);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    bytes_processed = (int)apr_strtoi64(responsebuf, NULL, 10);
-    CuAssertIntEquals(tc, iterations * bytes_per_iteration, bytes_processed);
-}
-
-CuSuite *testpipe(void)
-{
-    CuSuite *suite = CuSuiteNew("Pipes");
-
-    SUITE_ADD_TEST(suite, create_pipe);
-    SUITE_ADD_TEST(suite, close_pipe);
-    SUITE_ADD_TEST(suite, set_timeout);
-    SUITE_ADD_TEST(suite, read_write);
-    SUITE_ADD_TEST(suite, read_write_notimeout);
-    SUITE_ADD_TEST(suite, test_pipe_writefull);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testpoll.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testpoll.c
deleted file mode 100644
index 4e2fac8f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testpoll.c
+++ /dev/null
@@ -1,526 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "test_apr.h"
-#include "apr_strings.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_network_io.h"
-#include "apr_poll.h"
-
-#define SMALL_NUM_SOCKETS 3
-/* We can't use 64 here, because some platforms *ahem* Solaris *ahem* have
- * a default limit of 64 open file descriptors per process.  If we use
- * 64, the test will fail even though the code is correct.
- */
-#define LARGE_NUM_SOCKETS 50
-
-static apr_socket_t *s[LARGE_NUM_SOCKETS];
-static apr_sockaddr_t *sa[LARGE_NUM_SOCKETS];
-static apr_pollfd_t *pollarray;
-static apr_pollfd_t *pollarray_large;
-static apr_pollset_t *pollset;
-
-static void make_socket(apr_socket_t **sock, apr_sockaddr_t **sa, 
-                        apr_port_t port, apr_pool_t *p, CuTest *tc)
-{
-    apr_status_t rv;
-
-    rv = apr_sockaddr_info_get(sa, "127.0.0.1", APR_UNSPEC, port, 0, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_socket_create(sock, (*sa)->family, SOCK_DGRAM, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv =apr_socket_bind((*sock), (*sa));
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-}
-
-static void check_sockets(const apr_pollfd_t *pollarray, 
-                          apr_socket_t **sockarray, int which, int pollin, 
-                          CuTest *tc)
-{
-    apr_status_t rv;
-    apr_int16_t event;
-    char *str;
-
-    rv = apr_poll_revents_get(&event, sockarray[which], 
-                              (apr_pollfd_t *)pollarray);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    if (pollin) {
-        str = apr_psprintf(p, "Socket %d not signalled when it should be",
-                           which);
-        CuAssert(tc, str, event & APR_POLLIN);
-    } else {
-        str = apr_psprintf(p, "Socket %d signalled when it should not be",
-                           which);
-        CuAssert(tc, str, !(event & APR_POLLIN));
-    }
-}
-
-static void send_msg(apr_socket_t **sockarray, apr_sockaddr_t **sas, int which,
-                     CuTest *tc)
-{
-    apr_size_t len = 5;
-    apr_status_t rv;
-
-    CuAssertPtrNotNull(tc, sockarray[which]);
-
-    rv = apr_socket_sendto(sockarray[which], sas[which], 0, "hello", &len);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, strlen("hello"), len);
-}
-
-static void recv_msg(apr_socket_t **sockarray, int which, apr_pool_t *p, 
-                     CuTest *tc)
-{
-    apr_size_t buflen = 5;
-    char *buffer = apr_pcalloc(p, sizeof(char) * (buflen + 1));
-    apr_sockaddr_t *recsa;
-    apr_status_t rv;
-
-    CuAssertPtrNotNull(tc, sockarray[which]);
-
-    apr_sockaddr_info_get(&recsa, "127.0.0.1", APR_UNSPEC, 7770, 0, p);
-
-    rv = apr_socket_recvfrom(recsa, sockarray[which], 0, buffer, &buflen);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, strlen("hello"), buflen);
-    CuAssertStrEquals(tc, "hello", buffer);
-}
-
-    
-static void create_all_sockets(CuTest *tc)
-{
-    int i;
-
-    for (i = 0; i < LARGE_NUM_SOCKETS; i++){
-        make_socket(&s[i], &sa[i], 7777 + i, p, tc);
-    }
-}
-       
-static void setup_small_poll(CuTest *tc)
-{
-    apr_status_t rv;
-    int i;
-
-    rv = apr_poll_setup(&pollarray, SMALL_NUM_SOCKETS, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    
-    for (i = 0; i < SMALL_NUM_SOCKETS;i++){
-        CuAssertIntEquals(tc, 0, pollarray[i].reqevents);
-        CuAssertIntEquals(tc, 0, pollarray[i].rtnevents);
-
-        rv = apr_poll_socket_add(pollarray, s[i], APR_POLLIN);
-        CuAssertIntEquals(tc, APR_SUCCESS, rv);
-        CuAssertPtrEquals(tc, s[i], pollarray[i].desc.s);
-    }
-}
-
-static void setup_large_poll(CuTest *tc)
-{
-    apr_status_t rv;
-    int i;
-
-    rv = apr_poll_setup(&pollarray_large, LARGE_NUM_SOCKETS, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    
-    for (i = 0; i < LARGE_NUM_SOCKETS;i++){
-        CuAssertIntEquals(tc, 0, pollarray_large[i].reqevents);
-        CuAssertIntEquals(tc, 0, pollarray_large[i].rtnevents);
-
-        rv = apr_poll_socket_add(pollarray_large, s[i], APR_POLLIN);
-        CuAssertIntEquals(tc, APR_SUCCESS, rv);
-        CuAssertPtrEquals(tc, s[i], pollarray_large[i].desc.s);
-    }
-}
-
-static void nomessage(CuTest *tc)
-{
-    apr_status_t rv;
-    int srv = SMALL_NUM_SOCKETS;
-
-    rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_TIMEUP(rv));
-    check_sockets(pollarray, s, 0, 0, tc);
-    check_sockets(pollarray, s, 1, 0, tc);
-    check_sockets(pollarray, s, 2, 0, tc);
-}
-
-static void send_2(CuTest *tc)
-{
-    apr_status_t rv;
-    int srv = SMALL_NUM_SOCKETS;
-
-    send_msg(s, sa, 2, tc);
-
-    rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    check_sockets(pollarray, s, 0, 0, tc);
-    check_sockets(pollarray, s, 1, 0, tc);
-    check_sockets(pollarray, s, 2, 1, tc);
-}
-
-static void recv_2_send_1(CuTest *tc)
-{
-    apr_status_t rv;
-    int srv = SMALL_NUM_SOCKETS;
-
-    recv_msg(s, 2, p, tc);
-    send_msg(s, sa, 1, tc);
-
-    rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    check_sockets(pollarray, s, 0, 0, tc);
-    check_sockets(pollarray, s, 1, 1, tc);
-    check_sockets(pollarray, s, 2, 0, tc);
-}
-
-static void send_2_signaled_1(CuTest *tc)
-{
-    apr_status_t rv;
-    int srv = SMALL_NUM_SOCKETS;
-
-    send_msg(s, sa, 2, tc);
-
-    rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    check_sockets(pollarray, s, 0, 0, tc);
-    check_sockets(pollarray, s, 1, 1, tc);
-    check_sockets(pollarray, s, 2, 1, tc);
-}
-
-static void recv_1_send_0(CuTest *tc)
-{
-    apr_status_t rv;
-    int srv = SMALL_NUM_SOCKETS;
-
-    recv_msg(s, 1, p, tc);
-    send_msg(s, sa, 0, tc);
-
-    rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    check_sockets(pollarray, s, 0, 1, tc);
-    check_sockets(pollarray, s, 1, 0, tc);
-    check_sockets(pollarray, s, 2, 1, tc);
-}
-
-static void clear_all_signalled(CuTest *tc)
-{
-    apr_status_t rv;
-    int srv = SMALL_NUM_SOCKETS;
-
-    recv_msg(s, 0, p, tc);
-    recv_msg(s, 2, p, tc);
-
-    rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_TIMEUP(rv));
-    check_sockets(pollarray, s, 0, 0, tc);
-    check_sockets(pollarray, s, 1, 0, tc);
-    check_sockets(pollarray, s, 2, 0, tc);
-}
-
-static void send_large_pollarray(CuTest *tc)
-{
-    apr_status_t rv;
-    int lrv = LARGE_NUM_SOCKETS;
-    int i;
-
-    send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc);
-
-    rv = apr_poll(pollarray_large, LARGE_NUM_SOCKETS, &lrv, 
-                  2 * APR_USEC_PER_SEC);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    for (i = 0; i < LARGE_NUM_SOCKETS; i++) {
-        if (i == (LARGE_NUM_SOCKETS - 1)) {
-            check_sockets(pollarray_large, s, i, 1, tc);
-        }
-        else {
-            check_sockets(pollarray_large, s, i, 0, tc);
-        }
-    }
-}
-
-static void recv_large_pollarray(CuTest *tc)
-{
-    apr_status_t rv;
-    int lrv = LARGE_NUM_SOCKETS;
-    int i;
-
-    recv_msg(s, LARGE_NUM_SOCKETS - 1, p, tc);
-
-    rv = apr_poll(pollarray_large, LARGE_NUM_SOCKETS, &lrv, 
-                  2 * APR_USEC_PER_SEC);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_TIMEUP(rv));
-
-    for (i = 0; i < LARGE_NUM_SOCKETS; i++) {
-        check_sockets(pollarray_large, s, i, 0, tc);
-    }
-}
-
-static void setup_pollset(CuTest *tc)
-{
-    apr_status_t rv;
-    rv = apr_pollset_create(&pollset, LARGE_NUM_SOCKETS, p, 0);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-}
-
-static void add_sockets_pollset(CuTest *tc)
-{
-    apr_status_t rv;
-    int i;
-
-    for (i = 0; i < LARGE_NUM_SOCKETS;i++){
-        apr_pollfd_t socket_pollfd;
-
-        CuAssertPtrNotNull(tc, s[i]);
-
-        socket_pollfd.desc_type = APR_POLL_SOCKET;
-        socket_pollfd.reqevents = APR_POLLIN;
-        socket_pollfd.desc.s = s[i];
-        socket_pollfd.client_data = s[i];
-        rv = apr_pollset_add(pollset, &socket_pollfd);
-        CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    }
-}
-
-static void nomessage_pollset(CuTest *tc)
-{
-    apr_status_t rv;
-    int lrv;
-    const apr_pollfd_t *descs = NULL;
-
-    rv = apr_pollset_poll(pollset, 0, &lrv, &descs);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_TIMEUP(rv));
-    CuAssertIntEquals(tc, 0, lrv);
-    CuAssertPtrEquals(tc, NULL, descs);
-}
-
-static void send0_pollset(CuTest *tc)
-{
-    apr_status_t rv;
-    const apr_pollfd_t *descs = NULL;
-    int num;
-    
-    send_msg(s, sa, 0, tc);
-    rv = apr_pollset_poll(pollset, 0, &num, &descs);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, 1, num);
-    CuAssertPtrNotNull(tc, descs);
-
-    CuAssertPtrEquals(tc, s[0], descs[0].desc.s);
-    CuAssertPtrEquals(tc, s[0],  descs[0].client_data);
-}
-
-static void recv0_pollset(CuTest *tc)
-{
-    apr_status_t rv;
-    int lrv;
-    const apr_pollfd_t *descs = NULL;
-
-    recv_msg(s, 0, p, tc);
-    rv = apr_pollset_poll(pollset, 0, &lrv, &descs);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_TIMEUP(rv));
-    CuAssertIntEquals(tc, 0, lrv);
-    CuAssertPtrEquals(tc, NULL, descs);
-}
-
-static void send_middle_pollset(CuTest *tc)
-{
-    apr_status_t rv;
-    const apr_pollfd_t *descs = NULL;
-    int num;
-    
-    send_msg(s, sa, 2, tc);
-    send_msg(s, sa, 5, tc);
-    rv = apr_pollset_poll(pollset, 0, &num, &descs);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, 2, num);
-    CuAssertPtrNotNull(tc, descs);
-
-    CuAssert(tc, "Incorrect socket in result set",
-            ((descs[0].desc.s == s[2]) && (descs[1].desc.s == s[5])) ||
-            ((descs[0].desc.s == s[5]) && (descs[1].desc.s == s[2])));
-}
-
-static void clear_middle_pollset(CuTest *tc)
-{
-    apr_status_t rv;
-    int lrv;
-    const apr_pollfd_t *descs = NULL;
-
-    recv_msg(s, 2, p, tc);
-    recv_msg(s, 5, p, tc);
-
-    rv = apr_pollset_poll(pollset, 0, &lrv, &descs);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_TIMEUP(rv));
-    CuAssertIntEquals(tc, 0, lrv);
-    CuAssertPtrEquals(tc, NULL, descs);
-}
-
-static void send_last_pollset(CuTest *tc)
-{
-    apr_status_t rv;
-    const apr_pollfd_t *descs = NULL;
-    int num;
-    
-    send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc);
-    rv = apr_pollset_poll(pollset, 0, &num, &descs);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, 1, num);
-    CuAssertPtrNotNull(tc, descs);
-
-    CuAssertPtrEquals(tc, s[LARGE_NUM_SOCKETS - 1], descs[0].desc.s);
-    CuAssertPtrEquals(tc, s[LARGE_NUM_SOCKETS - 1],  descs[0].client_data);
-}
-
-static void clear_last_pollset(CuTest *tc)
-{
-    apr_status_t rv;
-    int lrv;
-    const apr_pollfd_t *descs = NULL;
-
-    recv_msg(s, LARGE_NUM_SOCKETS - 1, p, tc);
-
-    rv = apr_pollset_poll(pollset, 0, &lrv, &descs);
-    CuAssertIntEquals(tc, 1, APR_STATUS_IS_TIMEUP(rv));
-    CuAssertIntEquals(tc, 0, lrv);
-    CuAssertPtrEquals(tc, NULL, descs);
-}
-
-static void close_all_sockets(CuTest *tc)
-{
-    apr_status_t rv;
-    int i;
-
-    for (i = 0; i < LARGE_NUM_SOCKETS; i++){
-        rv = apr_socket_close(s[i]);
-        CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    }
-}
-
-static void pollset_remove(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_pollset_t *pollset;
-    const apr_pollfd_t *hot_files;
-    apr_pollfd_t pfd;
-    apr_int32_t num;
-
-    rv = apr_pollset_create(&pollset, 5, p, 0);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    pfd.p = p;
-    pfd.desc_type = APR_POLL_SOCKET;
-    pfd.reqevents = APR_POLLOUT;
-
-    pfd.desc.s = s[0];
-    pfd.client_data = (void *)1;
-    rv = apr_pollset_add(pollset, &pfd);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    pfd.desc.s = s[1];
-    pfd.client_data = (void *)2;
-    rv = apr_pollset_add(pollset, &pfd);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    pfd.desc.s = s[2];
-    pfd.client_data = (void *)3;
-    rv = apr_pollset_add(pollset, &pfd);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    pfd.desc.s = s[1];
-    pfd.client_data = (void *)4;
-    rv = apr_pollset_add(pollset, &pfd);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    pfd.desc.s = s[3];
-    pfd.client_data = (void *)5;
-    rv = apr_pollset_add(pollset, &pfd);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_pollset_poll(pollset, 1000, &num, &hot_files);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, 5, num);
-
-    /* now remove the pollset elements referring to desc s[1] */
-    pfd.desc.s = s[1];
-    pfd.client_data = (void *)999; /* not used on this call */
-    rv = apr_pollset_remove(pollset, &pfd);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    /* this time only three should match */
-    rv = apr_pollset_poll(pollset, 1000, &num, &hot_files);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, 3, num);
-    CuAssertPtrEquals(tc, (void *)1, hot_files[0].client_data);
-    CuAssertPtrEquals(tc, s[0], hot_files[0].desc.s);
-    CuAssertPtrEquals(tc, (void *)3, hot_files[1].client_data);
-    CuAssertPtrEquals(tc, s[2], hot_files[1].desc.s);
-    CuAssertPtrEquals(tc, (void *)5, hot_files[2].client_data);
-    CuAssertPtrEquals(tc, s[3], hot_files[2].desc.s);
-    
-    /* now remove the pollset elements referring to desc s[2] */
-    pfd.desc.s = s[2];
-    pfd.client_data = (void *)999; /* not used on this call */
-    rv = apr_pollset_remove(pollset, &pfd);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    /* this time only two should match */
-    rv = apr_pollset_poll(pollset, 1000, &num, &hot_files);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, 2, num);
-    CuAssertPtrEquals(tc, (void *)1, hot_files[0].client_data);
-    CuAssertPtrEquals(tc, s[0], hot_files[0].desc.s);
-    CuAssertPtrEquals(tc, (void *)5, hot_files[1].client_data);
-    CuAssertPtrEquals(tc, s[3], hot_files[1].desc.s);
-}
-
-CuSuite *testpoll(void)
-{
-    CuSuite *suite = CuSuiteNew("Poll");
-
-    SUITE_ADD_TEST(suite, create_all_sockets);
-    SUITE_ADD_TEST(suite, setup_small_poll);
-    SUITE_ADD_TEST(suite, setup_large_poll);
-    SUITE_ADD_TEST(suite, nomessage);
-    SUITE_ADD_TEST(suite, send_2);
-    SUITE_ADD_TEST(suite, recv_2_send_1);
-    SUITE_ADD_TEST(suite, send_2_signaled_1);
-    SUITE_ADD_TEST(suite, recv_1_send_0);
-    SUITE_ADD_TEST(suite, clear_all_signalled);
-    SUITE_ADD_TEST(suite, send_large_pollarray);
-    SUITE_ADD_TEST(suite, recv_large_pollarray);
-
-    SUITE_ADD_TEST(suite, setup_pollset);
-    SUITE_ADD_TEST(suite, add_sockets_pollset);
-    SUITE_ADD_TEST(suite, nomessage_pollset);
-    SUITE_ADD_TEST(suite, send0_pollset);
-    SUITE_ADD_TEST(suite, recv0_pollset);
-    SUITE_ADD_TEST(suite, send_middle_pollset);
-    SUITE_ADD_TEST(suite, clear_middle_pollset);
-    SUITE_ADD_TEST(suite, send_last_pollset);
-    SUITE_ADD_TEST(suite, clear_last_pollset);
-
-    SUITE_ADD_TEST(suite, pollset_remove);
-    
-    SUITE_ADD_TEST(suite, close_all_sockets);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testpools.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testpools.c
deleted file mode 100644
index efabf0d0..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testpools.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_errno.h"
-#include "apr_file_io.h"
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include "test_apr.h"
-
-#define ALLOC_BYTES 1024
-
-static apr_pool_t *pmain = NULL;
-static apr_pool_t *pchild = NULL;
-
-static void alloc_bytes(CuTest *tc)
-{
-    int i;
-    char *alloc;
-    
-    alloc = apr_palloc(pmain, ALLOC_BYTES);
-    CuAssertPtrNotNull(tc, alloc);
-
-    for (i=0;i<ALLOC_BYTES;i++) {
-        char *ptr = alloc + i;
-        *ptr = 0xa;
-    }
-    /* This is just added to get the positive.  If this test fails, the
-     * suite will seg fault.
-     */
-    CuAssertTrue(tc, 1);
-}
-
-static void calloc_bytes(CuTest *tc)
-{
-    int i;
-    char *alloc;
-    
-    alloc = apr_pcalloc(pmain, ALLOC_BYTES);
-    CuAssertPtrNotNull(tc, alloc);
-
-    for (i=0;i<ALLOC_BYTES;i++) {
-        char *ptr = alloc + i;
-        CuAssertTrue(tc, *ptr == '\0');
-    }
-}
-
-static void parent_pool(CuTest *tc)
-{
-    apr_status_t rv;
-
-    rv = apr_pool_create(&pmain, NULL);
-    CuAssertIntEquals(tc, rv, APR_SUCCESS);
-    CuAssertPtrNotNull(tc, pmain);
-}
-
-static void child_pool(CuTest *tc)
-{
-    apr_status_t rv;
-
-    rv = apr_pool_create(&pchild, pmain);
-    CuAssertIntEquals(tc, rv, APR_SUCCESS);
-    CuAssertPtrNotNull(tc, pchild);
-}
-
-static void test_ancestor(CuTest *tc)
-{
-    CuAssertIntEquals(tc, 1, apr_pool_is_ancestor(pmain, pchild));
-}
-
-static void test_notancestor(CuTest *tc)
-{
-    CuAssertIntEquals(tc, 0, apr_pool_is_ancestor(pchild, pmain));
-}
-
-CuSuite *testpool(void)
-{
-    CuSuite *suite = CuSuiteNew("Pools");
-
-    SUITE_ADD_TEST(suite, parent_pool);
-    SUITE_ADD_TEST(suite, child_pool);
-    SUITE_ADD_TEST(suite, test_ancestor);
-    SUITE_ADD_TEST(suite, test_notancestor);
-    SUITE_ADD_TEST(suite, alloc_bytes);
-    SUITE_ADD_TEST(suite, calloc_bytes);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testproc.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testproc.c
deleted file mode 100644
index 85f28801..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testproc.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_thread_proc.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_strings.h"
-#include "test_apr.h"
-
-/* XXX I'm sure there has to be a better way to do this ... */
-#ifdef WIN32
-#define EXTENSION ".exe"
-#elif NETWARE
-#define EXTENSION ".nlm"
-#else
-#define EXTENSION
-#endif
-
-#define TESTSTR "This is a test"
-
-static apr_proc_t newproc;
-
-static void test_create_proc(CuTest *tc)
-{
-    const char *args[2];
-    apr_procattr_t *attr;
-    apr_file_t *testfile = NULL;
-    apr_status_t rv;
-    apr_size_t length;
-    char *buf;
-
-    rv = apr_procattr_create(&attr, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_procattr_io_set(attr, APR_FULL_BLOCK, APR_FULL_BLOCK, 
-                             APR_NO_PIPE);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_procattr_dir_set(attr, "data");
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    args[0] = "proc_child" EXTENSION;
-    args[1] = NULL;
-    
-    rv = apr_proc_create(&newproc, "../proc_child" EXTENSION, args, NULL, 
-                         attr, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    testfile = newproc.in;
-
-    length = strlen(TESTSTR);
-    rv = apr_file_write(testfile, TESTSTR, &length);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, strlen(TESTSTR), length);
-
-    testfile = newproc.out;
-    length = 256;
-    buf = apr_pcalloc(p, length);
-    rv = apr_file_read(testfile, buf, &length);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, TESTSTR, buf);
-}
-
-static void test_proc_wait(CuTest *tc)
-{
-    apr_status_t rv;
-
-    rv = apr_proc_wait(&newproc, NULL, NULL, APR_WAIT);
-    CuAssertIntEquals(tc, APR_CHILD_DONE, rv);
-}
-
-static void test_file_redir(CuTest *tc)
-{
-    apr_file_t *testout = NULL;
-    apr_file_t *testerr = NULL;
-    apr_off_t offset;
-    apr_status_t rv;
-    const char *args[2];
-    apr_procattr_t *attr;
-    apr_file_t *testfile = NULL;
-    apr_size_t length;
-    char *buf;
-
-    testfile = NULL;
-    rv = apr_file_open(&testfile, "data/stdin",
-                       APR_READ | APR_WRITE | APR_CREATE | APR_EXCL,
-                       APR_OS_DEFAULT, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_file_open(&testout, "data/stdout",
-                       APR_READ | APR_WRITE | APR_CREATE | APR_EXCL,
-                       APR_OS_DEFAULT, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_file_open(&testerr, "data/stderr",
-                       APR_READ | APR_WRITE | APR_CREATE | APR_EXCL,
-                       APR_OS_DEFAULT, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    length = strlen(TESTSTR);
-    apr_file_write(testfile, TESTSTR, &length);
-    offset = 0;
-    rv = apr_file_seek(testfile, APR_SET, &offset);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssert(tc, "File position mismatch, expected 0", offset == 0);
-
-    rv = apr_procattr_create(&attr, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_procattr_child_in_set(attr, testfile, NULL);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_procattr_child_out_set(attr, testout, NULL);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_procattr_child_err_set(attr, testerr, NULL);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_procattr_dir_set(attr, "data");
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    args[0] = "proc_child";
-    args[1] = NULL;
-
-    rv = apr_proc_create(&newproc, "../proc_child" EXTENSION, args, NULL, 
-                         attr, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_proc_wait(&newproc, NULL, NULL, APR_WAIT);
-    CuAssertIntEquals(tc, APR_CHILD_DONE, rv);
-
-    offset = 0;
-    rv = apr_file_seek(testout, APR_SET, &offset);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    length = 256;
-    buf = apr_pcalloc(p, length);
-    rv = apr_file_read(testout, buf, &length);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, TESTSTR, buf);
-
-
-    apr_file_close(testfile);
-    apr_file_close(testout);
-    apr_file_close(testerr);
-
-    rv = apr_file_remove("data/stdin", p);;
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_file_remove("data/stdout", p);;
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_file_remove("data/stderr", p);;
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-}
-
-CuSuite *testproc(void)
-{
-    CuSuite *suite = CuSuiteNew("Process control");
-
-    SUITE_ADD_TEST(suite, test_create_proc);
-    SUITE_ADD_TEST(suite, test_proc_wait);
-    SUITE_ADD_TEST(suite, test_file_redir);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testprocmutex.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testprocmutex.c
deleted file mode 100644
index ef3a89ff..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testprocmutex.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_shm.h"
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-#include "apr_proc_mutex.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_getopt.h"
-#include "errno.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include "test_apr.h"
-
-#if APR_HAS_FORK
-
-#define MAX_ITER 200
-#define CHILDREN 6
-#define MAX_COUNTER (MAX_ITER * CHILDREN)
-
-static apr_proc_mutex_t *proc_lock;
-static volatile int *x;
-
-/* a slower more racy way to implement (*x)++ */
-static int increment(int n)
-{
-    apr_sleep(1);
-    return n+1;
-}
-
-static void make_child(CuTest *tc, apr_proc_t **proc, apr_pool_t *p)
-{
-    apr_status_t rv;
-
-    *proc = apr_pcalloc(p, sizeof(**proc));
-
-    /* slight delay to allow things to settle */
-    apr_sleep (1);
-
-    rv = apr_proc_fork(*proc, p);
-    if (rv == APR_INCHILD) {
-        int i = 0;
-        /* The parent process has setup all processes to call apr_terminate
-         * at exit.  But, that means that all processes must also call
-         * apr_initialize at startup.  You cannot have an unequal number
-         * of apr_terminate and apr_initialize calls.  If you do, bad things
-         * will happen.  In this case, the bad thing is that if the mutex
-         * is a semaphore, it will be destroyed before all of the processes
-         * die.  That means that the test will most likely fail.
-         */
-        apr_initialize();
-
-        if (apr_proc_mutex_child_init(&proc_lock, NULL, p))
-            exit(1);
-
-        do {
-            if (apr_proc_mutex_lock(proc_lock))
-                exit(1);
-            i++;
-            *x = increment(*x);
-            if (apr_proc_mutex_unlock(proc_lock))
-                exit(1);
-        } while (i < MAX_ITER);
-        exit(0);
-    } 
-
-    CuAssert(tc, "fork failed", rv == APR_INPARENT);
-}
-
-/* Wait for a child process and check it terminated with success. */
-static void await_child(CuTest *tc, apr_proc_t *proc)
-{
-    int code;
-    apr_exit_why_e why;
-    apr_status_t rv;
-
-    rv = apr_proc_wait(proc, &code, &why, APR_WAIT);
-    CuAssert(tc, "child did not terminate with success",
-             rv == APR_CHILD_DONE && why == APR_PROC_EXIT && code == 0);
-}
-
-static void test_exclusive(CuTest *tc, const char *lockname)
-{
-    apr_proc_t *child[CHILDREN];
-    apr_status_t rv;
-    int n;
- 
-    rv = apr_proc_mutex_create(&proc_lock, lockname, APR_LOCK_DEFAULT, p);
-    apr_assert_success(tc, "create the mutex", rv);
- 
-    for (n = 0; n < CHILDREN; n++)
-        make_child(tc, &child[n], p);
-
-    for (n = 0; n < CHILDREN; n++)
-        await_child(tc, child[n]);
-    
-    CuAssert(tc, "Locks don't appear to work", *x == MAX_COUNTER);
-}
-#endif
-
-static void proc_mutex(CuTest *tc)
-{
-#if APR_HAS_FORK
-    apr_status_t rv;
-    const char *shmname = "tpm.shm";
-    apr_shm_t *shm;
-
-    /* Use anonymous shm if available. */
-    rv = apr_shm_create(&shm, sizeof(int), NULL, p);
-    if (rv == APR_ENOTIMPL) {
-        apr_file_remove(shmname, p);
-        rv = apr_shm_create(&shm, sizeof(int), shmname, p);
-    }
-
-    apr_assert_success(tc, "create shm segment", rv);
-
-    x = apr_shm_baseaddr_get(shm);
-    test_exclusive(tc, NULL);
-#else
-    CuNotImpl(tc, "APR lacks fork() support");
-#endif
-}
-
-
-CuSuite *testprocmutex(void)
-{
-    CuSuite *suite = CuSuiteNew("Cross-Process Mutexes");
-
-    SUITE_ADD_TEST(suite, proc_mutex);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testrand.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testrand.c
deleted file mode 100644
index 03090ca9..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testrand.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_general.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "test_apr.h"
-
-static void rand_exists(CuTest *tc)
-{
-#if !APR_HAS_RANDOM
-    CuNotImpl(tc, "apr_generate_random_bytes");
-#else
-    unsigned char c[42];
-
-    /* There must be a better way to test random-ness, but I don't know
-     * what it is right now.
-     */
-    apr_assert_success(tc, "apr_generate_random_bytes failed",
-                       apr_generate_random_bytes(c, sizeof c));
-#endif
-}    
-
-CuSuite *testrand(void)
-{
-    CuSuite *suite = CuSuiteNew("Random");
-
-    SUITE_ADD_TEST(suite, rand_exists);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testshm.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testshm.c
deleted file mode 100644
index 01357d5b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testshm.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_shm.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_strings.h"
-#include "apr_time.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#if APR_HAS_SHARED_MEMORY
-
-typedef struct mbox {
-    char msg[1024]; 
-    int msgavail; 
-} mbox;
-mbox *boxes;
-
-#define N_BOXES 10
-#define N_MESSAGES 100
-#define SHARED_SIZE (apr_size_t)(N_BOXES * sizeof(mbox))
-#define SHARED_FILENAME "/tmp/apr.testshm.shm"
-
-static void msgwait(int sleep_sec, int first_box, int last_box)
-{
-    int i;
-    apr_time_t start = apr_time_now();
-    apr_interval_time_t sleep_duration = apr_time_from_sec(sleep_sec);
-    while (apr_time_now() - start < sleep_duration) {
-        for (i = first_box; i < last_box; i++) {
-            if (boxes[i].msgavail) {
-                fprintf(stdout, "received a message in box %d, message was: %s\n", 
-                        i, boxes[i].msg); 
-                boxes[i].msgavail = 0; /* reset back to 0 */
-            }
-        }
-        apr_sleep(apr_time_make(0, 10000)); /* 10ms */
-    }
-    fprintf(stdout, "done waiting on mailboxes...\n");
-}
-
-static void msgput(int boxnum, char *msg)
-{
-    fprintf(stdout, "Sending message to box %d\n", boxnum);
-    apr_cpystrn(boxes[boxnum].msg, msg, strlen(msg));
-    boxes[boxnum].msgavail = 1;
-}
-
-static apr_status_t test_anon(apr_pool_t *parpool)
-{
-    apr_status_t rv;
-    apr_pool_t *pool;
-    apr_shm_t *shm;
-    apr_size_t retsize;
-    pid_t pid;
-    int cnt, i, exit_int;
-
-    rv = apr_pool_create(&pool, parpool);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "Error creating child pool\n");
-        return rv;
-    }
-
-    printf("Creating anonymous shared memory block (%"
-           APR_SIZE_T_FMT " bytes)........", SHARED_SIZE); 
-    rv = apr_shm_create(&shm, SHARED_SIZE, NULL, pool);
-    if (rv != APR_SUCCESS) { 
-        fprintf(stderr, "Error allocating shared memory block\n");
-        return rv;
-    }
-    fprintf(stdout, "OK\n");
-
-    printf("Checking size...%" APR_SIZE_T_FMT " bytes...",
-            retsize = apr_shm_size_get(shm));
-    if (retsize != SHARED_SIZE) {
-        fprintf(stderr, "Error allocating shared memory block\n");
-        return rv;
-    }
-    fprintf(stdout, "OK\n");
-
-    printf("Allocating shared mbox memory for %d boxes ..............",
-           N_BOXES); 
-    boxes = apr_shm_baseaddr_get(shm);
-    if (boxes == NULL) { 
-        fprintf(stderr, "Error creating message boxes.\n");
-        return rv;
-    }
-    fprintf(stdout, "OK\n");
-
-    printf("Shared Process Test (child/parent)\n");
-    pid = fork();
-    if (pid == 0) { /* child */
-        msgwait(5, 0, N_BOXES);
-        exit(0);
-    }
-    else if (pid > 0) { /* parent */
-        i = N_BOXES;
-        cnt = N_MESSAGES;
-        while (--cnt > 0) {
-            if ((i-=3) < 0) {
-                i += N_BOXES; /* start over at the top */
-            }
-            msgput(i, "Sending a message\n");
-            apr_sleep(apr_time_make(0, 10000));
-        }
-    }
-    else {
-        printf("Error creating a child process\n");
-        return errno;
-    }
-    /* wait for the child */
-    printf("Waiting for child to exit.\n");
-    if (waitpid(pid, &exit_int, 0) < 0) {
-        return errno;
-    }
-
-    printf("Destroying shared memory segment...");
-    rv = apr_shm_destroy(shm);
-    if (rv != APR_SUCCESS) {
-        printf("FAILED\n");
-        return rv;
-    }
-    printf("OK\n");
-
-    apr_pool_destroy(pool);
-
-    return APR_SUCCESS;
-}
-
-static apr_status_t test_named(apr_pool_t *parpool)
-{
-    apr_status_t rv;
-    apr_pool_t *pool;
-    apr_shm_t *shm;
-    apr_size_t retsize;
-    pid_t pidproducer, pidconsumer;
-    int exit_int;
-
-    rv = apr_pool_create(&pool, parpool);
-    if (rv != APR_SUCCESS) {
-        fprintf(stderr, "Error creating child pool\n");
-        return rv;
-    }
-
-    printf("Creating named shared memory block (%"
-           APR_SIZE_T_FMT " bytes)........", SHARED_SIZE); 
-    rv = apr_shm_create(&shm, SHARED_SIZE, SHARED_FILENAME, pool);
-    if (rv != APR_SUCCESS) { 
-        fprintf(stderr, "Error allocating shared memory block\n");
-        return rv;
-    }
-    fprintf(stdout, "OK\n");
-
-    printf("Checking size...%" APR_SIZE_T_FMT " bytes...",
-            retsize = apr_shm_size_get(shm));
-    if (retsize != SHARED_SIZE) {
-        fprintf(stderr, "Error allocating shared memory block\n");
-        return rv;
-    }
-    fprintf(stdout, "OK\n");
-
-    printf("Allocating shared mbox memory for %d boxes ..............",
-           N_BOXES); 
-    boxes = apr_shm_baseaddr_get(shm);
-    if (boxes == NULL) { 
-        fprintf(stderr, "Error creating message boxes.\n");
-        return rv;
-    }
-    fprintf(stdout, "OK\n");
-
-    printf("fork()ing and exec()ing children:\n");
-    pidproducer = fork();
-    if (pidproducer == 0) { /* child */
-        /* FIXME: exec a producer */
-        printf("starting consumer.....\n");
-        if (execlp("testshmconsumer", "testshmconsumer", (char*)0) < 0) {
-            return errno;
-        }
-    }
-    else if (pidproducer > 0) { /* parent */
-        /* fork another child */
-        pidconsumer = fork();
-        if (pidconsumer == 0) { /* child */
-            /* FIXME: exec a producer */
-            printf("starting producer.....\n");
-            if (execlp("testshmproducer", "testshmproducer", (char*)0) < 0) {
-                return errno;
-            }
-        }
-        else if (pidconsumer < 0) { /* parent */
-            printf("Error creating a child process\n");
-            return errno;
-        }
-    }
-    else {
-        printf("Error creating a child process\n");
-        return errno;
-    }
-    /* wait for the child */
-    printf("Waiting for producer to exit.\n");
-    if (waitpid(pidconsumer, &exit_int, 0) < 0) {
-        return errno;
-    }
-    if (!WIFEXITED(exit_int)) {
-        printf("Producer was unsuccessful.\n");
-        return APR_EGENERAL;
-    }
-    printf("Waiting for consumer to exit.\n");
-    if (waitpid(pidproducer, &exit_int, 0) < 0) {
-        return errno;
-    }
-    if (!WIFEXITED(exit_int)) {
-        printf("Consumer was unsuccessful.\n");
-        return APR_EGENERAL;
-    }
-
-    printf("Destroying shared memory segment...");
-    rv = apr_shm_destroy(shm);
-    if (rv != APR_SUCCESS) {
-        printf("FAILED\n");
-        return rv;
-    }
-    printf("OK\n");
-
-    apr_pool_destroy(pool);
-
-    return APR_SUCCESS;
-}
-
-int main(void)
-{
-    apr_status_t rv;
-    apr_pool_t *pool;
-    char errmsg[200];
-
-    apr_initialize();
-    
-    printf("APR Shared Memory Test\n");
-    printf("======================\n\n");
-
-    printf("Initializing the pool............................"); 
-    if (apr_pool_create(&pool, NULL) != APR_SUCCESS) {
-        printf("could not initialize pool\n");
-        exit(-1);
-    }
-    printf("OK\n");
-
-    rv = test_anon(pool);
-    if (rv != APR_SUCCESS) {
-        if (rv == APR_ENOTIMPL) {
-            printf("Anonymous shared memory unavailable on this platform.\n");
-        }
-        else {
-            printf("Anonymous shared memory test FAILED: [%d] %s\n",
-                   rv, apr_strerror(rv, errmsg, sizeof(errmsg)));
-            exit(-2);
-        }
-    }
-    printf("Anonymous shared memory test passed!\n");
-
-    if ((rv = test_named(pool)) != APR_SUCCESS) {
-        printf("Name-based shared memory test FAILED: [%d] %s \n",
-               rv, apr_strerror(rv, errmsg, sizeof(errmsg)));
-        exit(-3);
-    }
-    printf("Named shared memory test passed!\n");
-
-    return 0;
-}
-
-#else /* APR_HAS_SHARED_MEMORY */
-#error shmem is not supported on this platform
-#endif /* APR_HAS_SHARED_MEMORY */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testshmconsumer.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testshmconsumer.c
deleted file mode 100644
index 4064cd7d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testshmconsumer.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_shm.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_strings.h"
-#include "apr_time.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#if APR_HAS_SHARED_MEMORY
-
-typedef struct mbox {
-    char msg[1024]; 
-    int msgavail; 
-} mbox;
-mbox *boxes;
-
-#define N_BOXES 10
-#define SHARED_SIZE (apr_size_t)(N_BOXES * sizeof(mbox))
-#define SHARED_FILENAME "/tmp/apr.testshm.shm"
-
-static void msgwait(int sleep_sec, int first_box, int last_box)
-{
-    int i;
-    apr_time_t start = apr_time_now();
-    apr_interval_time_t sleep_duration = apr_time_from_sec(sleep_sec);
-    while (apr_time_now() - start < sleep_duration) {
-        for (i = first_box; i < last_box; i++) {
-            if (boxes[i].msgavail) {
-                fprintf(stdout, "Consumer: received a message in box %d, message was: %s\n", 
-                        i, boxes[i].msg); 
-                boxes[i].msgavail = 0; /* reset back to 0 */
-            }
-        }
-        apr_sleep(apr_time_from_sec(1));
-    }
-    fprintf(stdout, "Consumer: done waiting on mailboxes...\n");
-}
-
-int main(void)
-{
-    apr_status_t rv;
-    apr_pool_t *pool;
-    apr_shm_t *shm;
-    char errmsg[200];
-
-    apr_initialize();
-    
-    printf("APR Shared Memory Test: CONSUMER\n");
-
-    printf("Initializing the pool............................"); 
-    if (apr_pool_create(&pool, NULL) != APR_SUCCESS) {
-        printf("could not initialize pool\n");
-        exit(-1);
-    }
-    printf("OK\n");
-
-    printf("Consumer attaching to name-based shared memory....");
-    rv = apr_shm_attach(&shm, SHARED_FILENAME, pool);
-    if (rv != APR_SUCCESS) {
-        printf("Consumer unable to attach to name-based shared memory "
-               "segment: [%d] %s \n", rv,
-               apr_strerror(rv, errmsg, sizeof(errmsg)));
-        exit(-2);
-    }
-    printf("OK\n");
-
-    boxes = apr_shm_baseaddr_get(shm);
-
-    /* consume messages on all of the boxes */
-    msgwait(30, 0, N_BOXES); /* wait for 30 seconds for messages */
-
-    printf("Consumer detaching from name-based shared memory....");
-    rv = apr_shm_detach(shm);
-    if (rv != APR_SUCCESS) {
-        printf("Consumer unable to detach from name-based shared memory "
-               "segment: [%d] %s \n", rv,
-               apr_strerror(rv, errmsg, sizeof(errmsg)));
-        exit(-3);
-    }
-    printf("OK\n");
-
-    return 0;
-}
-
-#else /* APR_HAS_SHARED_MEMORY */
-
-int main(void)
-{
-    printf("APR SHMEM test not run!\n");
-    printf("shmem is not supported on this platform\n"); 
-    return -1;
-}
-
-#endif /* APR_HAS_SHARED_MEMORY */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testshmproducer.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testshmproducer.c
deleted file mode 100644
index 3589a439..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testshmproducer.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_shm.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_strings.h"
-#include "apr_time.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#if APR_HAS_SHARED_MEMORY
-
-typedef struct mbox {
-    char msg[1024]; 
-    int msgavail; 
-} mbox;
-mbox *boxes;
-
-#define N_BOXES 10
-#define SHARED_SIZE (apr_size_t)(N_BOXES * sizeof(mbox))
-#define SHARED_FILENAME "/tmp/apr.testshm.shm"
-
-static void msgput(int boxnum, char *msg)
-{
-    fprintf(stdout, "Producer: Sending message to box %d\n", boxnum);
-    apr_cpystrn(boxes[boxnum].msg, msg, strlen(msg));
-    boxes[boxnum].msgavail = 1;
-}
-
-int main(void)
-{
-    apr_status_t rv;
-    apr_pool_t *pool;
-    apr_shm_t *shm;
-    int i;
-    char errmsg[200];
-
-    apr_initialize();
-    
-    printf("APR Shared Memory Test: PRODUCER\n");
-
-    printf("Initializing the pool............................"); 
-    if (apr_pool_create(&pool, NULL) != APR_SUCCESS) {
-        printf("could not initialize pool\n");
-        exit(-1);
-    }
-    printf("OK\n");
-
-    printf("Producer attaching to name-based shared memory....");
-    rv = apr_shm_attach(&shm, SHARED_FILENAME, pool);
-    if (rv != APR_SUCCESS) {
-        printf("Producer unable to attach to name-based shared memory "
-               "segment: [%d] %s \n", rv,
-               apr_strerror(rv, errmsg, sizeof(errmsg)));
-        exit(-2);
-    }
-    printf("OK\n");
-
-    boxes = apr_shm_baseaddr_get(shm);
-
-    /* produce messages on all of the boxes, in descending order */
-    for (i = N_BOXES - 1; i > 0; i--) {
-        msgput(i, "Sending a message\n");
-        apr_sleep(apr_time_from_sec(1));
-    }
-
-    printf("Producer detaching from name-based shared memory....");
-    rv = apr_shm_detach(shm);
-    if (rv != APR_SUCCESS) {
-        printf("Producer unable to detach from name-based shared memory "
-               "segment: [%d] %s \n", rv,
-               apr_strerror(rv, errmsg, sizeof(errmsg)));
-        exit(-3);
-    }
-    printf("OK\n");
-
-    return 0;
-}
-
-#else /* APR_HAS_SHARED_MEMORY */
-
-int main(void)
-{
-    printf("APR SHMEM test not run!\n");
-    printf("shmem is not supported on this platform\n"); 
-    return -1;
-}
-
-#endif /* APR_HAS_SHARED_MEMORY */
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testsleep.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testsleep.c
deleted file mode 100644
index 8b2451f9..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testsleep.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "time.h"
-#include "apr_thread_proc.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "test_apr.h"
-
-#define SLEEP_INTERVAL 5
-
-static void sleep_one(CuTest *tc)
-{
-    time_t pretime = time(NULL);
-    time_t posttime;
-    time_t timediff;
-
-    apr_sleep(apr_time_from_sec(SLEEP_INTERVAL));
-    posttime = time(NULL);
-
-    /* normalize the timediff.  We should have slept for SLEEP_INTERVAL, so
-     * we should just subtract that out.
-     */
-    timediff = posttime - pretime - SLEEP_INTERVAL;
-    CuAssertTrue(tc, timediff >= 0);
-    CuAssertTrue(tc, timediff <= 1);
-}
-
-CuSuite *testsleep(void)
-{
-    CuSuite *suite = CuSuiteNew("Sleep");
-
-    SUITE_ADD_TEST(suite, sleep_one);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testsock.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testsock.c
deleted file mode 100644
index 79477b8a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testsock.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-#include "apr_thread_proc.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_strings.h"
-
-#define STRLEN 15
-
-static int run_basic_test(apr_pool_t *context)
-{
-    apr_procattr_t *attr1 = NULL;
-    apr_procattr_t *attr2 = NULL;
-    apr_proc_t proc1;
-    apr_proc_t proc2;
-    apr_status_t s1;
-    apr_status_t s2;
-    const char *args[2];
-
-    fprintf(stdout, "Creating children to run network tests.......\n");
-    s1 = apr_procattr_create(&attr1, context);
-    s2 = apr_procattr_create(&attr2, context);
-
-    if (s1 != APR_SUCCESS || s2 != APR_SUCCESS) {
-        fprintf(stderr, "Problem creating proc attrs\n");
-        exit(-1);
-    }
-
-    args[0] = apr_pstrdup(context, "server");
-    args[1] = NULL; 
-    s1 = apr_proc_create(&proc1, "./server", args, NULL, attr1, context);
-
-    /* Sleep for 5 seconds to ensure the server is setup before we begin */
-    apr_sleep(5000000);
-    args[0] = apr_pstrdup(context, "client");
-    s2 = apr_proc_create(&proc2, "./client", args, NULL, attr2, context);
-
-    if (s1 != APR_SUCCESS || s2 != APR_SUCCESS) {
-        fprintf(stderr, "Problem spawning new process\n");
-        exit(-1);
-    }
-
-    while ((s1 = apr_proc_wait(&proc1, NULL, NULL, APR_NOWAIT)) == APR_CHILD_NOTDONE && 
-           (s2 = apr_proc_wait(&proc2, NULL, NULL, APR_NOWAIT)) == APR_CHILD_NOTDONE) {
-        continue;
-    }
-
-    if (s1 == APR_SUCCESS) {
-        apr_proc_kill(&proc2, SIGTERM);
-        while (apr_proc_wait(&proc2, NULL, NULL, APR_WAIT) == APR_CHILD_NOTDONE);
-    }
-    else {
-        apr_proc_kill(&proc1, SIGTERM);
-        while (apr_proc_wait(&proc1, NULL, NULL, APR_WAIT) == APR_CHILD_NOTDONE);
-    }
-    fprintf(stdout, "Network test completed.\n");   
-
-    return 1;
-}
-
-static int run_sendfile(apr_pool_t *context, int number)
-{
-    apr_procattr_t *attr1 = NULL;
-    apr_procattr_t *attr2 = NULL;
-    apr_proc_t proc1;
-    apr_proc_t proc2;
-    apr_status_t s1;
-    apr_status_t s2;
-    const char *args[4];
-
-    fprintf(stdout, "Creating children to run network tests.......\n");
-    s1 = apr_procattr_create(&attr1, context);
-    s2 = apr_procattr_create(&attr2, context);
-
-    if (s1 != APR_SUCCESS || s2 != APR_SUCCESS) {
-        fprintf(stderr, "Problem creating proc attrs\n");
-        exit(-1);
-    }
-
-    args[0] = apr_pstrdup(context, "sendfile");
-    args[1] = apr_pstrdup(context, "server");
-    args[2] = NULL; 
-    s1 = apr_proc_create(&proc1, "./sendfile", args, NULL, attr1, context);
-
-    /* Sleep for 5 seconds to ensure the server is setup before we begin */
-    apr_sleep(5000000);
-    args[1] = apr_pstrdup(context, "client");
-    switch (number) {
-        case 0: {
-            args[2] = apr_pstrdup(context, "blocking");
-            break;
-        }
-        case 1: {
-            args[2] = apr_pstrdup(context, "nonblocking");
-            break;
-        }
-        case 2: {
-            args[2] = apr_pstrdup(context, "timeout");
-            break;
-        }
-    }
-    args[3] = NULL;
-    s2 = apr_proc_create(&proc2, "./sendfile", args, NULL, attr2, context);
-
-    if (s1 != APR_SUCCESS || s2 != APR_SUCCESS) {
-        fprintf(stderr, "Problem spawning new process\n");
-        exit(-1);
-    }
-
-    while ((s1 = apr_proc_wait(&proc1, NULL, NULL, APR_NOWAIT)) == APR_CHILD_NOTDONE && 
-           (s2 = apr_proc_wait(&proc2, NULL, NULL, APR_NOWAIT)) == APR_CHILD_NOTDONE) {
-        continue;
-    }
-
-    if (s1 == APR_SUCCESS) {
-        apr_proc_kill(&proc2, SIGTERM);
-        while (apr_proc_wait(&proc2, NULL, NULL, APR_WAIT) == APR_CHILD_NOTDONE);
-    }
-    else {
-        apr_proc_kill(&proc1, SIGTERM);
-        while (apr_proc_wait(&proc1, NULL, NULL, APR_WAIT) == APR_CHILD_NOTDONE);
-    }
-    fprintf(stdout, "Network test completed.\n");   
-
-    return 1;
-}
-
-int main(int argc, char *argv[])
-{
-    apr_pool_t *context = NULL;
-
-    fprintf(stdout, "Initializing.........");
-    if (apr_initialize() != APR_SUCCESS) {
-        fprintf(stderr, "Something went wrong\n");
-        exit(-1);
-    }
-    fprintf(stdout, "OK\n");
-    atexit(apr_terminate);
-
-    fprintf(stdout, "Creating context.......");
-    if (apr_pool_create(&context, NULL) != APR_SUCCESS) {
-        fprintf(stderr, "Could not create context\n");
-        exit(-1);
-    }
-    fprintf(stdout, "OK\n");
-
-    fprintf(stdout, "This test relies on the process test working.  Please\n");
-    fprintf(stdout, "run that test first, and only run this test when it\n");
-    fprintf(stdout, "completes successfully.  Alternatively, you could run\n");
-    fprintf(stdout, "server and client by yourself.\n");
-    run_basic_test(context);
-    run_sendfile(context, 0);
-    run_sendfile(context, 1);
-    run_sendfile(context, 2);
-
-    return 0;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testsockets.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testsockets.c
deleted file mode 100644
index a03327a8..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testsockets.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_network_io.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "test_apr.h"
-
-#if APR_HAVE_IPV6
-#define US "::1"
-#define FAMILY APR_INET6
-#else
-#define US "127.0.0.1"
-#define FAMILY APR_INET
-#endif
-
-#define STRLEN 21
-
-static void tcp_socket(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_socket_t *sock = NULL;
-
-    rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, sock);
-    apr_socket_close(sock);
-}
-
-static void udp_socket(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_socket_t *sock = NULL;
-
-    rv = apr_socket_create(&sock, APR_INET, SOCK_DGRAM, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, sock);
-    apr_socket_close(sock);
-}
-
-static void tcp6_socket(CuTest *tc)
-{
-#if APR_HAVE_IPV6
-    apr_status_t rv;
-    apr_socket_t *sock = NULL;
-
-    rv = apr_socket_create(&sock, APR_INET6, SOCK_STREAM, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, sock);
-    apr_socket_close(sock);
-#else
-    CuNotImpl(tc, "IPv6");
-#endif
-}
-
-static void udp6_socket(CuTest *tc)
-{
-#if APR_HAVE_IPV6
-    apr_status_t rv;
-    apr_socket_t *sock = NULL;
-
-    rv = apr_socket_create(&sock, APR_INET6, SOCK_DGRAM, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, sock);
-    apr_socket_close(sock);
-#else
-    CuNotImpl(tc, "IPv6");
-#endif
-}
-
-static void sendto_receivefrom(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_socket_t *sock = NULL;
-    apr_socket_t *sock2 = NULL;
-    char sendbuf[STRLEN] = "APR_INET, SOCK_DGRAM";
-    char recvbuf[80];
-    char *ip_addr;
-    apr_port_t fromport;
-    apr_sockaddr_t *from;
-    apr_sockaddr_t *to;
-    apr_size_t len = 30;
-
-    rv = apr_socket_create(&sock, FAMILY, SOCK_DGRAM, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_socket_create(&sock2, FAMILY, SOCK_DGRAM, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_sockaddr_info_get(&to, US, APR_UNSPEC, 7772, 0, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_sockaddr_info_get(&from, US, APR_UNSPEC, 7771, 0, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_socket_bind(sock, to);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_socket_bind(sock2, from);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    len = STRLEN;
-    rv = apr_socket_sendto(sock2, to, 0, sendbuf, &len);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, STRLEN, len);
-
-    len = 80;
-    rv = apr_socket_recvfrom(from, sock, 0, recvbuf, &len);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, STRLEN, len);
-    CuAssertStrEquals(tc, "APR_INET, SOCK_DGRAM", recvbuf);
-
-    apr_sockaddr_ip_get(&ip_addr, from);
-    apr_sockaddr_port_get(&fromport, from);
-    CuAssertStrEquals(tc, US, ip_addr);
-    CuAssertIntEquals(tc, 7771, fromport);
-
-    apr_socket_close(sock);
-    apr_socket_close(sock2);
-}
-
-static void socket_userdata(CuTest *tc)
-{
-    apr_socket_t *sock1, *sock2;
-    apr_status_t rv;
-    char *data;
-    const char *key = "GENERICKEY";
-
-    rv = apr_socket_create(&sock1, AF_INET, SOCK_STREAM, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_socket_create(&sock2, AF_INET, SOCK_STREAM, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_socket_data_set(sock1, "SOCK1", key, NULL);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_socket_data_set(sock2, "SOCK2", key, NULL);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_socket_data_get((void **)&data, key, sock1);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, "SOCK1", data);
-    rv = apr_socket_data_get((void **)&data, key, sock2);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertStrEquals(tc, "SOCK2", data);
-}
-
-CuSuite *testsockets(void)
-{
-    CuSuite *suite = CuSuiteNew("Socket Creation");
-
-    SUITE_ADD_TEST(suite, tcp_socket);
-    SUITE_ADD_TEST(suite, udp_socket);
-
-    SUITE_ADD_TEST(suite, tcp6_socket);
-    SUITE_ADD_TEST(suite, udp6_socket);
-
-    SUITE_ADD_TEST(suite, sendto_receivefrom);
-
-    SUITE_ADD_TEST(suite, socket_userdata);
-    
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testsockopt.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testsockopt.c
deleted file mode 100644
index 40cce1f6..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testsockopt.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_network_io.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "test_apr.h"
-
-static apr_socket_t *sock = NULL;
-
-static void create_socket(CuTest *tc)
-{
-    apr_status_t rv;
-
-    rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, sock);
-}
-
-static void set_keepalive(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_int32_t ck;
-
-    rv = apr_socket_opt_set(sock, APR_SO_KEEPALIVE, 1);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_socket_opt_get(sock, APR_SO_KEEPALIVE, &ck);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, 1, ck);
-}
-
-static void set_debug(CuTest *tc)
-{
-    apr_status_t rv1, rv2;
-    apr_int32_t ck;
-    
-    /* On some platforms APR_SO_DEBUG can only be set as root; just test
-     * for get/set consistency of this option. */
-    rv1 = apr_socket_opt_set(sock, APR_SO_DEBUG, 1);
-    rv2 = apr_socket_opt_get(sock, APR_SO_DEBUG, &ck);
-    apr_assert_success(tc, "get SO_DEBUG option", rv2);
-    if (APR_STATUS_IS_SUCCESS(rv1)) {
-        CuAssertIntEquals(tc, 1, ck);
-    } else {
-        CuAssertIntEquals(tc, 0, ck);
-    }
-}
-
-static void remove_keepalive(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_int32_t ck;
-
-    rv = apr_socket_opt_get(sock, APR_SO_KEEPALIVE, &ck);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, 1, ck);
-
-    rv = apr_socket_opt_set(sock, APR_SO_KEEPALIVE, 0);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_socket_opt_get(sock, APR_SO_KEEPALIVE, &ck);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, 0, ck);
-}
-
-static void corkable(CuTest *tc)
-{
-#if !APR_HAVE_CORKABLE_TCP
-    CuNotImpl(tc, "TCP isn't corkable");
-#else
-    apr_status_t rv;
-    apr_int32_t ck;
-
-    rv = apr_socket_opt_set(sock, APR_TCP_NODELAY, 1);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_socket_opt_get(sock, APR_TCP_NODELAY, &ck);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, 1, ck);
-
-    rv = apr_socket_opt_set(sock, APR_TCP_NOPUSH, 1);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_socket_opt_get(sock, APR_TCP_NOPUSH, &ck);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, 1, ck);
-
-    rv = apr_socket_opt_get(sock, APR_TCP_NODELAY, &ck);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, 0, ck);
-
-    rv = apr_socket_opt_set(sock, APR_TCP_NOPUSH, 0);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    
-    rv = apr_socket_opt_get(sock, APR_TCP_NODELAY, &ck);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertIntEquals(tc, 1, ck);
-#endif
-}
-
-static void close_socket(CuTest *tc)
-{
-    apr_status_t rv;
-
-    rv = apr_socket_close(sock);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-}
-
-CuSuite *testsockopt(void)
-{
-    CuSuite *suite = CuSuiteNew("Socket Options");
-
-    SUITE_ADD_TEST(suite, create_socket);
-    SUITE_ADD_TEST(suite, set_keepalive);
-    SUITE_ADD_TEST(suite, set_debug);
-    SUITE_ADD_TEST(suite, remove_keepalive);
-    SUITE_ADD_TEST(suite, corkable);
-    SUITE_ADD_TEST(suite, close_socket);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/teststr.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/teststr.c
deleted file mode 100644
index b23251d1..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/teststr.c
+++ /dev/null
@@ -1,307 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "test_apr.h"
-
-#include <assert.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "apr_general.h"
-#include "apr_strings.h"
-#include "apr_errno.h"
-
-/* I haven't bothered to check for APR_ENOTIMPL here, AFAIK, all string
- * functions exist on all platforms.
- */
-
-static void test_strtok(CuTest *tc)
-{
-    struct {
-        char *input;
-        char *sep;
-    }
-    cases[] = {
-        {
-            "",
-            "Z"
-        },
-        {
-            "      asdf jkl; 77889909            \r\n\1\2\3Z",
-            " \r\n\3\2\1"
-        },
-        {
-            NULL,  /* but who cares if apr_strtok() segfaults? */
-            " \t"
-        },
-#if 0     /* don't do this... you deserve to segfault */
-        {
-            "a b c              ",
-            NULL
-        },
-#endif
-        {
-            "   a       b        c   ",
-            ""
-        },
-        {
-            "a              b c         ",
-            " "
-        }
-    };
-    int curtc;
-
-    for (curtc = 0; curtc < sizeof cases / sizeof cases[0]; curtc++) {
-        char *retval1, *retval2;
-        char *str1, *str2;
-        char *state;
-
-        str1 = apr_pstrdup(p, cases[curtc].input);
-        str2 = apr_pstrdup(p, cases[curtc].input);
-
-        do {
-            retval1 = apr_strtok(str1, cases[curtc].sep, &state);
-            retval2 = strtok(str2, cases[curtc].sep);
-
-            if (!retval1) {
-                CuAssertTrue(tc, retval2 == NULL);
-            }
-            else {
-                CuAssertTrue(tc, retval2 != NULL);
-                CuAssertStrEquals(tc, retval2, retval1);
-            }
-
-            str1 = str2 = NULL; /* make sure we pass NULL on subsequent calls */
-        } while (retval1);
-    }
-}
-
-static void snprintf_noNULL(CuTest *tc)
-{
-    char buff[100];
-    char *testing = apr_palloc(p, 10);
-
-    testing[0] = 't';
-    testing[1] = 'e';
-    testing[2] = 's';
-    testing[3] = 't';
-    testing[4] = 'i';
-    testing[5] = 'n';
-    testing[6] = 'g';
-    
-    /* If this test fails, we are going to seg fault. */
-    apr_snprintf(buff, sizeof(buff), "%.*s", 7, testing);
-    CuAssertStrNEquals(tc, buff, testing, 7);
-}
-
-static void snprintf_0NULL(CuTest *tc)
-{
-    int rv;
-
-    rv = apr_snprintf(NULL, 0, "%sBAR", "FOO");
-    CuAssertIntEquals(tc, 6, rv);
-}
-
-static void snprintf_0nonNULL(CuTest *tc)
-{
-    int rv;
-    char *buff = "testing";
-
-    rv = apr_snprintf(buff, 0, "%sBAR", "FOO");
-    CuAssertIntEquals(tc, 6, rv);
-    CuAssert(tc, "buff unmangled", strcmp(buff, "FOOBAR") != 0);
-}
-
-static void snprintf_int64(CuTest *tc)
-{
-    char buf[100];
-    apr_int64_t i = APR_INT64_C(-42);
-    apr_uint64_t ui = APR_INT64_C(42); /* no APR_UINT64_C */
-    apr_uint64_t big = APR_INT64_C(3141592653589793238);
-
-    apr_snprintf(buf, sizeof buf, "%" APR_INT64_T_FMT, i);
-    CuAssertStrEquals(tc, buf, "-42");
-
-    apr_snprintf(buf, sizeof buf, "%" APR_UINT64_T_FMT, ui);
-    CuAssertStrEquals(tc, buf, "42");
-
-    apr_snprintf(buf, sizeof buf, "%" APR_UINT64_T_FMT, big);
-    CuAssertStrEquals(tc, buf, "3141592653589793238");
-}
-
-static void snprintf_underflow(CuTest *tc)
-{
-    char buf[20];
-    int rv;
-
-    rv = apr_snprintf(buf, sizeof buf, "%.2f", (double)0.0001);
-    CuAssertIntEquals(tc, 4, rv);
-    CuAssertStrEquals(tc, "0.00", buf);
-    
-    rv = apr_snprintf(buf, sizeof buf, "%.2f", (double)0.001);
-    CuAssertIntEquals(tc, 4, rv);
-    CuAssertStrEquals(tc, "0.00", buf);
-    
-    rv = apr_snprintf(buf, sizeof buf, "%.2f", (double)0.01);
-    CuAssertIntEquals(tc, 4, rv);
-    CuAssertStrEquals(tc, "0.01", buf);
-}
-
-static void string_error(CuTest *tc)
-{
-     char buf[128], *rv;
-     apr_status_t n;
-
-     buf[0] = '\0';
-     rv = apr_strerror(APR_ENOENT, buf, sizeof buf);
-     CuAssertPtrEquals(tc, buf, rv);
-     CuAssertTrue(tc, strlen(buf) > 0);
-
-     rv = apr_strerror(APR_TIMEUP, buf, sizeof buf);
-     CuAssertPtrEquals(tc, buf, rv);
-     CuAssertStrEquals(tc, "The timeout specified has expired", buf);
-     
-     /* throw some randomish numbers at it to check for robustness */
-     for (n = 1; n < 1000000; n *= 2) {
-         apr_strerror(n, buf, sizeof buf);
-     }
-}
-
-#define SIZE 180000
-static void string_long(CuTest *tc)
-{
-    char s[SIZE + 1];
-
-    memset(s, 'A', SIZE);
-    s[SIZE] = '\0';
-
-    apr_psprintf(p, "%s", s);
-}
-
-/* ### FIXME: apr.h/apr_strings.h should provide these! */
-#define MY_LLONG_MAX (APR_INT64_C(9223372036854775807))
-#define MY_LLONG_MIN (-MY_LLONG_MAX - APR_INT64_C(1))
-
-static void string_strtoi64(CuTest *tc)
-{
-    static const struct {
-        int errnum, base;
-        const char *in, *end;
-        apr_int64_t result;
-    } ts[] = {
-        
-        /* base 10 tests */
-        { 0, 10, "123545", NULL, APR_INT64_C(123545) },
-        { 0, 10, "   123545", NULL, APR_INT64_C(123545) },
-        { 0, 10, "   +123545", NULL, APR_INT64_C(123545) },
-        { 0, 10, "-123545", NULL, APR_INT64_C(-123545) },
-        { 0, 10, "   00000123545", NULL, APR_INT64_C(123545) },
-        { 0, 10, "123545ZZZ", "ZZZ", APR_INT64_C(123545) },
-        { 0, 10, "   123545   ", "   ", APR_INT64_C(123545) },
-
-        /* base 16 tests */
-        { 0, 16, "1E299", NULL, APR_INT64_C(123545) },
-        { 0, 16, "1e299", NULL, APR_INT64_C(123545) },
-        { 0, 16, "0x1e299", NULL, APR_INT64_C(123545) },
-        { 0, 16, "0X1E299", NULL, APR_INT64_C(123545) },
-        { 0, 16, "+1e299", NULL, APR_INT64_C(123545) },
-        { 0, 16, "-1e299", NULL, APR_INT64_C(-123545) },
-        { 0, 16, "   -1e299", NULL, APR_INT64_C(-123545) },
-
-        /* automatic base detection tests */
-        { 0, 0, "123545", NULL, APR_INT64_C(123545) },
-        { 0, 0, "0x1e299", NULL, APR_INT64_C(123545) },
-        { 0, 0, "  0x1e299", NULL, APR_INT64_C(123545) },
-        { 0, 0, "+0x1e299", NULL, APR_INT64_C(123545) },
-        { 0, 0, "-0x1e299", NULL, APR_INT64_C(-123545) },
-
-        /* large number tests */
-        { 0, 10, "8589934605", NULL, APR_INT64_C(8589934605) },
-        { 0, 10, "-8589934605", NULL, APR_INT64_C(-8589934605) },
-        { 0, 16, "0x20000000D", NULL, APR_INT64_C(8589934605) },
-        { 0, 16, "-0x20000000D", NULL, APR_INT64_C(-8589934605) },
-        { 0, 16, "   0x20000000D", NULL, APR_INT64_C(8589934605) },
-        { 0, 16, "   0x20000000D", NULL, APR_INT64_C(8589934605) },
-
-        /* error cases */
-        { ERANGE, 10, "999999999999999999999999999999999", "", MY_LLONG_MAX },
-        { ERANGE, 10, "-999999999999999999999999999999999", "", MY_LLONG_MIN },
-
-#if 0
-        /* C99 doesn't require EINVAL for an invalid range. */
-        { EINVAL, 99, "", (void *)-1 /* don't care */, 0 },
-#endif
-
-        /* some strtoll implementations give EINVAL when no conversion
-         * is performed. */
-        { -1 /* don't care */, 10, "zzz", "zzz", APR_INT64_C(0) },
-        { -1 /* don't care */, 10, "", NULL, APR_INT64_C(0) }
-
-    };
-    int n;
-
-    for (n = 0; n < sizeof(ts)/sizeof(ts[0]); n++) {
-        char *end = "end ptr not changed";
-        apr_int64_t result;
-        int errnum;
-        
-        errno = 0;
-        result = apr_strtoi64(ts[n].in, &end, ts[n].base);
-        errnum = errno;
-
-        CuAssert(tc,
-                 apr_psprintf(p, "for '%s': result was %" APR_INT64_T_FMT 
-                              " not %" APR_INT64_T_FMT, ts[n].in,
-                              result, ts[n].result),
-                 result == ts[n].result);
-        
-        if (ts[n].errnum != -1) {
-            CuAssert(tc,
-                     apr_psprintf(p, "for '%s': errno was %d not %d", ts[n].in,
-                                  errnum, ts[n].errnum),
-                     ts[n].errnum == errnum);
-        }
-
-        if (ts[n].end == NULL) {
-            /* end must point to NUL terminator of .in */
-            CuAssertPtrEquals(tc, ts[n].in + strlen(ts[n].in), end);
-        } else if (ts[n].end != (void *)-1) {
-            CuAssert(tc,
-                     apr_psprintf(p, "for '%s', end was '%s' not '%s'",
-                                  ts[n].in, end, ts[n].end),
-                     strcmp(ts[n].end, end) == 0);
-        }
-    }
-}
-
-CuSuite *teststr(void)
-{
-    CuSuite *suite = CuSuiteNew("Strings");
-
-    SUITE_ADD_TEST(suite, snprintf_0NULL);
-    SUITE_ADD_TEST(suite, snprintf_0nonNULL);
-    SUITE_ADD_TEST(suite, snprintf_noNULL);
-    SUITE_ADD_TEST(suite, snprintf_int64);
-    SUITE_ADD_TEST(suite, snprintf_underflow);
-    SUITE_ADD_TEST(suite, test_strtok);
-    SUITE_ADD_TEST(suite, string_error);
-    SUITE_ADD_TEST(suite, string_long);
-    SUITE_ADD_TEST(suite, string_strtoi64);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testtable.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testtable.c
deleted file mode 100644
index 60123db0..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testtable.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "test_apr.h"
-#include "apr.h"
-#include "apr_strings.h"
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_tables.h"
-#if APR_HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if APR_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#if APR_HAVE_STRING_H
-#include <string.h>
-#endif
-
-static apr_table_t *t1 = NULL;
-
-static void table_make(CuTest *tc)
-{
-    t1 = apr_table_make(p, 5);
-    CuAssertPtrNotNull(tc, t1);
-}
-
-static void table_get(CuTest *tc)
-{
-    const char *val;
-
-    apr_table_set(t1, "foo", "bar");
-    val = apr_table_get(t1, "foo");
-    CuAssertStrEquals(tc, val, "bar");
-}
-
-static void table_set(CuTest *tc)
-{
-    const char *val;
-
-    apr_table_set(t1, "setkey", "bar");
-    apr_table_set(t1, "setkey", "2ndtry");
-    val = apr_table_get(t1, "setkey");
-    CuAssertStrEquals(tc, val, "2ndtry");
-}
-
-static void table_getnotthere(CuTest *tc)
-{
-    const char *val;
-
-    val = apr_table_get(t1, "keynotthere");
-    CuAssertPtrEquals(tc, NULL, (void *)val);
-}
-
-static void table_add(CuTest *tc)
-{
-    const char *val;
-
-    apr_table_add(t1, "addkey", "bar");
-    apr_table_add(t1, "addkey", "foo");
-    val = apr_table_get(t1, "addkey");
-    CuAssertStrEquals(tc, val, "bar");
-
-}
-
-static void table_nelts(CuTest *tc)
-{
-    const char *val;
-    apr_table_t *t = apr_table_make(p, 1);
-
-    apr_table_set(t, "abc", "def");
-    apr_table_set(t, "def", "abc");
-    apr_table_set(t, "foo", "zzz");
-    val = apr_table_get(t, "foo");
-    CuAssertStrEquals(tc, val, "zzz");
-    val = apr_table_get(t, "abc");
-    CuAssertStrEquals(tc, val, "def");
-    val = apr_table_get(t, "def");
-    CuAssertStrEquals(tc, val, "abc");
-    CuAssertIntEquals(tc, 3, apr_table_elts(t)->nelts);
-}
-
-static void table_clear(CuTest *tc)
-{
-    apr_table_clear(t1);
-    CuAssertIntEquals(tc, 0, apr_table_elts(t1)->nelts);
-}
-
-static void table_unset(CuTest *tc)
-{
-    const char *val;
-    apr_table_t *t = apr_table_make(p, 1);
-
-    apr_table_set(t, "a", "1");
-    apr_table_set(t, "b", "2");
-    apr_table_unset(t, "b");
-    CuAssertIntEquals(tc, 1, apr_table_elts(t)->nelts);
-    val = apr_table_get(t, "a");
-    CuAssertStrEquals(tc, val, "1");
-    val = apr_table_get(t, "b");
-    CuAssertPtrEquals(tc, (void *)val, (void *)NULL);
-}
-
-static void table_overlap(CuTest *tc)
-{
-    const char *val;
-    apr_table_t *t1 = apr_table_make(p, 1);
-    apr_table_t *t2 = apr_table_make(p, 1);
-
-    apr_table_addn(t1, "a", "0");
-    apr_table_addn(t1, "g", "7");
-    apr_table_addn(t2, "a", "1");
-    apr_table_addn(t2, "b", "2");
-    apr_table_addn(t2, "c", "3");
-    apr_table_addn(t2, "b", "2.0");
-    apr_table_addn(t2, "d", "4");
-    apr_table_addn(t2, "e", "5");
-    apr_table_addn(t2, "b", "2.");
-    apr_table_addn(t2, "f", "6");
-    apr_table_overlap(t1, t2, APR_OVERLAP_TABLES_SET);
-    
-    CuAssertIntEquals(tc, apr_table_elts(t1)->nelts, 7);
-    val = apr_table_get(t1, "a");
-    CuAssertStrEquals(tc, val, "1");
-    val = apr_table_get(t1, "b");
-    CuAssertStrEquals(tc, val, "2.");
-    val = apr_table_get(t1, "c");
-    CuAssertStrEquals(tc, val, "3");
-    val = apr_table_get(t1, "d");
-    CuAssertStrEquals(tc, val, "4");
-    val = apr_table_get(t1, "e");
-    CuAssertStrEquals(tc, val, "5");
-    val = apr_table_get(t1, "f");
-    CuAssertStrEquals(tc, val, "6");
-    val = apr_table_get(t1, "g");
-    CuAssertStrEquals(tc, val, "7");
-}
-
-CuSuite *testtable(void)
-{
-    CuSuite *suite = CuSuiteNew("Table");
-
-    SUITE_ADD_TEST(suite, table_make);
-    SUITE_ADD_TEST(suite, table_get);
-    SUITE_ADD_TEST(suite, table_set);
-    SUITE_ADD_TEST(suite, table_getnotthere);
-    SUITE_ADD_TEST(suite, table_add);
-    SUITE_ADD_TEST(suite, table_nelts);
-    SUITE_ADD_TEST(suite, table_clear);
-    SUITE_ADD_TEST(suite, table_unset);
-    SUITE_ADD_TEST(suite, table_overlap);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testthread.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testthread.c
deleted file mode 100644
index d1d0de22..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testthread.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_thread_proc.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "errno.h"
-#include "apr_time.h"
-#include "test_apr.h"
-
-#if APR_HAS_THREADS
-
-static apr_thread_mutex_t *thread_lock;
-static apr_thread_once_t *control = NULL;
-static int x = 0;
-static int value = 0;
-
-static apr_thread_t *t1;
-static apr_thread_t *t2;
-static apr_thread_t *t3;
-static apr_thread_t *t4;
-
-/* just some made up number to check on later */
-static apr_status_t exit_ret_val = 123;
-
-static void init_func(void)
-{
-    value++;
-}
-
-static void * APR_THREAD_FUNC thread_func1(apr_thread_t *thd, void *data)
-{
-    int i;
-
-    apr_thread_once(control, init_func);
-
-    for (i = 0; i < 10000; i++) {
-        apr_thread_mutex_lock(thread_lock);
-        x++;
-        apr_thread_mutex_unlock(thread_lock);
-    }
-    apr_thread_exit(thd, exit_ret_val);
-    return NULL;
-} 
-
-static void thread_init(CuTest *tc)
-{
-    apr_status_t rv;
-
-    rv = apr_thread_once_init(&control, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_thread_mutex_create(&thread_lock, APR_THREAD_MUTEX_DEFAULT, p); 
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-}
-
-static void create_threads(CuTest *tc)
-{
-    apr_status_t rv;
-
-    rv = apr_thread_create(&t1, NULL, thread_func1, NULL, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_thread_create(&t2, NULL, thread_func1, NULL, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_thread_create(&t3, NULL, thread_func1, NULL, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    rv = apr_thread_create(&t4, NULL, thread_func1, NULL, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-}
-
-static void join_threads(CuTest *tc)
-{
-    apr_status_t s;
-
-    apr_thread_join(&s, t1);
-    CuAssertIntEquals(tc, exit_ret_val, s);
-    apr_thread_join(&s, t2);
-    CuAssertIntEquals(tc, exit_ret_val, s);
-    apr_thread_join(&s, t3);
-    CuAssertIntEquals(tc, exit_ret_val, s);
-    apr_thread_join(&s, t4);
-    CuAssertIntEquals(tc, exit_ret_val, s);
-}
-
-static void check_locks(CuTest *tc)
-{
-    CuAssertIntEquals(tc, 40000, x);
-}
-
-static void check_thread_once(CuTest *tc)
-{
-    CuAssertIntEquals(tc, 1, value);
-}
-
-#else
-
-static void threads_not_impl(CuTest *tc)
-{
-    CuNotImpl(tc, "Threads not implemented on this platform");
-}
-
-#endif
-
-CuSuite *testthread(void)
-{
-    CuSuite *suite = CuSuiteNew("Threads");
-
-#if !APR_HAS_THREADS
-    SUITE_ADD_TEST(suite, threads_not_impl);
-#else
-    SUITE_ADD_TEST(suite, thread_init);
-    SUITE_ADD_TEST(suite, create_threads);
-    SUITE_ADD_TEST(suite, join_threads);
-    SUITE_ADD_TEST(suite, check_locks);
-    SUITE_ADD_TEST(suite, check_thread_once);
-#endif
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testtime.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testtime.c
deleted file mode 100644
index 1e3e87fa..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testtime.c
+++ /dev/null
@@ -1,305 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_time.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "test_apr.h"
-#include "apr_strings.h"
-#include <time.h>
-
-#define STR_SIZE 45
-
-/* The time value is used throughout the tests, so just make this a global.
- * Also, we need a single value that we can test for the positive tests, so
- * I chose the number below, it corresponds to:
- *           2002-08-14 12:05:36.186711 -25200 [257 Sat].
- * Which happens to be when I wrote the new tests.
- */
-static apr_time_t now = APR_INT64_C(1032030336186711);
-
-static char* print_time (apr_pool_t *pool, const apr_time_exp_t *xt)
-{
-    return apr_psprintf (pool,
-                         "%04d-%02d-%02d %02d:%02d:%02d.%06d %+05d [%d %s]%s",
-                         xt->tm_year + 1900,
-                         xt->tm_mon,
-                         xt->tm_mday,
-                         xt->tm_hour,
-                         xt->tm_min,
-                         xt->tm_sec,
-                         xt->tm_usec,
-                         xt->tm_gmtoff,
-                         xt->tm_yday + 1,
-                         apr_day_snames[xt->tm_wday],
-                         (xt->tm_isdst ? " DST" : ""));
-}
-
-
-static void test_now(CuTest *tc)
-{
-    apr_time_t timediff;
-    apr_time_t current;
-    time_t os_now;
-
-    current = apr_time_now();
-    time(&os_now);
-
-    timediff = os_now - (current / APR_USEC_PER_SEC); 
-    /* Even though these are called so close together, there is the chance
-     * that the time will be slightly off, so accept anything between -1 and
-     * 1 second.
-     */
-    CuAssert(tc, "apr_time and OS time do not agree", 
-             (timediff > -2) && (timediff < 2));
-}
-
-static void test_gmtstr(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_time_exp_t xt;
-
-    rv = apr_time_exp_gmt(&xt, now);
-    if (rv == APR_ENOTIMPL) {
-        CuNotImpl(tc, "apr_time_exp_gmt");
-    }
-    CuAssertTrue(tc, rv == APR_SUCCESS);
-    CuAssertStrEquals(tc, "2002-08-14 19:05:36.186711 +0000 [257 Sat]", 
-                      print_time(p, &xt));
-}
-
-static void test_exp_lt(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_time_exp_t xt;
-    time_t posix_secs = (time_t)apr_time_sec(now);
-    struct tm *posix_exp = localtime(&posix_secs);
-
-    rv = apr_time_exp_lt(&xt, now);
-    if (rv == APR_ENOTIMPL) {
-        CuNotImpl(tc, "apr_time_exp_lt");
-    }
-    CuAssertTrue(tc, rv == APR_SUCCESS);
-
-#define CHK_FIELD(f) \
-    CuAssert(tc, "Mismatch in " #f, posix_exp->f == xt.f)
-
-    CHK_FIELD(tm_sec);
-    CHK_FIELD(tm_min);
-    CHK_FIELD(tm_hour);
-    CHK_FIELD(tm_mday);
-    CHK_FIELD(tm_mon);
-    CHK_FIELD(tm_year);
-    CHK_FIELD(tm_wday);
-    CHK_FIELD(tm_yday);
-    CHK_FIELD(tm_isdst);
-#undef CHK_FIELD
-}
-
-static void test_exp_get_gmt(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_time_exp_t xt;
-    apr_time_t imp;
-    apr_int64_t hr_off_64;
-
-    rv = apr_time_exp_gmt(&xt, now);
-    CuAssertTrue(tc, rv == APR_SUCCESS);
-    rv = apr_time_exp_get(&imp, &xt);
-    if (rv == APR_ENOTIMPL) {
-        CuNotImpl(tc, "apr_time_exp_get");
-    }
-    CuAssertTrue(tc, rv == APR_SUCCESS);
-    hr_off_64 = (apr_int64_t) xt.tm_gmtoff * APR_USEC_PER_SEC;
-    CuAssertTrue(tc, now + hr_off_64 == imp);
-}
-
-static void test_exp_get_lt(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_time_exp_t xt;
-    apr_time_t imp;
-    apr_int64_t hr_off_64;
-
-    rv = apr_time_exp_lt(&xt, now);
-    CuAssertTrue(tc, rv == APR_SUCCESS);
-    rv = apr_time_exp_get(&imp, &xt);
-    if (rv == APR_ENOTIMPL) {
-        CuNotImpl(tc, "apr_time_exp_get");
-    }
-    CuAssertTrue(tc, rv == APR_SUCCESS);
-    hr_off_64 = (apr_int64_t) xt.tm_gmtoff * APR_USEC_PER_SEC;
-    CuAssertTrue(tc, now + hr_off_64 == imp);
-}
-
-static void test_imp_gmt(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_time_exp_t xt;
-    apr_time_t imp;
-
-    rv = apr_time_exp_gmt(&xt, now);
-    CuAssertTrue(tc, rv == APR_SUCCESS);
-    rv = apr_time_exp_gmt_get(&imp, &xt);
-    if (rv == APR_ENOTIMPL) {
-        CuNotImpl(tc, "apr_time_exp_gmt_get");
-    }
-    CuAssertTrue(tc, rv == APR_SUCCESS);
-    CuAssertTrue(tc, now == imp);
-}
-
-static void test_rfcstr(CuTest *tc)
-{
-    apr_status_t rv;
-    char str[STR_SIZE];
-
-    rv = apr_rfc822_date(str, now);
-    if (rv == APR_ENOTIMPL) {
-        CuNotImpl(tc, "apr_rfc822_date");
-    }
-    CuAssertTrue(tc, rv == APR_SUCCESS);
-    CuAssertStrEquals(tc, "Sat, 14 Sep 2002 19:05:36 GMT", str);
-}
-
-static void test_ctime(CuTest *tc)
-{
-    apr_status_t rv;
-    char apr_str[STR_SIZE];
-    char libc_str[STR_SIZE];
-    time_t posix_sec = (time_t)apr_time_sec(now);
-
-    rv = apr_ctime(apr_str, now);
-    if (rv == APR_ENOTIMPL) {
-        CuNotImpl(tc, "apr_ctime");
-    }
-    CuAssertTrue(tc, rv == APR_SUCCESS);
-    strcpy(libc_str, ctime(&posix_sec));
-    *strchr(libc_str, '\n') = '\0';
-
-    CuAssertStrEquals(tc, libc_str, apr_str);
-}
-
-static void test_strftime(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_time_exp_t xt;
-    char *str = NULL;
-    apr_size_t sz;
-
-    rv = apr_time_exp_gmt(&xt, now);
-    str = apr_palloc(p, STR_SIZE + 1);
-    rv = apr_strftime(str, &sz, STR_SIZE, "%R %A %d %B %Y", &xt);
-    if (rv == APR_ENOTIMPL) {
-        CuNotImpl(tc, "apr_strftime");
-    }
-    CuAssertTrue(tc, rv == APR_SUCCESS);
-    CuAssertStrEquals(tc, "19:05 Saturday 14 September 2002", str);
-}
-
-static void test_strftimesmall(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_time_exp_t xt;
-    char str[STR_SIZE];
-    apr_size_t sz;
-
-    rv = apr_time_exp_gmt(&xt, now);
-    rv = apr_strftime(str, &sz, STR_SIZE, "%T", &xt);
-    if (rv == APR_ENOTIMPL) {
-        CuNotImpl(tc, "apr_strftime");
-    }
-    CuAssertTrue(tc, rv == APR_SUCCESS);
-    CuAssertStrEquals(tc, "19:05:36", str);
-}
-
-static void test_exp_tz(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_time_exp_t xt;
-    apr_int32_t hr_off = -5 * 3600; /* 5 hours in seconds */
-
-    rv = apr_time_exp_tz(&xt, now, hr_off);
-    if (rv == APR_ENOTIMPL) {
-        CuNotImpl(tc, "apr_time_exp_tz");
-    }
-    CuAssertTrue(tc, rv == APR_SUCCESS);
-    CuAssertTrue(tc, (xt.tm_usec == 186711) && 
-                     (xt.tm_sec == 36) &&
-                     (xt.tm_min == 5) && 
-                     (xt.tm_hour == 14) &&
-                     (xt.tm_mday == 14) &&
-                     (xt.tm_mon == 8) &&
-                     (xt.tm_year == 102) &&
-                     (xt.tm_wday == 6) &&
-                     (xt.tm_yday == 256));
-}
-
-static void test_strftimeoffset(CuTest *tc)
-{
-    apr_status_t rv;
-    apr_time_exp_t xt;
-    char str[STR_SIZE];
-    apr_size_t sz;
-    apr_int32_t hr_off = -5 * 3600; /* 5 hours in seconds */
-
-    apr_time_exp_tz(&xt, now, hr_off);
-    rv = apr_strftime(str, &sz, STR_SIZE, "%T", &xt);
-    if (rv == APR_ENOTIMPL) {
-        CuNotImpl(tc, "apr_strftime");
-    }
-    CuAssertTrue(tc, rv == APR_SUCCESS);
-}
-
-/* 0.9.4 and earlier rejected valid dates in 2038 */
-static void test_2038(CuTest *tc)
-{
-    apr_time_exp_t xt;
-    apr_time_t t;
-
-    /* 2038-01-19T03:14:07.000000Z */
-    xt.tm_year = 138;
-    xt.tm_mon = 0;
-    xt.tm_mday = 19;
-    xt.tm_hour = 3;
-    xt.tm_min = 14;
-    xt.tm_sec = 7;
-    
-    apr_assert_success(tc, "explode January 19th, 2038",
-                       apr_time_exp_get(&t, &xt));
-}
-
-CuSuite *testtime(void)
-{
-    CuSuite *suite = CuSuiteNew("Time");
-
-    SUITE_ADD_TEST(suite, test_now);
-    SUITE_ADD_TEST(suite, test_gmtstr);
-    SUITE_ADD_TEST(suite, test_exp_lt);
-    SUITE_ADD_TEST(suite, test_exp_get_gmt);
-    SUITE_ADD_TEST(suite, test_exp_get_lt);
-    SUITE_ADD_TEST(suite, test_imp_gmt);
-    SUITE_ADD_TEST(suite, test_rfcstr);
-    SUITE_ADD_TEST(suite, test_ctime);
-    SUITE_ADD_TEST(suite, test_strftime);
-    SUITE_ADD_TEST(suite, test_strftimesmall);
-    SUITE_ADD_TEST(suite, test_exp_tz);
-    SUITE_ADD_TEST(suite, test_strftimeoffset);
-    SUITE_ADD_TEST(suite, test_2038);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testud.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testud.c
deleted file mode 100644
index 3b62cb5d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testud.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "apr_file_io.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_strings.h"
-#include "test_apr.h"
-
-static apr_pool_t *pool;
-static char *testdata;
-static int cleanup_called = 0;
-
-static apr_status_t string_cleanup(void *data)
-{
-    cleanup_called = 1;
-    return APR_SUCCESS;
-}
-
-static void set_userdata(CuTest *tc)
-{
-    apr_status_t rv;
-
-    rv = apr_pool_userdata_set(testdata, "TEST", string_cleanup, pool);
-    CuAssertIntEquals(tc, rv, APR_SUCCESS);
-}
-
-static void get_userdata(CuTest *tc)
-{
-    apr_status_t rv;
-    char *retdata;
-
-    rv = apr_pool_userdata_get((void **)&retdata, "TEST", pool);
-    CuAssertIntEquals(tc, rv, APR_SUCCESS);
-    CuAssertStrEquals(tc, retdata, testdata);
-}
-
-static void get_nonexistkey(CuTest *tc)
-{
-    apr_status_t rv;
-    char *retdata;
-
-    rv = apr_pool_userdata_get((void **)&retdata, "DOESNTEXIST", pool);
-    CuAssertIntEquals(tc, rv, APR_SUCCESS);
-    CuAssertPtrEquals(tc, retdata, NULL);
-}
-
-static void post_pool_clear(CuTest *tc)
-{
-    apr_status_t rv;
-    char *retdata;
-
-    rv = apr_pool_userdata_get((void **)&retdata, "DOESNTEXIST", pool);
-    CuAssertIntEquals(tc, rv, APR_SUCCESS);
-    CuAssertPtrEquals(tc, retdata, NULL);
-}
-
-CuSuite *testud(void)
-{
-    CuSuite *suite = CuSuiteNew("User Data");
-
-    apr_pool_create(&pool, p);
-    testdata = apr_pstrdup(pool, "This is a test\n");
-
-    SUITE_ADD_TEST(suite, set_userdata);
-    SUITE_ADD_TEST(suite, get_userdata);
-    SUITE_ADD_TEST(suite, get_nonexistkey);
-
-    apr_pool_clear(pool);
-
-    SUITE_ADD_TEST(suite, post_pool_clear);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testuser.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testuser.c
deleted file mode 100644
index 6cfeb61d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testuser.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "test_apr.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_user.h"
-
-#if APR_HAS_USER
-static void uid_current(CuTest *tc)
-{
-    apr_uid_t uid;
-    apr_gid_t gid;
-    apr_status_t rv;
-
-    rv = apr_uid_current(&uid, &gid, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-}
-
-static void username(CuTest *tc)
-{
-    apr_uid_t uid;
-    apr_gid_t gid;
-    apr_uid_t retreived_uid;
-    apr_gid_t retreived_gid;
-    apr_status_t rv;
-    char *uname = NULL;
-
-    rv = apr_uid_current(&uid, &gid, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_uid_name_get(&uname, uid, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, uname);
-
-    rv = apr_uid_get(&retreived_uid, &retreived_gid, uname, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    CuAssertIntEquals(tc, APR_SUCCESS, apr_uid_compare(uid, retreived_uid));
-#ifdef WIN32
-    /* ### this fudge was added for Win32 but makes the test return NotImpl
-     * on Unix if run as root, when !gid is also true. */
-    if (!gid || !retreived_gid) {
-        /* The function had no way to recover the gid (this would have been
-         * an ENOTIMPL if apr_uid_ functions didn't try to double-up and
-         * also return apr_gid_t values, which was bogus.
-         */
-        if (!gid) {
-            CuNotImpl(tc, "Groups from apr_uid_current");
-        }
-        else {
-            CuNotImpl(tc, "Groups from apr_uid_get");
-        }        
-    }
-    else {
-#endif
-        CuAssertIntEquals(tc, APR_SUCCESS, apr_gid_compare(gid, retreived_gid));
-#ifdef WIN32
-    }
-#endif
-}
-
-static void groupname(CuTest *tc)
-{
-    apr_uid_t uid;
-    apr_gid_t gid;
-    apr_gid_t retreived_gid;
-    apr_status_t rv;
-    char *gname = NULL;
-
-    rv = apr_uid_current(&uid, &gid, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    rv = apr_gid_name_get(&gname, gid, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-    CuAssertPtrNotNull(tc, gname);
-
-    rv = apr_gid_get(&retreived_gid, gname, p);
-    CuAssertIntEquals(tc, APR_SUCCESS, rv);
-
-    CuAssertIntEquals(tc, APR_SUCCESS, apr_gid_compare(gid, retreived_gid));
-}
-
-#ifndef WIN32
-
-static void fail_userinfo(CuTest *tc)
-{
-    apr_uid_t uid;
-    apr_gid_t gid;
-    apr_status_t rv;
-    char *tmp;
-
-    errno = 0;
-    gid = uid = 9999999;
-    tmp = NULL;
-    rv = apr_uid_name_get(&tmp, uid, p);
-    CuAssert(tc, "apr_uid_name_get should fail or "
-                "return a user name",
-                rv != APR_SUCCESS || tmp != NULL);
-
-    errno = 0;
-    tmp = NULL;
-    rv = apr_gid_name_get(&tmp, gid, p);
-    CuAssert(tc, "apr_gid_name_get should fail or "
-             "return a group name",
-             rv != APR_SUCCESS || tmp != NULL);
-    
-    gid = 424242;
-    errno = 0;
-    rv = apr_gid_get(&gid, "I_AM_NOT_A_GROUP", p);
-    CuAssert(tc, "apr_gid_get should fail or "
-             "set a group number",
-             rv != APR_SUCCESS || gid == 424242);
-
-    gid = uid = 424242;
-    errno = 0;
-    rv = apr_uid_get(&uid, &gid, "I_AM_NOT_A_USER", p);
-    CuAssert(tc, "apr_gid_get should fail or "
-             "set a user and group number",
-             rv != APR_SUCCESS || uid == 424242 || gid == 4242442);
-
-    errno = 0;
-    tmp = NULL;
-    rv = apr_uid_homepath_get(&tmp, "I_AM_NOT_A_USER", p);
-    CuAssert(tc, "apr_uid_homepath_get should fail or "
-             "set a path name",
-             rv != APR_SUCCESS || tmp != NULL);
-}
-
-#else
-static void fail_userinfo(CuTest *tc)
-{
-    CuNotImpl(tc, "Intregal uid/gid not present on this platform");
-}
-#endif
-
-#else
-static void users_not_impl(CuTest *tc)
-{
-    CuNotImpl(tc, "Users not implemented on this platform");
-}
-#endif
-
-CuSuite *testuser(void)
-{
-    CuSuite *suite = CuSuiteNew("Users");
-
-#if !APR_HAS_USER
-    SUITE_ADD_TEST(suite, users_not_impl);
-#else
-    SUITE_ADD_TEST(suite, uid_current);
-    SUITE_ADD_TEST(suite, username);
-    SUITE_ADD_TEST(suite, groupname);
-    SUITE_ADD_TEST(suite, fail_userinfo);
-#endif
-
-    return suite;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/test/testvsn.c b/rubbos/app/httpd-2.0.64/srclib/apr/test/testvsn.c
deleted file mode 100644
index f04f1587..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/test/testvsn.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-
-#include "test_apr.h"
-#include "apr_version.h"
-#include "apr_general.h"
-
-
-static void test_strings(CuTest *tc)
-{
-    CuAssertStrEquals(tc, APR_VERSION_STRING, apr_version_string());
-}
-
-static void test_ints(CuTest *tc)
-{
-    apr_version_t vsn;
-
-    apr_version(&vsn);
-
-    CuAssertIntEquals(tc, APR_MAJOR_VERSION, vsn.major);
-    CuAssertIntEquals(tc, APR_MINOR_VERSION, vsn.minor);
-    CuAssertIntEquals(tc, APR_PATCH_VERSION, vsn.patch);
-}
-
-CuSuite *testvsn(void)
-{
-    CuSuite *suite = CuSuiteNew("Versioning");
-
-    SUITE_ADD_TEST(suite, test_strings);
-    SUITE_ADD_TEST(suite, test_ints);
-
-    return suite;
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/beos/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/beos/Makefile.in
deleted file mode 100644
index 5a411815..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/beos/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = \
-	proc.lo \
-	thread.lo \
-	threadpriv.lo \
-	threadproc_common.lo \
-        apr_proc_stub
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/@OSDIR@
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch -I$(OSDIR) -I$(DEFOSDIR)
-
-CLEAN_TARGETS = apr_proc_stub /boot/home/config/bin/apr_proc_stub
-
-apr_proc_stub:
-	$(CC) $(srcdir)/apr_proc_stub.c \
-	&& cp apr_proc_stub /boot/home/config/bin
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/beos/apr_proc_stub.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/beos/apr_proc_stub.c
deleted file mode 100644
index 011d793e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/beos/apr_proc_stub.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <kernel/OS.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-
-struct pipefd {
-	int in;
-	int out;
-	int err;
-};
-
-int main(int argc, char *argv[]) {
-/* we expect the following...
- * 
- * argv[0] = this stub
- * argv[1] = directory to run in...
- * argv[2] = progname to execute
- * rest of arguments to be passed to program
- */
-	char *progname = argv[2];
-	char *directory = argv[1];
-	struct pipefd *pfd;
-	thread_id sender;
-	void *buffer;
-	char ** newargs;
-	int i = 0;
-	
-	newargs = (char**)malloc(sizeof(char*) * (argc - 1));
-  
-	buffer = (void*)malloc(sizeof(struct pipefd));
-	/* this will block until we get the data */
-	receive_data(&sender, buffer, sizeof(struct pipefd));
-	pfd = (struct pipefd*)buffer;
-	
-	if (pfd->in > STDERR_FILENO) {
-		if (dup2(pfd->in, STDIN_FILENO) != STDIN_FILENO) return (-1);
-	    close (pfd->in);
-	}
-	if (pfd->out > STDERR_FILENO) {
-		if (dup2(pfd->out, STDOUT_FILENO) != STDOUT_FILENO) return (-1);
-	    close (pfd->out);
-	}
-	if (pfd->err > STDERR_FILENO) {
-		if (dup2(pfd->err, STDERR_FILENO) != STDERR_FILENO) return (-1);
-	    close (pfd->err);
-	}
-
-	for	(i=3;i<=argc;i++){
-	    newargs[i-3] = argv[i];
-	}
-	
-	/* tell the caller we're OK to start */
-	send_data(sender,1,NULL,0);
-
-	if (directory != NULL)
-		chdir(directory);
-	execve (progname, newargs, environ);
-
-	return (-1);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/beos/proc.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/beos/proc.c
deleted file mode 100644
index 776b15ec..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/beos/proc.c
+++ /dev/null
@@ -1,371 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_threadproc.h"
-#include "apr_strings.h"
-
-struct send_pipe {
-	int in;
-	int out;
-	int err;
-};
-
-APR_DECLARE(apr_status_t) apr_procattr_create(apr_procattr_t **new, apr_pool_t *pool)
-{
-    (*new) = (apr_procattr_t *)apr_palloc(pool, 
-              sizeof(apr_procattr_t));
-
-    if ((*new) == NULL) {
-        return APR_ENOMEM;
-    }
-    (*new)->pool = pool;
-    (*new)->parent_in = NULL;
-    (*new)->child_in = NULL;
-    (*new)->parent_out = NULL;
-    (*new)->child_out = NULL;
-    (*new)->parent_err = NULL;
-    (*new)->child_err = NULL;
-    (*new)->currdir = NULL; 
-    (*new)->cmdtype = APR_PROGRAM;
-    (*new)->detached = 0;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr, apr_int32_t in, 
-                                              apr_int32_t out, apr_int32_t err)
-{
-    apr_status_t status;
-    if (in != 0) {
-        if ((status = apr_file_pipe_create(&attr->child_in, &attr->parent_in, 
-                                   attr->pool)) != APR_SUCCESS) {
-            return status;
-        }
-        switch (in) {
-        case APR_FULL_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_in, -1);
-            apr_file_pipe_timeout_set(attr->parent_in, -1);
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_in, -1);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_in, -1);
-            break;
-        default:
-            break;
-        }
-    } 
-    if (out) {
-        if ((status = apr_file_pipe_create(&attr->parent_out, &attr->child_out, 
-                                   attr->pool)) != APR_SUCCESS) {
-            return status;
-        }
-        switch (out) {
-        case APR_FULL_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_out, -1);
-            apr_file_pipe_timeout_set(attr->parent_out, -1);       
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_out, -1);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_out, -1);
-            break;
-        default:
-            break;
-        }
-    } 
-    if (err) {
-        if ((status = apr_file_pipe_create(&attr->parent_err, &attr->child_err, 
-                                   attr->pool)) != APR_SUCCESS) {
-            return status;
-        }
-        switch (err) {
-        case APR_FULL_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_err, -1);
-            apr_file_pipe_timeout_set(attr->parent_err, -1);
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_err, -1);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_err, -1);
-            break;
-        default:
-            break;
-        }
-    } 
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_dir_set(apr_procattr_t *attr, 
-                                               const char *dir) 
-{
-    char * cwd;
-    if (dir[0] != '/') {
-        cwd = (char*)malloc(sizeof(char) * PATH_MAX);
-        getcwd(cwd, PATH_MAX);
-        attr->currdir = (char *)apr_pstrcat(attr->pool, cwd, "/", dir, NULL);
-        free(cwd);
-    } else {
-        attr->currdir = (char *)apr_pstrdup(attr->pool, dir);
-    }
-    if (attr->currdir) {
-        return APR_SUCCESS;
-    }
-    return APR_ENOMEM;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_cmdtype_set(apr_procattr_t *attr,
-                                                   apr_cmdtype_e cmd) 
-{
-    attr->cmdtype = cmd;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_detach_set(apr_procattr_t *attr, apr_int32_t detach) 
-{
-    attr->detached = detach;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_fork(apr_proc_t *proc, apr_pool_t *pool)
-{
-    int pid;
-    
-    if ((pid = fork()) < 0) {
-        return errno;
-    }
-    else if (pid == 0) {
-        proc->pid = pid;
-        proc->in = NULL; 
-        proc->out = NULL; 
-        proc->err = NULL; 
-        return APR_INCHILD;
-    }
-    proc->pid = pid;
-    proc->in = NULL; 
-    proc->out = NULL; 
-    proc->err = NULL; 
-    return APR_INPARENT;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_child_errfn_set(apr_procattr_t *attr,
-                                                       apr_child_errfn_t *errfn)
-{
-    /* won't ever be called on this platform, so don't save the function pointer */
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_error_check_set(apr_procattr_t *attr,
-                                                       apr_int32_t chk)
-{
-    /* won't ever be used on this platform, so don't save the flag */
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_addrspace_set(apr_procattr_t *attr,
-                                                       apr_int32_t addrspace)
-{
-    /* won't ever be used on this platform, so don't save the flag */
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new, const char *progname, 
-                                          const char * const *args,
-                                          const char * const *env, 
-                                          apr_procattr_t *attr, apr_pool_t *pool)
-{
-    int i=0,nargs=0;
-    char **newargs = NULL;
-    thread_id newproc, sender;
-    struct send_pipe *sp;        
-    char * dir = NULL;
-	    
-    sp = (struct send_pipe *)apr_palloc(pool, sizeof(struct send_pipe));
-
-    new->in = attr->parent_in;
-    new->err = attr->parent_err;
-    new->out = attr->parent_out;
-	sp->in  = attr->child_in  ? attr->child_in->filedes  : -1;
-	sp->out = attr->child_out ? attr->child_out->filedes : -1;
-	sp->err = attr->child_err ? attr->child_err->filedes : -1;
-
-    i = 0;
-    while (args && args[i]) {
-        i++;
-    }
-
-	newargs = (char**)malloc(sizeof(char *) * (i + 4));
-	newargs[0] = strdup("/boot/home/config/bin/apr_proc_stub");
-    if (attr->currdir == NULL) {
-        /* we require the directory , so use a temp. variable */
-        dir = malloc(sizeof(char) * PATH_MAX);
-        getcwd(dir, PATH_MAX);
-        newargs[1] = strdup(dir);
-        free(dir);
-    } else {
-        newargs[1] = strdup(attr->currdir);
-    }
-    newargs[2] = strdup(progname);
-    i=0;nargs = 3;
-
-    while (args && args[i]) {
-        newargs[nargs] = strdup(args[i]);
-        i++;nargs++;
-    }
-    newargs[nargs] = NULL;
-
-    /* ### we should be looking at attr->cmdtype in here... */
-
-    newproc = load_image(nargs, (const char**)newargs, (const char**)env);
-
-    /* load_image copies the data so now we can free it... */
-    while (--nargs >= 0)
-        free (newargs[nargs]);
-    free(newargs);
-        
-    if ( newproc < B_NO_ERROR) {
-        return errno;
-    }
-
-    resume_thread(newproc);
-
-    if (attr->child_in) {
-        apr_file_close(attr->child_in);
-    }
-    if (attr->child_out) {
-        apr_file_close(attr->child_out);
-    }
-    if (attr->child_err) {
-        apr_file_close(attr->child_err);
-    }
-
-    send_data(newproc, 0, (void*)sp, sizeof(struct send_pipe));
-    new->pid = newproc;
-
-    /* before we go charging on we need the new process to get to a 
-     * certain point.  When it gets there it'll let us know and we
-     * can carry on. */
-    receive_data(&sender, (void*)NULL,0);
-    
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_wait_all_procs(apr_proc_t *proc,
-                                                  int *exitcode,
-                                                  apr_exit_why_e *exitwhy,
-                                                  apr_wait_how_e waithow, 
-                                                  apr_pool_t *p)
-{
-    proc->pid = -1;
-    return apr_proc_wait(proc, exitcode, exitwhy, waithow);
-} 
-
-APR_DECLARE(apr_status_t) apr_proc_wait(apr_proc_t *proc,
-                                        int *exitcode, 
-                                        apr_exit_why_e *exitwhy,
-                                        apr_wait_how_e waithow)
-{
-    pid_t pstatus;
-    int waitpid_options = WUNTRACED;
-    int exit_int;
-    int ignore;
-    apr_exit_why_e ignorewhy;
-
-    if (exitcode == NULL) {
-        exitcode = &ignore;
-    }
-    if (exitwhy == NULL) {
-        exitwhy = &ignorewhy;
-    }
-
-    if (waithow != APR_WAIT) {
-        waitpid_options |= WNOHANG;
-    }
-    
-    if ((pstatus = waitpid(proc->pid, &exit_int, waitpid_options)) > 0) {
-        proc->pid = pstatus;
-        if (WIFEXITED(exit_int)) {
-            *exitwhy = APR_PROC_EXIT;
-            *exitcode = WEXITSTATUS(exit_int);
-        }
-        else if (WIFSIGNALED(exit_int)) {
-            *exitwhy = APR_PROC_SIGNAL;
-            *exitcode = WTERMSIG(exit_int);
-        }
-        else {
-            /* unexpected condition */
-            return APR_EGENERAL;
-        }
-        return APR_CHILD_DONE;
-    }
-    else if (pstatus == 0) {
-        return APR_CHILD_NOTDONE;
-    }
-    return errno;
-} 
-
-APR_DECLARE(apr_status_t) apr_procattr_child_in_set(apr_procattr_t *attr, apr_file_t *child_in,
-                                   apr_file_t *parent_in)
-{
-    if (attr->child_in == NULL && attr->parent_in == NULL)
-        apr_file_pipe_create(&attr->child_in, &attr->parent_in, attr->pool);
-
-    if (child_in != NULL)
-        apr_file_dup(&attr->child_in, child_in, attr->pool);
-
-    if (parent_in != NULL)
-        apr_file_dup(&attr->parent_in, parent_in, attr->pool);
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_child_out_set(apr_procattr_t *attr, apr_file_t *child_out,
-                                                     apr_file_t *parent_out)
-{
-    if (attr->child_out == NULL && attr->parent_out == NULL)
-        apr_file_pipe_create(&attr->child_out, &attr->parent_out, attr->pool);
-
-    if (child_out != NULL)
-        apr_file_dup(&attr->child_out, child_out, attr->pool);
-
-    if (parent_out != NULL)
-        apr_file_dup(&attr->parent_out, parent_out, attr->pool);
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_child_err_set(apr_procattr_t *attr, apr_file_t *child_err,
-                                                     apr_file_t *parent_err)
-{
-    if (attr->child_err == NULL && attr->parent_err == NULL)
-        apr_file_pipe_create(&attr->child_err, &attr->parent_err, attr->pool);
-
-    if (child_err != NULL)
-        apr_file_dup(&attr->child_err, child_err, attr->pool);
-
-    if (parent_err != NULL)
-        apr_file_dup(&attr->parent_err, parent_err, attr->pool);
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_limit_set(apr_procattr_t *attr, apr_int32_t what, 
-                                                  void *limit)
-{
-    return APR_ENOTIMPL;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/beos/thread.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/beos/thread.c
deleted file mode 100644
index f408f3a9..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/beos/thread.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_threadproc.h"
-#include "apr_portable.h"
-
-APR_DECLARE(apr_status_t) apr_threadattr_create(apr_threadattr_t **new, apr_pool_t *pool)
-{
-    (*new) = (apr_threadattr_t *)apr_palloc(pool, 
-              sizeof(apr_threadattr_t));
-
-    if ((*new) == NULL) {
-        return APR_ENOMEM;
-    }
-
-    (*new)->pool = pool;
-	(*new)->attr = (int32)B_NORMAL_PRIORITY;
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_threadattr_detach_set(apr_threadattr_t *attr, apr_int32_t on)
-{
-	if (on == 1){
-		attr->detached = 1;
-	} else {
-		attr->detached = 0;
-	}    
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_threadattr_detach_get(apr_threadattr_t *attr)
-{
-	if (attr->detached == 1){
-		return APR_DETACH;
-	}
-	return APR_NOTDETACH;
-}
-
-APR_DECLARE(apr_status_t) apr_threadattr_stacksize_set(apr_threadattr_t *attr,
-                                                       apr_size_t stacksize)
-{
-    return APR_ENOTIMPL;
-}
-
-static void *dummy_worker(void *opaque)
-{
-    apr_thread_t *thd = (apr_thread_t*)opaque;
-    return thd->func(thd, thd->data);
-}
-
-APR_DECLARE(apr_status_t) apr_thread_create(apr_thread_t **new, apr_threadattr_t *attr,
-                                            apr_thread_start_t func, void *data,
-                                            apr_pool_t *pool)
-{
-    int32 temp;
-    apr_status_t stat;
-    
-    (*new) = (apr_thread_t *)apr_palloc(pool, sizeof(apr_thread_t));
-    if ((*new) == NULL) {
-        return APR_ENOMEM;
-    }
-
-    (*new)->pool = pool;
-    (*new)->data = data;
-    (*new)->func = func;
-    (*new)->exitval = -1;
-
-    /* First we create the new thread...*/
-	if (attr)
-	    temp = attr->attr;
-	else
-	    temp = B_NORMAL_PRIORITY;
-
-    stat = apr_pool_create(&(*new)->pool, pool);
-    if (stat != APR_SUCCESS) {
-        return stat;
-    }
-
-    (*new)->td = spawn_thread((thread_func)dummy_worker, "apr thread", temp, (*new));
-    /* Now we try to run it...*/
-    if (resume_thread((*new)->td) == B_NO_ERROR) {
-        return APR_SUCCESS;
-    }
-    else {
-        return errno;
-    } 
-}
-
-APR_DECLARE(apr_os_thread_t) apr_os_thread_current(void)
-{
-    return find_thread(NULL);
-}
-
-int apr_os_thread_equal(apr_os_thread_t tid1, apr_os_thread_t tid2)
-{
-    return tid1 == tid2;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_exit(apr_thread_t *thd, apr_status_t retval)
-{
-    apr_pool_destroy(thd->pool);
-    thd->exitval = retval;
-    exit_thread ((status_t)(retval));
-    /* This will never be reached... */
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_join(apr_status_t *retval, apr_thread_t *thd)
-{
-    status_t rv = 0, ret;
-    if ((ret = wait_for_thread(thd->td, &rv)) == B_NO_ERROR) {
-        *retval = rv;
-        return APR_SUCCESS;
-    }
-    else {
-        /* if we've missed the thread's death, did we set an exit value prior
-         * to it's demise?  If we did return that.
-         */
-        if (thd->exitval != -1) {
-            *retval = thd->exitval;
-            return APR_SUCCESS;
-        } else 
-            return ret;
-    }
-}
-
-APR_DECLARE(apr_status_t) apr_thread_detach(apr_thread_t *thd)
-{
-	if (suspend_thread(thd->td) == B_NO_ERROR){
-        return APR_SUCCESS;
-    }
-    else {
-        return errno;
-    }
-}
-
-void apr_thread_yield()
-{
-}
-
-APR_DECLARE(apr_status_t) apr_thread_data_get(void **data, const char *key, apr_thread_t *thread)
-{
-    return apr_pool_userdata_get(data, key, thread->pool);
-}
-
-APR_DECLARE(apr_status_t) apr_thread_data_set(void *data, const char *key,
-                                              apr_status_t (*cleanup) (void *),
-                                              apr_thread_t *thread)
-{
-    return apr_pool_userdata_set(data, key, cleanup, thread->pool);
-}
-
-APR_DECLARE(apr_status_t) apr_os_thread_get(apr_os_thread_t **thethd, apr_thread_t *thd)
-{
-    *thethd = &thd->td;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_thread_put(apr_thread_t **thd, apr_os_thread_t *thethd, 
-                                            apr_pool_t *pool)
-{
-    if (pool == NULL) {
-        return APR_ENOPOOL;
-    }
-    if ((*thd) == NULL) {
-        (*thd) = (apr_thread_t *)apr_pcalloc(pool, sizeof(apr_thread_t));
-        (*thd)->pool = pool;
-    }
-    (*thd)->td = *thethd;
-    return APR_SUCCESS;
-}
-
-static apr_status_t thread_once_cleanup(void *vcontrol)
-{
-    apr_thread_once_t *control = (apr_thread_once_t *)vcontrol;
-
-    if (control->sem) {
-        release_sem(control->sem);
-        delete_sem(control->sem);
-    }
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_once_init(apr_thread_once_t **control,
-                                               apr_pool_t *p)
-{
-    int rc;
-    *control = (apr_thread_once_t *)apr_pcalloc(p, sizeof(apr_thread_once_t));
-    (*control)->hit = 0; /* we haven't done it yet... */
-    rc = ((*control)->sem = create_sem(1, "thread_once"));
-    if (rc != 0) {
-        return rc;
-    }
-    apr_pool_cleanup_register(p, control, thread_once_cleanup, apr_pool_cleanup_null);
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_once(apr_thread_once_t *control, 
-                                          void (*func)(void))
-{
-    if (!control->hit) {
-        if (acquire_sem(control->sem) == B_OK) {
-            control->hit = 1;
-            func();
-        }
-    }
-    return APR_SUCCESS;
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(thread)
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/beos/threadpriv.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/beos/threadpriv.c
deleted file mode 100644
index 442235f7..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/beos/threadpriv.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_threadproc.h"
-
-static struct beos_key key_table[BEOS_MAX_DATAKEYS];
-static struct beos_private_data *beos_data[BEOS_MAX_DATAKEYS];
-static sem_id lock;
-
-APR_DECLARE(apr_status_t) apr_threadkey_private_create(apr_threadkey_t **key,
-                                       void (*dest)(void *), apr_pool_t *pool)
-{
-    (*key) = (apr_threadkey_t *)apr_palloc(pool, sizeof(apr_threadkey_t));
-    if ((*key) == NULL) {
-        return APR_ENOMEM;
-    }
-
-    (*key)->pool = pool;
-    	
-	acquire_sem(lock);
-	for ((*key)->key=0; (*key)->key < BEOS_MAX_DATAKEYS; (*key)->key++){
-		if (key_table[(*key)->key].assigned == 0){
-			key_table[(*key)->key].assigned = 1;
-			key_table[(*key)->key].destructor = dest;
-			release_sem(lock);
-			return APR_SUCCESS;
-		}				
-
-	}
-	release_sem(lock);
-    return APR_ENOMEM;
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_private_get(void **new, apr_threadkey_t *key)
-{
-	thread_id tid;
-	int i, index=0;
-	tid = find_thread(NULL);
-	for (i=0;i<BEOS_MAX_DATAKEYS;i++){
-		if (beos_data[i]->data){
-			/* it's been used */
-			if (beos_data[i]->td == tid){
-				index = i;
-			}
-		}
-	}
-	if (index == 0){
-		/* no storage for thread so we can't get anything... */
-		return APR_ENOMEM;
-	}
-
-	if ((key->key < BEOS_MAX_DATAKEYS) && (key_table)){
-		acquire_sem(key_table[key->key].lock);
-		if (key_table[key->key].count){
-			(*new) = (void*)beos_data[index]->data[key->key];
-		} else {
-			(*new) = NULL;
-		}
-		release_sem(key_table[key->key].lock);
-	} else {
-		(*new) = NULL;
-	}
-	return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_private_set(void *priv, apr_threadkey_t *key)
-{
-	thread_id tid;
-	int i,index = 0, ret = 0;
-
-	tid = find_thread(NULL);	
-	for (i=0; i < BEOS_MAX_DATAKEYS; i++){
-		if (beos_data[i]->data){
-			if (beos_data[i]->td == tid){index = i;}
-		}
-	}
-	if (index==0){
-		/* not yet been allocated */
-		for (i=0; i< BEOS_MAX_DATAKEYS; i++){
-			if (! beos_data[i]->data){
-				/* we'll take this one... */
-				index = i;
-				beos_data[i]->data = (const void **)malloc(sizeof(void *) * BEOS_MAX_DATAKEYS);
-				memset((void *)beos_data[i]->data, 0, sizeof(void *) * BEOS_MAX_DATAKEYS);
-				beos_data[i]->count = (int)malloc(sizeof(int));
-				beos_data[i]->td = (thread_id)malloc(sizeof(thread_id));
-				beos_data[i]->td = tid;
-			}
-		}
-	}
-	if (index == 0){
-		/* we're out of luck.. */
-		return APR_ENOMEM;
-	}
-	if ((key->key < BEOS_MAX_DATAKEYS) && (key_table)){
-		acquire_sem(key_table[key->key].lock);
-		if (key_table[key->key].count){
-			if (beos_data[index]->data[key->key] == NULL){
-				if (priv != NULL){
-					beos_data[index]->count++;
-					key_table[key->key].count++;
-				}
-			} else {
-				if (priv == NULL){
-					beos_data[index]->count--;
-					key_table[key->key].count--;
-				}
-			}
-			beos_data[index]->data[key->key] = priv;
-			ret = 1;
-		} else {
-			ret = 0;
-		}
-		release_sem(key_table[key->key].lock);
-	}
-	if (ret)
-    	return APR_SUCCESS;
-	return APR_ENOMEM;
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_private_delete(apr_threadkey_t *key)
-{
-	if (key->key < BEOS_MAX_DATAKEYS){
-		acquire_sem(key_table[key->key].lock);
-		if (key_table[key->key].count == 1){
-			key_table[key->key].destructor = NULL;
-			key_table[key->key].count = 0;
-		}
-		release_sem(key_table[key->key].lock);
-	} else {
-		return APR_ENOMEM;
-	}
-	return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_data_get(void **data, const char *key,
-                                                 apr_threadkey_t *threadkey)
-{
-    return apr_pool_userdata_get(data, key, threadkey->pool);
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_data_set(void *data, const char *key,
-                                                 apr_status_t (*cleanup) (void *),
-                                                 apr_threadkey_t *threadkey)
-{
-    return apr_pool_userdata_set(data, key, cleanup, threadkey->pool);
-}
-
-APR_DECLARE(apr_status_t) apr_os_threadkey_get(apr_os_threadkey_t *thekey, apr_threadkey_t *key)
-{
-    *thekey = key->key;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_threadkey_put(apr_threadkey_t **key, 
-                                               apr_os_threadkey_t *thekey, apr_pool_t *pool)
-{
-    if (pool == NULL) {
-        return APR_ENOPOOL;
-    }
-    if ((*key) == NULL) {
-        (*key) = (apr_threadkey_t *)apr_pcalloc(pool, sizeof(apr_threadkey_t));
-        (*key)->pool = pool;
-    }
-    (*key)->key = *thekey;
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/beos/threadproc_common.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/beos/threadproc_common.c
deleted file mode 100644
index 95e16254..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/beos/threadproc_common.c
+++ /dev/null
@@ -1,21 +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.
- */
-
-/* As the signal code is identical, use the unix version to reduce
-   code duplication */
-#include "../unix/signals.c"
-#include "../unix/procsup.c"
-   
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/netware/proc.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/netware/proc.c
deleted file mode 100644
index 684559d0..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/netware/proc.c
+++ /dev/null
@@ -1,438 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_threadproc.h"
-#include "apr_arch_file_io.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-
-#include <proc.h>
-
-apr_status_t apr_netware_proc_cleanup(void *theproc)
-{
-    apr_proc_t *proc = theproc;
-    int exit_int;
-    int waitpid_options = WUNTRACED | WNOHANG;
-
-    if (proc->pid > 0) {
-        waitpid(proc->pid, &exit_int, waitpid_options);
-    }
-
-/*	NXVmDestroy(proc->pid); */
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_create(apr_procattr_t **new,apr_pool_t *pool)
-{
-    (*new) = (apr_procattr_t *)apr_pcalloc(pool, sizeof(apr_procattr_t));
-
-    if ((*new) == NULL) {
-        return APR_ENOMEM;
-    }
-    (*new)->pool = pool;
-    (*new)->cmdtype = APR_PROGRAM;
-    /* Default to a current path since NetWare doesn't handle it very well */
-    apr_filepath_get(&((*new)->currdir), APR_FILEPATH_NATIVE, pool);
-    (*new)->detached = 1;
-    return APR_SUCCESS;
-
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr, apr_int32_t in, 
-                                 apr_int32_t out, apr_int32_t err)
-{
-    apr_status_t status;
-    if (in != 0) {
-        if ((status = apr_file_pipe_create(&attr->child_in, &attr->parent_in, 
-                                   attr->pool)) != APR_SUCCESS) {
-            return status;
-        }
-        switch (in) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_in, 0);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_in, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(attr->child_in, 0);
-            apr_file_pipe_timeout_set(attr->parent_in, 0);
-        }
-    } 
-    if (out) {
-        if ((status = apr_file_pipe_create(&attr->parent_out, &attr->child_out, 
-                                   attr->pool)) != APR_SUCCESS) {
-            return status;
-        }
-        switch (out) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_out, 0);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_out, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(attr->child_out, 0);
-            apr_file_pipe_timeout_set(attr->parent_out, 0);
-        }
-    } 
-    if (err) {
-        if ((status = apr_file_pipe_create(&attr->parent_err, &attr->child_err, 
-                                   attr->pool)) != APR_SUCCESS) {
-            return status;
-        }
-        switch (err) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_err, 0);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_err, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(attr->child_err, 0);
-            apr_file_pipe_timeout_set(attr->parent_err, 0);
-        }
-    } 
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_procattr_child_in_set(apr_procattr_t *attr, apr_file_t *child_in,
-                                   apr_file_t *parent_in)
-{
-    if (attr->child_in == NULL && attr->parent_in == NULL)
-        apr_file_pipe_create(&attr->child_in, &attr->parent_in, attr->pool);
-
-    if (child_in != NULL)
-        apr_file_dup2(attr->child_in, child_in, attr->pool);
-
-    if (parent_in != NULL)
-        apr_file_dup2(attr->parent_in, parent_in, attr->pool);
-
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_procattr_child_out_set(apr_procattr_t *attr, apr_file_t *child_out,
-                                    apr_file_t *parent_out)
-{
-    if (attr->child_out == NULL && attr->parent_out == NULL)
-        apr_file_pipe_create(&attr->child_out, &attr->parent_out, attr->pool);
-
-    if (child_out != NULL)
-        apr_file_dup2(attr->child_out, child_out, attr->pool);
-
-    if (parent_out != NULL)
-        apr_file_dup2(attr->parent_out, parent_out, attr->pool);
-
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_procattr_child_err_set(apr_procattr_t *attr, apr_file_t *child_err,
-                                   apr_file_t *parent_err)
-{
-    if (attr->child_err == NULL && attr->parent_err == NULL)
-        apr_file_pipe_create(&attr->child_err, &attr->parent_err, attr->pool);
-
-    if (child_err != NULL)
-        apr_file_dup2(attr->child_err, child_err, attr->pool);
-
-    if (parent_err != NULL)
-        apr_file_dup2(attr->parent_err, parent_err, attr->pool);
-
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_procattr_dir_set(apr_procattr_t *attr, 
-                               const char *dir) 
-{
-    return apr_filepath_merge(&attr->currdir, NULL, dir, 
-                              APR_FILEPATH_NATIVE, attr->pool);
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_cmdtype_set(apr_procattr_t *attr,
-                                     apr_cmdtype_e cmd) 
-{
-    /* won't ever be called on this platform, so don't save the flag */
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_detach_set(apr_procattr_t *attr, apr_int32_t detach) 
-{
-    attr->detached = detach;
-    return APR_SUCCESS;
-}
-
-#if APR_HAS_FORK
-APR_DECLARE(apr_status_t) apr_proc_fork(apr_proc_t *proc, apr_pool_t *pool)
-{
-    int pid;
-    
-    if ((pid = fork()) < 0) {
-        return errno;
-    }
-    else if (pid == 0) {
-        proc->pid = pid;
-        proc->in = NULL; 
-        proc->out = NULL; 
-        proc->err = NULL; 
-        return APR_INCHILD;
-    }
-    proc->pid = pid;
-    proc->in = NULL; 
-    proc->out = NULL; 
-    proc->err = NULL; 
-    return APR_INPARENT;
-}
-#endif
-
-static apr_status_t limit_proc(apr_procattr_t *attr)
-{
-#if APR_HAVE_STRUCT_RLIMIT && APR_HAVE_SETRLIMIT
-#ifdef RLIMIT_CPU
-    if (attr->limit_cpu != NULL) {
-        if ((setrlimit(RLIMIT_CPU, attr->limit_cpu)) != 0) {
-            return errno;
-        }
-    }
-#endif
-#ifdef RLIMIT_NPROC
-    if (attr->limit_nproc != NULL) {
-        if ((setrlimit(RLIMIT_NPROC, attr->limit_nproc)) != 0) {
-            return errno;
-        }
-    }
-#endif
-#if defined(RLIMIT_AS)
-    if (attr->limit_mem != NULL) {
-        if ((setrlimit(RLIMIT_AS, attr->limit_mem)) != 0) {
-            return errno;
-        }
-    }
-#elif defined(RLIMIT_DATA)
-    if (attr->limit_mem != NULL) {
-        if ((setrlimit(RLIMIT_DATA, attr->limit_mem)) != 0) {
-            return errno;
-        }
-    }
-#elif defined(RLIMIT_VMEM)
-    if (attr->limit_mem != NULL) {
-        if ((setrlimit(RLIMIT_VMEM, attr->limit_mem)) != 0) {
-            return errno;
-        }
-    }
-#endif
-#else
-    /*
-     * Maybe make a note in error_log that setrlimit isn't supported??
-     */
-
-#endif
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_child_errfn_set(apr_procattr_t *attr,
-                                                       apr_child_errfn_t *errfn)
-{
-    /* won't ever be called on this platform, so don't save the function pointer */
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_error_check_set(apr_procattr_t *attr,
-                                                       apr_int32_t chk)
-{
-    /* won't ever be used on this platform, so don't save the flag */
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_addrspace_set(apr_procattr_t *attr,
-                                                       apr_int32_t addrspace)
-{
-    attr->addrspace = addrspace;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *newproc,
-									const char *progname, 
-									const char * const *args, 
-									const char * const *env,
-                              		apr_procattr_t *attr, 
-                              		apr_pool_t *pool)
-{
-	wiring_t		wire;
-    int             addr_space;
-
-    wire.infd  = attr->child_in ? attr->child_in->filedes : FD_UNUSED;
-    wire.outfd = attr->child_out ? attr->child_out->filedes : FD_UNUSED;
-    wire.errfd = attr->child_err ? attr->child_err->filedes : FD_UNUSED;
-
-    newproc->in = attr->parent_in;
-    newproc->out = attr->parent_out;
-    newproc->err = attr->parent_err;
-
-    /* attr->detached and PROC_DETACHED do not mean the same thing.  attr->detached means
-     * start the NLM in a separate address space.  PROC_DETACHED means don't wait for the
-     * NLM to unload by calling wait() or waitpid(), just clean up */
-    addr_space = PROC_LOAD_SILENT | (attr->addrspace ? 0 : PROC_CURRENT_SPACE);
-    addr_space |= (attr->detached ? PROC_DETACHED : 0);
-
-    if (attr->currdir) {
-        char *fullpath = NULL;
-        apr_status_t rv;
-
-        if ((rv = apr_filepath_merge(&fullpath, attr->currdir, progname, 
-                                     APR_FILEPATH_NATIVE, pool)) != APR_SUCCESS) {
-            return rv;
-        }
-        progname = fullpath;
-    } 
-
-    if ((newproc->pid = procve(progname, addr_space, (const char**)env, &wire, 
-        NULL, NULL, 0, NULL, (const char **)args)) == -1) {
-        return errno;
-    }
-
-    if (attr->child_in) {
-        apr_pool_cleanup_kill(apr_file_pool_get(attr->child_in), 
-                              attr->child_in, apr_unix_file_cleanup);
-        apr_file_close(attr->child_in);
-    }
-    if (attr->child_out) {
-        apr_pool_cleanup_kill(apr_file_pool_get(attr->child_out), 
-                              attr->child_out, apr_unix_file_cleanup);
-        apr_file_close(attr->child_out);
-    }
-    if (attr->child_err) {
-        apr_pool_cleanup_kill(apr_file_pool_get(attr->child_err), 
-                              attr->child_err, apr_unix_file_cleanup);
-        apr_file_close(attr->child_err);
-    }
-
-
-    apr_pool_cleanup_register(pool, (void *)newproc, apr_netware_proc_cleanup,
-        apr_pool_cleanup_null);
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_wait_all_procs(apr_proc_t *proc,
-                                                  int *exitcode,
-                                                  apr_exit_why_e *exitwhy,
-                                                  apr_wait_how_e waithow,
-                                                  apr_pool_t *p)
-{
-    proc->pid = -1;
-    return apr_proc_wait(proc, exitcode, exitwhy, waithow);
-}
-
-APR_DECLARE(apr_status_t) apr_proc_wait(apr_proc_t *proc,
-                                        int *exitcode, apr_exit_why_e *exitwhy,
-                                        apr_wait_how_e waithow)
-{
-    pid_t pstatus;
-    int waitpid_options = WUNTRACED;
-    int exit_int;
-    int ignore;
-    apr_exit_why_e ignorewhy;
-
-    if (exitcode == NULL) {
-        exitcode = &ignore;
-    }
-
-    if (exitwhy == NULL) {
-        exitwhy = &ignorewhy;
-    }
-
-    if (waithow != APR_WAIT) {
-        waitpid_options |= WNOHANG;
-    }
-
-    /* If the pid is 0 then the process was started detached. There 
-       is no need to wait since there is nothing to wait for on a 
-       detached process.  Starting a process as non-detached and
-       then calling wait or waitpid could cause the thread to hang.
-       The reason for this is because NetWare does not have a way 
-       to kill or even signal a process to be killed.  Starting 
-       all processes as detached avoids the possibility of a 
-       thread hanging. */
-    if (proc->pid == 0) {
-        *exitwhy = APR_PROC_EXIT;
-        *exitcode = 0;
-        return APR_CHILD_DONE;
-    }
-
-    if ((pstatus = waitpid(proc->pid, &exit_int, waitpid_options)) > 0) {
-        proc->pid = pstatus;
-
-        if (WIFEXITED(exit_int)) {
-            *exitwhy = APR_PROC_EXIT;
-            *exitcode = WEXITSTATUS(exit_int);
-        }
-        else if (WIFSIGNALED(exit_int)) {
-            *exitwhy = APR_PROC_SIGNAL;
-            *exitcode = WIFTERMSIG(exit_int);
-        }
-        else {
-            /* unexpected condition */
-            return APR_EGENERAL;
-        }
-
-        return APR_CHILD_DONE;
-    }
-    else if (pstatus == 0) {
-        return APR_CHILD_NOTDONE;
-    }
-
-    return errno;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_limit_set(apr_procattr_t *attr, apr_int32_t what, 
-                          struct rlimit *limit)
-{
-    switch(what) {
-        case APR_LIMIT_CPU:
-#ifdef RLIMIT_CPU
-            attr->limit_cpu = limit;
-            break;
-#else
-            return APR_ENOTIMPL;
-#endif
-        case APR_LIMIT_MEM:
-#if defined (RLIMIT_DATA) || defined (RLIMIT_VMEM) || defined(RLIMIT_AS)
-            attr->limit_mem = limit;
-            break;
-#else
-            return APR_ENOTIMPL;
-#endif
-        case APR_LIMIT_NPROC:
-#ifdef RLIMIT_NPROC
-            attr->limit_nproc = limit;
-            break;
-#else
-            return APR_ENOTIMPL;
-#endif
-    }
-    return APR_SUCCESS;
-}  
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/netware/procsup.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/netware/procsup.c
deleted file mode 100644
index 72fa1d97..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/netware/procsup.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_threadproc.h"
-
-apr_status_t apr_proc_detach(int daemonize)
-{
-#if 0
-    int x;
-    pid_t pgrp;
-
-    chdir("/");
-#if !defined(MPE) && !defined(OS2) && !defined(TPF) && !defined(BEOS)
-/* Don't detach for MPE because child processes can't survive the death of
-   the parent. */
-    if ((x = fork()) > 0)
-        exit(0);
-    else if (x == -1) {
-        perror("fork");
-        fprintf(stderr, "unable to fork new process\n");
-        exit(1);  /* we can't do anything here, so just exit. */
-    }
-/*    RAISE_SIGSTOP(DETACH);*/
-#endif
-#if APR_HAVE_SETSID
-    if ((pgrp = setsid()) == -1) {
-        return errno;
-    }
-#elif defined(NEXT) || defined(NEWSOS)
-    if (setpgrp(0, getpid()) == -1 || (pgrp = getpgrp(0)) == -1) {
-        return errno;
-    }
-#elif defined(OS2) || defined(TPF)
-    /* OS/2 don't support process group IDs */
-    pgrp = getpid();
-#elif defined(MPE)
-    /* MPE uses negative pid for process group */
-    pgrp = -getpid();
-#else
-    if ((pgrp = setpgid(0, 0)) == -1) {
-        return errno;
-    }
-#endif
-
-    /* close out the standard file descriptors */
-    if (freopen("/dev/null", "r", stdin) == NULL) {
-        return errno;
-        /* continue anyhow -- note we can't close out descriptor 0 because we
-         * have nothing to replace it with, and if we didn't have a descriptor
-         * 0 the next file would be created with that value ... leading to
-         * havoc.
-         */
-    }
-    if (freopen("/dev/null", "w", stdout) == NULL) {
-        return errno;
-    }
-     /* We are going to reopen this again in a little while to the error
-      * log file, but better to do it twice and suffer a small performance
-      * hit for consistancy than not reopen it here.
-      */
-    if (freopen("/dev/null", "w", stderr) == NULL) {
-        return errno;
-    }
-#endif
-    return APR_SUCCESS;
-}
-
-#if 0
-#if (!HAVE_WAITPID)
-/* From ikluft@amdahl.com
- * this is not ideal but it works for SVR3 variants
- * Modified by dwd@bell-labs.com to call wait3 instead of wait because
- *   apache started to use the WNOHANG option.
- */
-int waitpid(pid_t pid, int *statusp, int options)
-{
-    int tmp_pid;
-    if (kill(pid, 0) == -1) {
-        errno = ECHILD;
-        return -1;
-    }
-    while (((tmp_pid = wait3(statusp, options, 0)) != pid) &&
-                (tmp_pid != -1) && (tmp_pid != 0) && (pid != -1))
-        ;
-    return tmp_pid;
-}
-#endif
-#endif
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/netware/signals.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/netware/signals.c
deleted file mode 100644
index 1b612f9f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/netware/signals.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_threadproc.h"
-#include <nks/thread.h>
-#include "apr_private.h"
-#include "apr_pools.h"
-#include "apr_signal.h"
-#include "apr_strings.h"
-
-#include <assert.h>
-#if APR_HAS_THREADS && APR_HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
-
-APR_DECLARE(apr_status_t) apr_proc_kill(apr_proc_t *proc, int signum)
-{
-    return APR_ENOTIMPL;
-}
-
-
-void apr_signal_init(apr_pool_t *pglobal)
-{
-}
-
-const char *apr_signal_description_get(int signum)
-{
-    switch (signum)
-    {
-    case SIGABRT:
-        return "Abort";
-    case SIGFPE:
-        return "Arithmetic exception";
-    case SIGILL:
-        return "Illegal instruction";
-    case SIGINT:
-        return "Interrupt";
-    case SIGSEGV:
-        return "Segmentation fault";
-    case SIGTERM:
-        return "Terminated";
-    case SIGPOLL:
-        return "Pollable event occurred";
-    default:
-        return "unknown signal (not supported)";
-    }
-}
-
-static void *signal_thread_func(void *signal_handler)
-{
-    return NULL;
-}
-
-APR_DECLARE(apr_status_t) apr_setup_signal_thread(void)
-{
-    int rv = 0;
-
-    return rv;
-}
-
-/* Deprecated */
-const char *apr_signal_get_description(int signum)
-{
-    return apr_signal_description_get(signum);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/netware/thread.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/netware/thread.c
deleted file mode 100644
index 65ef039f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/netware/thread.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_portable.h"
-#include "apr_strings.h"
-#include "apr_arch_threadproc.h"
-
-static int thread_count = 0;
-
-apr_status_t apr_threadattr_create(apr_threadattr_t **new,
-                                                apr_pool_t *pool)
-{
-    (*new) = (apr_threadattr_t *)apr_palloc(pool, 
-              sizeof(apr_threadattr_t));
-
-    if ((*new) == NULL) {
-        return APR_ENOMEM;
-    }
-
-    (*new)->pool = pool;
-    (*new)->stack_size = APR_DEFAULT_STACK_SIZE;
-    (*new)->detach = 0;
-    (*new)->thread_name = NULL;
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_threadattr_detach_set(apr_threadattr_t *attr,apr_int32_t on)
-{
-    attr->detach = on;
-	return APR_SUCCESS;   
-}
-
-apr_status_t apr_threadattr_detach_get(apr_threadattr_t *attr)
-{
-    if (attr->detach == 1)
-        return APR_DETACH;
-    return APR_NOTDETACH;
-}
-
-APR_DECLARE(apr_status_t) apr_threadattr_stacksize_set(apr_threadattr_t *attr,
-                                                       apr_size_t stacksize)
-{
-    attr->stack_size = stacksize;
-    return APR_SUCCESS;
-}
-
-static void *dummy_worker(void *opaque)
-{
-    apr_thread_t *thd = (apr_thread_t *)opaque;
-    return thd->func(thd, thd->data);
-}
-
-apr_status_t apr_thread_create(apr_thread_t **new,
- 											apr_threadattr_t *attr, 
-                             				apr_thread_start_t func,
- 											void *data,
- 											apr_pool_t *pool)
-{
-    apr_status_t stat;
-    long flags = NX_THR_BIND_CONTEXT;
-  	char threadName[NX_MAX_OBJECT_NAME_LEN+1];
-    size_t stack_size = APR_DEFAULT_STACK_SIZE;
-
-    if (attr && attr->thread_name) {
-        strncpy (threadName, attr->thread_name, NX_MAX_OBJECT_NAME_LEN);
-    }
-    else {
-	    sprintf(threadName, "APR_thread %04ld", ++thread_count);
-    }
-
-    /* An original stack size of 0 will allow NXCreateThread() to
-    *   assign a default system stack size.  An original stack
-    *   size of less than 0 will assign the APR default stack size.
-    *   anything else will be taken as is.
-    */
-    if (attr && (attr->stack_size >= 0)) {
-        stack_size = attr->stack_size;
-    }
-    
-    (*new) = (apr_thread_t *)apr_palloc(pool, sizeof(apr_thread_t));
-
-    if ((*new) == NULL) {
-        return APR_ENOMEM;
-    }
-    
-    (*new)->pool = pool;
-    (*new)->data = data;
-    (*new)->func = func;
-    (*new)->thread_name = (char*)apr_pstrdup(pool, threadName);
-    
-    stat = apr_pool_create(&(*new)->pool, pool);
-    if (stat != APR_SUCCESS) {
-        return stat;
-    }
-    
-    if (attr && attr->detach) {
-        flags |= NX_THR_DETACHED;
-    }
-    
-    (*new)->ctx = NXContextAlloc(
-    	/* void(*start_routine)(void *arg)*/(void (*)(void *)) dummy_worker,
-     	/* void *arg */										   (*new),
-     	/* int priority */ 									   NX_PRIO_MED,
-     	/* NXSize_t stackSize */							   stack_size,
-     	/* long flags */									   NX_CTX_NORMAL,
-     	/* int *error */									   &stat);
-		
-     	                                                                   
-  	stat = NXContextSetName(
-		 	/* NXContext_t ctx */			(*new)->ctx,
-			/* const char *name */			threadName);
-
-  	stat = NXThreadCreate(
-        	/* NXContext_t context */		(*new)->ctx,
-        	/* long flags */				flags,
-        	/* NXThreadId_t *thread_id */	&(*new)->td);
-
-    if(stat==0)
-     	return APR_SUCCESS;
-        
-	return(stat);// if error    
-}
-
-apr_os_thread_t apr_os_thread_current()
-{
-    return NXThreadGetId();
-}
-
-int apr_os_thread_equal(apr_os_thread_t tid1, apr_os_thread_t tid2)
-{
-    return (tid1 == tid2);
-}
-
-void apr_thread_yield()
-{
-    NXThreadYield();
-}
-
-apr_status_t apr_thread_exit(apr_thread_t *thd,
-                             apr_status_t retval)
-{
-    thd->exitval = retval;
-    apr_pool_destroy(thd->pool);
-    NXThreadExit(NULL);
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_thread_join(apr_status_t *retval,
-                                          apr_thread_t *thd)
-{
-    apr_status_t  stat;    
-    NXThreadId_t dthr;
-
-    if ((stat = NXThreadJoin(thd->td, &dthr, NULL)) == 0) {
-        *retval = thd->exitval;
-        return APR_SUCCESS;
-    }
-    else {
-        return stat;
-    }
-}
-
-apr_status_t apr_thread_detach(apr_thread_t *thd)
-{
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_thread_data_get(void **data, const char *key,
-                                             apr_thread_t *thread)
-{
-    if (thread != NULL) {
-            return apr_pool_userdata_get(data, key, thread->pool);
-    }
-    else {
-        data = NULL;
-        return APR_ENOTHREAD;
-    }
-}
-
-apr_status_t apr_thread_data_set(void *data, const char *key,
-                              apr_status_t (*cleanup) (void *),
-                              apr_thread_t *thread)
-{
-    if (thread != NULL) {
-       return apr_pool_userdata_set(data, key, cleanup, thread->pool);
-    }
-    else {
-        data = NULL;
-        return APR_ENOTHREAD;
-    }
-}
-
-APR_DECLARE(apr_status_t) apr_os_thread_get(apr_os_thread_t **thethd,
-                                            apr_thread_t *thd)
-{
-    if (thd == NULL) {
-        return APR_ENOTHREAD;
-    }
-    *thethd = &(thd->td);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_thread_put(apr_thread_t **thd,
-                                            apr_os_thread_t *thethd,
-                                            apr_pool_t *pool)
-{
-    if (pool == NULL) {
-        return APR_ENOPOOL;
-    }
-    if ((*thd) == NULL) {
-        (*thd) = (apr_thread_t *)apr_palloc(pool, sizeof(apr_thread_t));
-        (*thd)->pool = pool;
-    }
-    (*thd)->td = *thethd;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_once_init(apr_thread_once_t **control,
-                                               apr_pool_t *p)
-{
-    (*control) = apr_pcalloc(p, sizeof(**control));
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_once(apr_thread_once_t *control,
-                                          void (*func)(void))
-{
-    if (!atomic_xchg(&control->value, 1)) {
-        func();
-    }
-    return APR_SUCCESS;
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(thread)
-
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/netware/threadpriv.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/netware/threadpriv.c
deleted file mode 100644
index 54680a56..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/netware/threadpriv.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_portable.h"
-#include "apr_arch_threadproc.h"
-
-apr_status_t apr_threadkey_private_create(apr_threadkey_t **key, 
-                                        void (*dest)(void *), apr_pool_t *pool) 
-{
-    apr_status_t stat;
-    
-    (*key) = (apr_threadkey_t *)apr_palloc(pool, sizeof(apr_threadkey_t));
-	if ((*key) == NULL) {
-        return APR_ENOMEM;
-    }
-
-    (*key)->pool = pool;
-
-    if ((stat = NXKeyCreate(NULL, dest, &(*key)->key)) == 0) {
-        return stat;
-    }
-    return stat;
-}
-
-apr_status_t apr_threadkey_private_get(void **new, apr_threadkey_t *key)
-{
-    apr_status_t stat;
-    
-    if ((stat = NXKeyGetValue(key->key, new)) == 0) {
-        return APR_SUCCESS;
-    }
-    else {
-        return stat;    
-    }
-}
-
-apr_status_t apr_threadkey_private_set(void *priv, apr_threadkey_t *key)
-{
-    apr_status_t stat;
-    if ((stat = NXKeySetValue(key->key, priv)) == 0) {
-        return APR_SUCCESS;
-    }
-    else {
-        return stat;
-    }
-}
-
-apr_status_t apr_threadkey_private_delete(apr_threadkey_t *key)
-{
-    apr_status_t stat;
-    if ((stat = NXKeyDelete(key->key)) == 0) {
-        return APR_SUCCESS; 
-    }
-    return stat;
-}
-
-apr_status_t apr_threadkey_data_get(void **data, const char *key, apr_threadkey_t *threadkey)
-{
-    return apr_pool_userdata_get(data, key, threadkey->pool);
-}
-
-apr_status_t apr_threadkey_data_set(void *data,
-                                 const char *key, apr_status_t (*cleanup) (void *),
-                                 apr_threadkey_t *threadkey)
-{
-    return apr_pool_userdata_set(data, key, cleanup, threadkey->pool);
-}
-
-apr_status_t apr_os_threadkey_get(apr_os_threadkey_t *thekey,
-                                               apr_threadkey_t *key)
-{
-    thekey = &(key->key);
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_os_threadkey_put(apr_threadkey_t **key, 
-                                apr_os_threadkey_t *thekey, apr_pool_t *pool)
-{
-    if (pool == NULL) {
-        return APR_ENOPOOL;
-    }
-    if ((*key) == NULL) {
-        (*key) = (apr_threadkey_t *)apr_palloc(pool, sizeof(apr_threadkey_t));
-        (*key)->pool = pool;
-    }
-    (*key)->key = *thekey;
-    return APR_SUCCESS;
-}           
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/Makefile.in
deleted file mode 100644
index 3cc12ad7..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = \
-	proc.lo \
-	thread.lo \
-	threadpriv.lo \
-	signals.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-OSDIR=$(INCDIR)/arch/@OSDIR@
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/proc.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/proc.c
deleted file mode 100644
index d57df5ea..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/proc.c
+++ /dev/null
@@ -1,605 +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.
- */
-
-#define INCL_DOS
-#define INCL_DOSERRORS
-
-#include "apr_arch_threadproc.h"
-#include "apr_arch_file_io.h"
-#include "apr_private.h"
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_portable.h"
-#include "apr_strings.h"
-#include "apr_signal.h"
-#include <signal.h>
-#include <string.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <process.h>
-#include <stdlib.h>
-
-APR_DECLARE(apr_status_t) apr_procattr_create(apr_procattr_t **new, apr_pool_t *pool)
-{
-    (*new) = (apr_procattr_t *)apr_palloc(pool, 
-              sizeof(apr_procattr_t));
-
-    if ((*new) == NULL) {
-        return APR_ENOMEM;
-    }
-    (*new)->pool = pool;
-    (*new)->parent_in = NULL;
-    (*new)->child_in = NULL;
-    (*new)->parent_out = NULL;
-    (*new)->child_out = NULL;
-    (*new)->parent_err = NULL;
-    (*new)->child_err = NULL;
-    (*new)->currdir = NULL; 
-    (*new)->cmdtype = APR_PROGRAM;
-    (*new)->detached = FALSE;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr, apr_int32_t in, 
-                                              apr_int32_t out, apr_int32_t err)
-{
-    apr_status_t stat;
-    if (in) {
-        if ((stat = apr_file_pipe_create(&attr->child_in, &attr->parent_in,
-                                   attr->pool)) != APR_SUCCESS) {
-            return stat;
-        }
-        switch (in) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_in, 0);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_in, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(attr->child_in, 0);
-            apr_file_pipe_timeout_set(attr->parent_in, 0);
-        }
-    } 
-    if (out) {
-        if ((stat = apr_file_pipe_create(&attr->parent_out, &attr->child_out,
-                                   attr->pool)) != APR_SUCCESS) {
-            return stat;
-        }
-        switch (out) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_out, 0);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_out, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(attr->child_out, 0);
-            apr_file_pipe_timeout_set(attr->parent_out, 0);
-        }
-    } 
-    if (err) {
-        if ((stat = apr_file_pipe_create(&attr->parent_err, &attr->child_err,
-                                   attr->pool)) != APR_SUCCESS) {
-            return stat;
-        }
-        switch (err) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_err, 0);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_err, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(attr->child_err, 0);
-            apr_file_pipe_timeout_set(attr->parent_err, 0);
-        }
-    } 
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_child_in_set(apr_procattr_t *attr, apr_file_t *child_in,
-                                                    apr_file_t *parent_in)
-{
-    if (attr->child_in == NULL && attr->parent_in == NULL)
-        apr_file_pipe_create(&attr->child_in, &attr->parent_in, attr->pool);
-
-    if (child_in != NULL)
-        apr_file_dup(&attr->child_in, child_in, attr->pool);
-
-    if (parent_in != NULL)
-        apr_file_dup(&attr->parent_in, parent_in, attr->pool);
-
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_procattr_child_out_set(apr_procattr_t *attr, apr_file_t *child_out,
-                                                     apr_file_t *parent_out)
-{
-    if (attr->child_out == NULL && attr->parent_out == NULL)
-        apr_file_pipe_create(&attr->child_out, &attr->parent_out, attr->pool);
-
-    if (child_out != NULL)
-        apr_file_dup(&attr->child_out, child_out, attr->pool);
-
-    if (parent_out != NULL)
-        apr_file_dup(&attr->parent_out, parent_out, attr->pool);
-
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_procattr_child_err_set(apr_procattr_t *attr, apr_file_t *child_err,
-                                                     apr_file_t *parent_err)
-{
-    if (attr->child_err == NULL && attr->parent_err == NULL)
-        apr_file_pipe_create(&attr->child_err, &attr->parent_err, attr->pool);
-
-    if (child_err != NULL)
-        apr_file_dup(&attr->child_err, child_err, attr->pool);
-
-    if (parent_err != NULL)
-        apr_file_dup(&attr->parent_err, parent_err, attr->pool);
-
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_procattr_dir_set(apr_procattr_t *attr, const char *dir)
-{
-    attr->currdir = apr_pstrdup(attr->pool, dir);
-    if (attr->currdir) {
-        return APR_SUCCESS;
-    }
-    return APR_ENOMEM;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_cmdtype_set(apr_procattr_t *attr,
-                                                   apr_cmdtype_e cmd) 
-{
-    attr->cmdtype = cmd;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_detach_set(apr_procattr_t *attr, apr_int32_t detach) 
-{
-    attr->detached = detach;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_fork(apr_proc_t *proc, apr_pool_t *pool)
-{
-    int pid;
-    
-    if ((pid = fork()) < 0) {
-        return errno;
-    }
-    else if (pid == 0) {
-        proc->pid = pid;
-        proc->in = NULL; 
-        proc->out = NULL; 
-        proc->err = NULL; 
-        return APR_INCHILD;
-    }
-    proc->pid = pid;
-    proc->in = NULL; 
-    proc->out = NULL; 
-    proc->err = NULL; 
-    return APR_INPARENT;
-}
-
-
-
-/* quotes in the string are doubled up.
- * Used to escape quotes in args passed to OS/2's cmd.exe
- */
-static char *double_quotes(apr_pool_t *pool, const char *str)
-{
-    int num_quotes = 0;
-    int len = 0;
-    char *quote_doubled_str, *dest;
-    
-    while (str[len]) {
-        num_quotes += str[len++] == '\"';
-    }
-    
-    quote_doubled_str = apr_palloc(pool, len + num_quotes + 1);
-    dest = quote_doubled_str;
-    
-    while (*str) {
-        if (*str == '\"')
-            *(dest++) = '\"';
-        *(dest++) = *(str++);
-    }
-    
-    *dest = 0;
-    return quote_doubled_str;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_procattr_child_errfn_set(apr_procattr_t *attr,
-                                                       apr_child_errfn_t *errfn)
-{
-    /* won't ever be called on this platform, so don't save the function pointer */
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_procattr_error_check_set(apr_procattr_t *attr,
-                                                       apr_int32_t chk)
-{
-    /* won't ever be used on this platform, so don't save the flag */
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_addrspace_set(apr_procattr_t *attr,
-                                                       apr_int32_t addrspace)
-{
-    /* won't ever be used on this platform, so don't save the flag */
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *proc, const char *progname,
-                                          const char * const *args,
-                                          const char * const *env,
-                                          apr_procattr_t *attr, apr_pool_t *pool)
-{
-    int i, arg, numargs, cmdlen;
-    apr_status_t status;
-    const char **newargs;
-    char savedir[300];
-    HFILE save_in, save_out, save_err, dup;
-    int criticalsection = FALSE;
-    char *extension, *newprogname, *extra_arg = NULL, *cmdline, *cmdline_pos;
-    char interpreter[1024];
-    char error_object[260];
-    apr_file_t *progfile;
-    int env_len, e;
-    char *env_block, *env_block_pos;
-    RESULTCODES rescodes;
-
-    /* Prevent other threads from running while these process-wide resources are modified */
-    if (attr->child_in || attr->child_out || attr->child_err || attr->currdir) {
-        criticalsection = TRUE;
-        DosEnterCritSec();
-    }
-
-    if (attr->child_in) {
-        save_in = -1;
-        DosDupHandle(STDIN_FILENO, &save_in);
-        dup = STDIN_FILENO;
-        DosDupHandle(attr->child_in->filedes, &dup);
-        DosSetFHState(attr->parent_in->filedes, OPEN_FLAGS_NOINHERIT);
-    }
-    
-    if (attr->child_out) {
-        save_out = -1;
-        DosDupHandle(STDOUT_FILENO, &save_out);
-        dup = STDOUT_FILENO;
-        DosDupHandle(attr->child_out->filedes, &dup);
-        DosSetFHState(attr->parent_out->filedes, OPEN_FLAGS_NOINHERIT);
-    }
-    
-    if (attr->child_err) {
-        save_err = -1;
-        DosDupHandle(STDERR_FILENO, &save_err);
-        dup = STDERR_FILENO;
-        DosDupHandle(attr->child_err->filedes, &dup);
-        DosSetFHState(attr->parent_err->filedes, OPEN_FLAGS_NOINHERIT);
-    }
-
-    apr_signal(SIGCHLD, SIG_DFL); /*not sure if this is needed or not */
-
-    if (attr->currdir != NULL) {
-        _getcwd2(savedir, sizeof(savedir));
-        
-        if (_chdir2(attr->currdir) < 0) {
-            if (criticalsection)
-                DosExitCritSec();
-            return errno;
-        }
-    }
-
-    interpreter[0] = 0;
-    extension = strrchr(progname, '.');
-
-    if (extension == NULL || strchr(extension, '/') || strchr(extension, '\\'))
-        extension = "";
-
-    /* ### how to handle APR_PROGRAM_ENV and APR_PROGRAM_PATH? */
-
-    if (attr->cmdtype == APR_SHELLCMD ||
-        attr->cmdtype == APR_SHELLCMD_ENV ||
-        strcasecmp(extension, ".cmd") == 0) {
-        strcpy(interpreter, "#!" SHELL_PATH);
-        extra_arg = "/C";
-    } else if (stricmp(extension, ".exe") != 0) {
-        status = apr_file_open(&progfile, progname, APR_READ|APR_BUFFERED, 0, pool);
-
-        if (status != APR_SUCCESS && APR_STATUS_IS_ENOENT(status)) {
-            progname = apr_pstrcat(pool, progname, ".exe", NULL);
-        }
-
-        if (status == APR_SUCCESS) {
-            status = apr_file_gets(interpreter, sizeof(interpreter), progfile);
-
-            if (status == APR_SUCCESS) {
-                if (interpreter[0] == '#' && interpreter[1] == '!') {
-                    /* delete CR/LF & any other whitespace off the end */
-                    int end = strlen(interpreter) - 1;
-
-                    while (end >= 0 && apr_isspace(interpreter[end])) {
-                        interpreter[end] = '\0';
-                        end--;
-                    }
-
-                    if (interpreter[2] != '/' && interpreter[2] != '\\' && interpreter[3] != ':') {
-                        char buffer[300];
-
-                        if (DosSearchPath(SEARCH_ENVIRONMENT, "PATH", interpreter+2, buffer, sizeof(buffer)) == 0) {
-                            strcpy(interpreter+2, buffer);
-                        } else {
-                            strcat(interpreter, ".exe");
-                            if (DosSearchPath(SEARCH_ENVIRONMENT, "PATH", interpreter+2, buffer, sizeof(buffer)) == 0) {
-                                strcpy(interpreter+2, buffer);
-                            }
-                        }
-                    }
-                } else {
-                    interpreter[0] = 0;
-                }
-            }
-
-            apr_file_close(progfile);
-        }
-    }
-
-    i = 0;
-
-    while (args && args[i]) {
-        i++;
-    }
-
-    newargs = (const char **)apr_palloc(pool, sizeof (char *) * (i + 4));
-    numargs = 0;
-
-    if (interpreter[0])
-        newargs[numargs++] = interpreter + 2;
-    if (extra_arg)
-        newargs[numargs++] = "/c";
-
-    newargs[numargs++] = newprogname = apr_pstrdup(pool, progname);
-    arg = 1;
-
-    while (args && args[arg]) {
-        newargs[numargs++] = args[arg++];
-    }
-
-    newargs[numargs] = NULL;
-
-    for (i=0; newprogname[i]; i++)
-        if (newprogname[i] == '/')
-            newprogname[i] = '\\';
-
-    cmdlen = 0;
-
-    for (i=0; i<numargs; i++)
-        cmdlen += strlen(newargs[i]) + 3;
-
-    cmdline = apr_palloc(pool, cmdlen + 2);
-    cmdline_pos = cmdline;
-
-    for (i=0; i<numargs; i++) {
-        const char *a = newargs[i];
-
-        if (strpbrk(a, "&|<>\" "))
-            a = apr_pstrcat(pool, "\"", double_quotes(pool, a), "\"", NULL);
-
-        if (i)
-            *(cmdline_pos++) = ' ';
-
-        strcpy(cmdline_pos, a);
-        cmdline_pos += strlen(cmdline_pos);
-    }
-
-    *(++cmdline_pos) = 0; /* Add required second terminator */
-    cmdline_pos = strchr(cmdline, ' ');
-
-    if (cmdline_pos) {
-        *cmdline_pos = 0;
-        cmdline_pos++;
-    }
-
-    /* Create environment block from list of envariables */
-    if (env) {
-        for (env_len=1, e=0; env[e]; e++)
-            env_len += strlen(env[e]) + 1;
-
-        env_block = apr_palloc(pool, env_len);
-        env_block_pos = env_block;
-
-        for (e=0; env[e]; e++) {
-            strcpy(env_block_pos, env[e]);
-            env_block_pos += strlen(env_block_pos) + 1;
-        }
-
-        *env_block_pos = 0; /* environment block is terminated by a double null */
-    } else
-        env_block = NULL;
-
-    status = DosExecPgm(error_object, sizeof(error_object),
-                        attr->detached ? EXEC_BACKGROUND : EXEC_ASYNCRESULT,
-                        cmdline, env_block, &rescodes, cmdline);
-
-    proc->pid = rescodes.codeTerminate;
-
-    if (attr->currdir != NULL) {
-        chdir(savedir);
-    }
-
-    if (attr->child_in) {
-        apr_file_close(attr->child_in);
-        dup = STDIN_FILENO;
-        DosDupHandle(save_in, &dup);
-        DosClose(save_in);
-    }
-    
-    if (attr->child_out) {
-        apr_file_close(attr->child_out);
-        dup = STDOUT_FILENO;
-        DosDupHandle(save_out, &dup);
-        DosClose(save_out);
-    }
-    
-    if (attr->child_err) {
-        apr_file_close(attr->child_err);
-        dup = STDERR_FILENO;
-        DosDupHandle(save_err, &dup);
-        DosClose(save_err);
-    }
-
-    if (criticalsection)
-        DosExitCritSec();
-
-    proc->in = attr->parent_in;
-    proc->err = attr->parent_err;
-    proc->out = attr->parent_out;
-    return status;
-}
-
-
-
-static void proces_result_codes(RESULTCODES codes, 
-                                int *exitcode, 
-                                apr_exit_why_e *exitwhy)
-{
-    int result = 0;
-    apr_exit_why_e why = APR_PROC_EXIT;
-
-    switch (codes.codeTerminate) {
-    case TC_EXIT:        /* Normal exit */
-        why = APR_PROC_EXIT;
-        result = codes.codeResult;
-        break;
-
-    case TC_HARDERROR:   /* Hard error halt */
-        why = APR_PROC_SIGNAL;
-        result = SIGSYS;
-        break;
-
-    case TC_KILLPROCESS: /* Was killed by a DosKillProcess() */
-        why = APR_PROC_SIGNAL;
-        result = SIGKILL;
-        break;
-
-    case TC_TRAP:        /* TRAP in 16 bit code */
-    case TC_EXCEPTION:   /* Threw an exception (32 bit code) */
-        why = APR_PROC_SIGNAL;
-
-        switch (codes.codeResult | XCPT_FATAL_EXCEPTION) {
-        case XCPT_ACCESS_VIOLATION:
-            result = SIGSEGV;
-            break;
-
-        case XCPT_ILLEGAL_INSTRUCTION:
-            result = SIGILL;
-            break;
-
-        case XCPT_FLOAT_DIVIDE_BY_ZERO:
-        case XCPT_INTEGER_DIVIDE_BY_ZERO:
-            result = SIGFPE;
-            break;
-
-        default:
-            result = codes.codeResult;
-            break;
-        }
-    }
-
-    if (exitcode) {
-        *exitcode = result;
-    }
-
-    if (exitwhy) {
-        *exitwhy = why;
-    }
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_proc_wait_all_procs(apr_proc_t *proc,
-                                                  int *exitcode,
-                                                  apr_exit_why_e *exitwhy,
-                                                  apr_wait_how_e waithow,
-                                                  apr_pool_t *p)
-{
-    RESULTCODES codes;
-    ULONG rc;
-    PID pid;
-
-    rc = DosWaitChild(DCWA_PROCESSTREE, waithow == APR_WAIT ? DCWW_WAIT : DCWW_NOWAIT, &codes, &pid, 0);
-
-    if (rc == 0) {
-        proc->pid = pid;
-        proces_result_codes(codes, exitcode, exitwhy);
-        return APR_CHILD_DONE;
-    } else if (rc == ERROR_CHILD_NOT_COMPLETE) {
-        return APR_CHILD_NOTDONE;
-    }
-
-    return APR_OS2_STATUS(rc);
-} 
-
-
-
-APR_DECLARE(apr_status_t) apr_proc_wait(apr_proc_t *proc,
-                                        int *exitcode, apr_exit_why_e *exitwhy,
-                                        apr_wait_how_e waithow)
-{
-    RESULTCODES codes;
-    ULONG rc;
-    PID pid;
-    rc = DosWaitChild(DCWA_PROCESS, waithow == APR_WAIT ? DCWW_WAIT : DCWW_NOWAIT, &codes, &pid, proc->pid);
-
-    if (rc == 0) {
-        proces_result_codes(codes, exitcode, exitwhy);
-        return APR_CHILD_DONE;
-    } else if (rc == ERROR_CHILD_NOT_COMPLETE) {
-        return APR_CHILD_NOTDONE;
-    }
-
-    return APR_OS2_STATUS(rc);
-} 
-
-
-
-APR_DECLARE(apr_status_t) apr_proc_detach(int daemonize)
-{
-    return APR_ENOTIMPL;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/signals.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/signals.c
deleted file mode 100644
index e1727125..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/signals.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../unix/signals.c"
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/thread.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/thread.c
deleted file mode 100644
index e0f32561..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/thread.c
+++ /dev/null
@@ -1,259 +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.
- */
-
-#define INCL_DOSERRORS
-#define INCL_DOS
-#include "apr_arch_threadproc.h"
-#include "apr_thread_proc.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_portable.h"
-#include "apr_arch_file_io.h"
-#include <stdlib.h>
-
-APR_DECLARE(apr_status_t) apr_threadattr_create(apr_threadattr_t **new, apr_pool_t *pool)
-{
-    (*new) = (apr_threadattr_t *)apr_palloc(pool, sizeof(apr_threadattr_t));
-
-    if ((*new) == NULL) {
-        return APR_ENOMEM;
-    }
-
-    (*new)->pool = pool;
-    (*new)->attr = 0;
-    (*new)->stacksize = 0;
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_threadattr_detach_set(apr_threadattr_t *attr, apr_int32_t on)
-{
-    attr->attr |= APR_THREADATTR_DETACHED;
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_threadattr_detach_get(apr_threadattr_t *attr)
-{
-    return (attr->attr & APR_THREADATTR_DETACHED) ? APR_DETACH : APR_NOTDETACH;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_threadattr_stacksize_set(apr_threadattr_t *attr,
-                                                       apr_size_t stacksize)
-{
-    attr->stacksize = stacksize;
-    return APR_SUCCESS;
-}
-
-
-
-static void apr_thread_begin(void *arg)
-{
-  apr_thread_t *thread = (apr_thread_t *)arg;
-  thread->exitval = thread->func(thread, thread->data);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_create(apr_thread_t **new, apr_threadattr_t *attr, 
-                                            apr_thread_start_t func, void *data, 
-                                            apr_pool_t *pool)
-{
-    apr_status_t stat;
-    apr_thread_t *thread;
- 
-    thread = (apr_thread_t *)apr_palloc(pool, sizeof(apr_thread_t));
-    *new = thread;
-
-    if (thread == NULL) {
-        return APR_ENOMEM;
-    }
-
-    thread->pool = pool;
-    thread->attr = attr;
-    thread->func = func;
-    thread->data = data;
-    stat = apr_pool_create(&thread->pool, pool);
-    
-    if (stat != APR_SUCCESS) {
-        return stat;
-    }
-
-    if (attr == NULL) {
-        stat = apr_threadattr_create(&thread->attr, thread->pool);
-        
-        if (stat != APR_SUCCESS) {
-            return stat;
-        }
-    }
-
-    thread->tid = _beginthread(apr_thread_begin, NULL,
-                               thread->attr->stacksize > 0 ?
-                               thread->attr->stacksize : APR_THREAD_STACKSIZE,
-                               thread);
-        
-    if (thread->tid < 0) {
-        return errno;
-    }
-
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_os_thread_t) apr_os_thread_current()
-{
-    PIB *ppib;
-    TIB *ptib;
-    DosGetInfoBlocks(&ptib, &ppib);
-    return ptib->tib_ptib2->tib2_ultid;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_exit(apr_thread_t *thd, apr_status_t retval)
-{
-    thd->exitval = retval;
-    _endthread();
-    return -1; /* If we get here something's wrong */
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_join(apr_status_t *retval, apr_thread_t *thd)
-{
-    ULONG rc;
-    TID waittid = thd->tid;
-
-    if (thd->attr->attr & APR_THREADATTR_DETACHED)
-        return APR_EINVAL;
-
-    rc = DosWaitThread(&waittid, DCWW_WAIT);
-
-    if (rc == ERROR_INVALID_THREADID)
-        rc = 0; /* Thread had already terminated */
-
-    *retval = thd->exitval;
-    return APR_OS2_STATUS(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_detach(apr_thread_t *thd)
-{
-    thd->attr->attr |= APR_THREADATTR_DETACHED;
-    return APR_SUCCESS;
-}
-
-
-
-void apr_thread_yield()
-{
-    DosSleep(0);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_os_thread_get(apr_os_thread_t **thethd, apr_thread_t *thd)
-{
-    *thethd = &thd->tid;
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_os_thread_put(apr_thread_t **thd, apr_os_thread_t *thethd, 
-                                            apr_pool_t *pool)
-{
-    if ((*thd) == NULL) {
-        (*thd) = (apr_thread_t *)apr_pcalloc(pool, sizeof(apr_thread_t));
-        (*thd)->pool = pool;
-    }
-    (*thd)->tid = *thethd;
-    return APR_SUCCESS;
-}
-
-
-
-int apr_os_thread_equal(apr_os_thread_t tid1, apr_os_thread_t tid2)
-{
-    return tid1 == tid2;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_data_get(void **data, const char *key, apr_thread_t *thread)
-{
-    return apr_pool_userdata_get(data, key, thread->pool);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_data_set(void *data, const char *key,
-                                              apr_status_t (*cleanup) (void *),
-                                              apr_thread_t *thread)
-{
-    return apr_pool_userdata_set(data, key, cleanup, thread->pool);
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(thread)
-
-
-
-static apr_status_t thread_once_cleanup(void *vcontrol)
-{
-    apr_thread_once_t *control = (apr_thread_once_t *)vcontrol;
-
-    if (control->sem) {
-        DosCloseEventSem(control->sem);
-    }
-
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_once_init(apr_thread_once_t **control,
-                                               apr_pool_t *p)
-{
-    ULONG rc;
-    *control = (apr_thread_once_t *)apr_pcalloc(p, sizeof(apr_thread_once_t));
-    rc = DosCreateEventSem(NULL, &(*control)->sem, 0, TRUE);
-    apr_pool_cleanup_register(p, control, thread_once_cleanup, apr_pool_cleanup_null);
-    return APR_FROM_OS_ERROR(rc);
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_thread_once(apr_thread_once_t *control, 
-                                          void (*func)(void))
-{
-    if (!control->hit) {
-        ULONG count, rc;
-        rc = DosResetEventSem(control->sem, &count);
-
-        if (rc == 0 && count) {
-            control->hit = 1;
-            func();
-        }
-    }
-
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/threadpriv.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/threadpriv.c
deleted file mode 100644
index 107ec10d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/os2/threadpriv.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_threadproc.h"
-#include "apr_thread_proc.h"
-#include "apr_portable.h"
-#include "apr_general.h"
-#include "apr_errno.h"
-#include "apr_lib.h"
-#include "apr_arch_file_io.h"
-
-APR_DECLARE(apr_status_t) apr_threadkey_private_create(apr_threadkey_t **key,
-                                                       void (*dest)(void *), 
-                                                       apr_pool_t *pool)
-{
-    (*key) = (apr_threadkey_t *)apr_palloc(pool, sizeof(apr_threadkey_t));
-
-    if ((*key) == NULL) {
-        return APR_ENOMEM;
-    }
-
-    (*key)->pool = pool;
-    return APR_OS2_STATUS(DosAllocThreadLocalMemory(1, &((*key)->key)));
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_private_get(void **new, apr_threadkey_t *key)
-{
-    (*new) = (void *)*(key->key);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_private_set(void *priv, apr_threadkey_t *key)
-{
-    *(key->key) = (ULONG)priv;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_private_delete(apr_threadkey_t *key)
-{
-    return APR_OS2_STATUS(DosFreeThreadLocalMemory(key->key));
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_data_get(void **data, const char *key,
-                                                 apr_threadkey_t *threadkey)
-{
-    return apr_pool_userdata_get(data, key, threadkey->pool);
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_data_set(void *data, const char *key,
-                                                 apr_status_t (*cleanup) (void *),
-                                                 apr_threadkey_t *threadkey)
-{
-    return apr_pool_userdata_set(data, key, cleanup, threadkey->pool);
-}
-
-APR_DECLARE(apr_status_t) apr_os_threadkey_get(apr_os_threadkey_t *thekey, apr_threadkey_t *key)
-{
-    *thekey = key->key;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_threadkey_put(apr_threadkey_t **key, 
-                                               apr_os_threadkey_t *thekey, 
-                                               apr_pool_t *pool)
-{
-    if (pool == NULL) {
-        return APR_ENOPOOL;
-    }
-    if ((*key) == NULL) {
-        (*key) = (apr_threadkey_t *)apr_pcalloc(pool, sizeof(apr_threadkey_t));
-        (*key)->pool = pool;
-    }
-    (*key)->key = *thekey;
-    return APR_SUCCESS;
-}           
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/.libs/proc.o b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/.libs/proc.o
deleted file mode 100644
index 9a795914..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/.libs/proc.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/.libs/procsup.o b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/.libs/procsup.o
deleted file mode 100644
index 03fb0822..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/.libs/procsup.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/.libs/signals.o b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/.libs/signals.o
deleted file mode 100644
index 789e6422..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/.libs/signals.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/.libs/thread.o b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/.libs/thread.o
deleted file mode 100644
index 211dc25d..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/.libs/thread.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/.libs/threadpriv.o b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/.libs/threadpriv.o
deleted file mode 100644
index 5501d35c..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/.libs/threadpriv.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/Makefile
deleted file mode 100644
index 858cde55..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-srcdir = .
-
-
-TARGETS = \
-	proc.lo \
-	procsup.lo \
-	thread.lo \
-	threadpriv.lo \
-	signals.lo
-
-# bring in rules.mk for standard functionality
-include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
-
-INCDIR=../../include
-DEFOSDIR=$(INCDIR)/arch/unix
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/Makefile.in
deleted file mode 100644
index 42aa6d1b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = \
-	proc.lo \
-	procsup.lo \
-	thread.lo \
-	threadpriv.lo \
-	signals.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/proc.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/proc.c
deleted file mode 100644
index 95e0bd21..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/proc.c
+++ /dev/null
@@ -1,624 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_threadproc.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include "apr_signal.h"
-
-APR_DECLARE(apr_status_t) apr_procattr_create(apr_procattr_t **new,
-                                              apr_pool_t *pool)
-{
-    (*new) = (apr_procattr_t *)apr_pcalloc(pool, sizeof(apr_procattr_t));
-
-    if ((*new) == NULL) {
-        return APR_ENOMEM;
-    }
-    (*new)->pool = pool;
-    (*new)->cmdtype = APR_PROGRAM;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr,
-                                              apr_int32_t in,
-                                              apr_int32_t out,
-                                              apr_int32_t err)
-{
-    apr_status_t status;
-    if (in != 0) {
-        if ((status = apr_file_pipe_create(&attr->child_in, &attr->parent_in,
-                                           attr->pool)) != APR_SUCCESS) {
-            return status;
-        }
-
-        switch (in) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_in, 0);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_in, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(attr->child_in, 0);
-            apr_file_pipe_timeout_set(attr->parent_in, 0);
-        }
-    }
-
-    if (out) {
-        if ((status = apr_file_pipe_create(&attr->parent_out, &attr->child_out,
-                                           attr->pool)) != APR_SUCCESS) {
-            return status;
-        }
-
-        switch (out) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_out, 0);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_out, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(attr->child_out, 0);
-            apr_file_pipe_timeout_set(attr->parent_out, 0);
-        }
-    }
-
-    if (err) {
-        if ((status = apr_file_pipe_create(&attr->parent_err, &attr->child_err,
-                                           attr->pool)) != APR_SUCCESS) {
-            return status;
-        }
-
-        switch (err) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_err, 0);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_err, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(attr->child_err, 0);
-            apr_file_pipe_timeout_set(attr->parent_err, 0);
-        }
-    }
-
-    return APR_SUCCESS;
-}
-
-
-APR_DECLARE(apr_status_t) apr_procattr_child_in_set(apr_procattr_t *attr,
-                                                    apr_file_t *child_in,
-                                                    apr_file_t *parent_in)
-{
-    apr_status_t rv = APR_SUCCESS;
-
-    if (attr->child_in == NULL && attr->parent_in == NULL)
-        rv = apr_file_pipe_create(&attr->child_in, &attr->parent_in, attr->pool);
-    
-    if (child_in != NULL && rv == APR_SUCCESS)
-        rv = apr_file_dup2(attr->child_in, child_in, attr->pool);
-
-    if (parent_in != NULL && rv == APR_SUCCESS)
-        rv = apr_file_dup2(attr->parent_in, parent_in, attr->pool);
-
-    return rv;
-}
-
-
-APR_DECLARE(apr_status_t) apr_procattr_child_out_set(apr_procattr_t *attr,
-                                                     apr_file_t *child_out,
-                                                     apr_file_t *parent_out)
-{
-    apr_status_t rv = APR_SUCCESS;
-
-    if (attr->child_out == NULL && attr->parent_out == NULL)
-        rv = apr_file_pipe_create(&attr->child_out, &attr->parent_out, attr->pool);
-
-    if (child_out != NULL && rv == APR_SUCCESS)
-        rv = apr_file_dup2(attr->child_out, child_out, attr->pool);
-
-    if (parent_out != NULL && rv == APR_SUCCESS)
-        rv = apr_file_dup2(attr->parent_out, parent_out, attr->pool);
-
-    return rv;
-}
-
-
-APR_DECLARE(apr_status_t) apr_procattr_child_err_set(apr_procattr_t *attr,
-                                                     apr_file_t *child_err,
-                                                     apr_file_t *parent_err)
-{
-    apr_status_t rv = APR_SUCCESS;
-
-    if (attr->child_err == NULL && attr->parent_err == NULL)
-        rv = apr_file_pipe_create(&attr->child_err, &attr->parent_err, attr->pool);
-
-    if (child_err != NULL && rv == APR_SUCCESS)
-        rv = apr_file_dup2(attr->child_err, child_err, attr->pool);
-
-    if (parent_err != NULL && rv == APR_SUCCESS)
-        rv = apr_file_dup2(attr->parent_err, parent_err, attr->pool);
-
-    return rv;
-}
-
-
-APR_DECLARE(apr_status_t) apr_procattr_dir_set(apr_procattr_t *attr,
-                                               const char *dir)
-{
-    attr->currdir = apr_pstrdup(attr->pool, dir);
-    if (attr->currdir) {
-        return APR_SUCCESS;
-    }
-
-    return APR_ENOMEM;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_cmdtype_set(apr_procattr_t *attr,
-                                                   apr_cmdtype_e cmd)
-{
-    attr->cmdtype = cmd;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_detach_set(apr_procattr_t *attr,
-                                                  apr_int32_t detach)
-{
-    attr->detached = detach;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_fork(apr_proc_t *proc, apr_pool_t *pool)
-{
-    int pid;
-
-    if ((pid = fork()) < 0) {
-        return errno;
-    }
-    else if (pid == 0) {
-        proc->pid = pid;
-        proc->in = NULL;
-        proc->out = NULL;
-        proc->err = NULL;
-
-        return APR_INCHILD;
-    }
-
-    proc->pid = pid;
-    proc->in = NULL;
-    proc->out = NULL;
-    proc->err = NULL;
-
-    return APR_INPARENT;
-}
-
-static apr_status_t limit_proc(apr_procattr_t *attr)
-{
-#if APR_HAVE_STRUCT_RLIMIT && APR_HAVE_SETRLIMIT
-#ifdef RLIMIT_CPU
-    if (attr->limit_cpu != NULL) {
-        if ((setrlimit(RLIMIT_CPU, attr->limit_cpu)) != 0) {
-            return errno;
-        }
-    }
-#endif
-#ifdef RLIMIT_NPROC
-    if (attr->limit_nproc != NULL) {
-        if ((setrlimit(RLIMIT_NPROC, attr->limit_nproc)) != 0) {
-            return errno;
-        }
-    }
-#endif
-#ifdef RLIMIT_NOFILE
-    if (attr->limit_nofile != NULL) {
-        if ((setrlimit(RLIMIT_NOFILE, attr->limit_nofile)) != 0) {
-            return errno;
-        }
-    }
-#endif
-#if defined(RLIMIT_AS)
-    if (attr->limit_mem != NULL) {
-        if ((setrlimit(RLIMIT_AS, attr->limit_mem)) != 0) {
-            return errno;
-        }
-    }
-#elif defined(RLIMIT_DATA)
-    if (attr->limit_mem != NULL) {
-        if ((setrlimit(RLIMIT_DATA, attr->limit_mem)) != 0) {
-            return errno;
-        }
-    }
-#elif defined(RLIMIT_VMEM)
-    if (attr->limit_mem != NULL) {
-        if ((setrlimit(RLIMIT_VMEM, attr->limit_mem)) != 0) {
-            return errno;
-        }
-    }
-#endif
-#else
-    /*
-     * Maybe make a note in error_log that setrlimit isn't supported??
-     */
-
-#endif
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_child_errfn_set(apr_procattr_t *attr,
-                                                       apr_child_errfn_t *errfn)
-{
-    attr->errfn = errfn;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_error_check_set(apr_procattr_t *attr,
-                                                       apr_int32_t chk)
-{
-    attr->errchk = chk;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_addrspace_set(apr_procattr_t *attr,
-                                                       apr_int32_t addrspace)
-{
-    /* won't ever be used on this platform, so don't save the flag */
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new,
-                                          const char *progname,
-                                          const char * const *args,
-                                          const char * const *env,
-                                          apr_procattr_t *attr,
-                                          apr_pool_t *pool)
-{
-    int i;
-    const char * const empty_envp[] = {NULL};
-
-    if (!env) { /* Specs require an empty array instead of NULL;
-                 * Purify will trigger a failure, even if many
-                 * implementations don't.
-                 */
-        env = empty_envp;
-    }
-
-    new->in = attr->parent_in;
-    new->err = attr->parent_err;
-    new->out = attr->parent_out;
-
-    if (attr->errchk) {
-        if (attr->currdir) {
-            if (access(attr->currdir, X_OK) == -1) {
-                /* chdir() in child wouldn't have worked */
-                return errno;
-            }
-        }
-
-        if (attr->cmdtype == APR_PROGRAM ||
-            attr->cmdtype == APR_PROGRAM_ENV ||
-            *progname == '/') {
-            /* for both of these values of cmdtype, caller must pass
-             * full path, so it is easy to check;
-             * caller can choose to pass full path for other
-             * values of cmdtype
-             */
-            if (access(progname, R_OK|X_OK) == -1) {
-                /* exec*() in child wouldn't have worked */
-                return errno;
-            }
-        }
-        else {
-            /* todo: search PATH for progname then try to access it */
-        }
-    }
-
-    if ((new->pid = fork()) < 0) {
-        return errno;
-    }
-    else if (new->pid == 0) {
-        int status;
-        /* child process */
-
-        /*
-         * If we do exec cleanup before the dup2() calls to set up pipes
-         * on 0-2, we accidentally close the pipes used by programs like
-         * mod_cgid.
-         *
-         * If we do exec cleanup after the dup2() calls, cleanup can accidentally
-         * close our pipes which replaced any files which previously had
-         * descriptors 0-2.
-         *
-         * The solution is to kill the cleanup for the pipes, then do
-         * exec cleanup, then do the dup2() calls.
-         */
-
-        if (attr->child_in) {
-            apr_pool_cleanup_kill(apr_file_pool_get(attr->child_in),
-                                  attr->child_in, apr_unix_file_cleanup);
-        }
-
-        if (attr->child_out) {
-            apr_pool_cleanup_kill(apr_file_pool_get(attr->child_out),
-                                  attr->child_out, apr_unix_file_cleanup);
-        }
-
-        if (attr->child_err) {
-            apr_pool_cleanup_kill(apr_file_pool_get(attr->child_err),
-                                  attr->child_err, apr_unix_file_cleanup);
-        }
-
-        apr_pool_cleanup_for_exec();
-
-        if (attr->child_in) {
-            apr_file_close(attr->parent_in);
-            dup2(attr->child_in->filedes, STDIN_FILENO);
-            apr_file_close(attr->child_in);
-        }
-
-        if (attr->child_out) {
-            apr_file_close(attr->parent_out);
-            dup2(attr->child_out->filedes, STDOUT_FILENO);
-            apr_file_close(attr->child_out);
-        }
-
-        if (attr->child_err) {
-            apr_file_close(attr->parent_err);
-            dup2(attr->child_err->filedes, STDERR_FILENO);
-            apr_file_close(attr->child_err);
-        }
-
-        apr_signal(SIGCHLD, SIG_DFL); /* not sure if this is needed or not */
-
-        if (attr->currdir != NULL) {
-            if (chdir(attr->currdir) == -1) {
-                if (attr->errfn) {
-                    attr->errfn(pool, errno, "change of working directory failed");
-                }
-                exit(-1);   /* We have big problems, the child should exit. */
-            }
-        }
-
-        if ((status = limit_proc(attr)) != APR_SUCCESS) {
-            if (attr->errfn) {
-                attr->errfn(pool, errno, "setting of resource limits failed");
-            }
-            exit(-1);   /* We have big problems, the child should exit. */
-        }
-
-        if (attr->cmdtype == APR_SHELLCMD ||
-            attr->cmdtype == APR_SHELLCMD_ENV) {
-            int onearg_len = 0;
-            const char *newargs[4];
-
-            newargs[0] = SHELL_PATH;
-            newargs[1] = "-c";
-
-            i = 0;
-            while (args[i]) {
-                onearg_len += strlen(args[i]);
-                onearg_len++; /* for space delimiter */
-                i++;
-            }
-
-            switch(i) {
-            case 0:
-                /* bad parameters; we're doomed */
-                break;
-            case 1:
-                /* no args, or caller already built a single string from
-                 * progname and args
-                 */
-                newargs[2] = args[0];
-                break;
-            default:
-            {
-                char *ch, *onearg;
-                
-                ch = onearg = apr_palloc(pool, onearg_len);
-                i = 0;
-                while (args[i]) {
-                    size_t len = strlen(args[i]);
-
-                    memcpy(ch, args[i], len);
-                    ch += len;
-                    *ch = ' ';
-                    ++ch;
-                    ++i;
-                }
-                --ch; /* back up to trailing blank */
-                *ch = '\0';
-                newargs[2] = onearg;
-            }
-            }
-
-            newargs[3] = NULL;
-
-            if (attr->detached) {
-                apr_proc_detach(APR_PROC_DETACH_DAEMONIZE);
-            }
-
-            if (attr->cmdtype == APR_SHELLCMD) {
-                execve(SHELL_PATH, (char * const *) newargs, (char * const *)env);
-            }
-            else {
-                execv(SHELL_PATH, (char * const *)newargs);
-            }
-        }
-        else if (attr->cmdtype == APR_PROGRAM) {
-            if (attr->detached) {
-                apr_proc_detach(APR_PROC_DETACH_DAEMONIZE);
-            }
-
-            execve(progname, (char * const *)args, (char * const *)env);
-        }
-        else if (attr->cmdtype == APR_PROGRAM_ENV) {
-            if (attr->detached) {
-                apr_proc_detach(APR_PROC_DETACH_DAEMONIZE);
-            }
-
-            execv(progname, (char * const *)args);
-        }
-        else {
-            /* APR_PROGRAM_PATH */
-            if (attr->detached) {
-                apr_proc_detach(APR_PROC_DETACH_DAEMONIZE);
-            }
-
-            execvp(progname, (char * const *)args);
-        }
-        if (attr->errfn) {
-            char *desc;
-
-            desc = apr_psprintf(pool, "exec of '%s' failed",
-                                progname);
-            attr->errfn(pool, errno, desc);
-        }
-
-        exit(-1);  /* if we get here, there is a problem, so exit with an
-                    * error code. */
-    }
-
-    /* Parent process */
-    if (attr->child_in) {
-        apr_file_close(attr->child_in);
-    }
-
-    if (attr->child_out) {
-        apr_file_close(attr->child_out);
-    }
-
-    if (attr->child_err) {
-        apr_file_close(attr->child_err);
-    }
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_wait_all_procs(apr_proc_t *proc,
-                                                  int *exitcode,
-                                                  apr_exit_why_e *exitwhy,
-                                                  apr_wait_how_e waithow,
-                                                  apr_pool_t *p)
-{
-    proc->pid = -1;
-    return apr_proc_wait(proc, exitcode, exitwhy, waithow);
-}
-
-APR_DECLARE(apr_status_t) apr_proc_wait(apr_proc_t *proc,
-                                        int *exitcode, apr_exit_why_e *exitwhy,
-                                        apr_wait_how_e waithow)
-{
-    pid_t pstatus;
-    int waitpid_options = WUNTRACED;
-    int exit_int;
-    int ignore;
-    apr_exit_why_e ignorewhy;
-
-    if (exitcode == NULL) {
-        exitcode = &ignore;
-    }
-
-    if (exitwhy == NULL) {
-        exitwhy = &ignorewhy;
-    }
-
-    if (waithow != APR_WAIT) {
-        waitpid_options |= WNOHANG;
-    }
-
-    do {
-        pstatus = waitpid(proc->pid, &exit_int, waitpid_options);
-    } while (pstatus < 0 && errno == EINTR);
-
-    if (pstatus > 0) {
-        proc->pid = pstatus;
-
-        if (WIFEXITED(exit_int)) {
-            *exitwhy = APR_PROC_EXIT;
-            *exitcode = WEXITSTATUS(exit_int);
-        }
-        else if (WIFSIGNALED(exit_int)) {
-            *exitwhy = APR_PROC_SIGNAL;
-
-#ifdef WCOREDUMP
-            if (WCOREDUMP(exit_int)) {
-                *exitwhy |= APR_PROC_SIGNAL_CORE;
-            }
-#endif
-
-            *exitcode = WTERMSIG(exit_int);
-        }
-        else {
-            /* unexpected condition */
-            return APR_EGENERAL;
-        }
-
-        return APR_CHILD_DONE;
-    }
-    else if (pstatus == 0) {
-        return APR_CHILD_NOTDONE;
-    }
-
-    return errno;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_limit_set(apr_procattr_t *attr,
-                                                 apr_int32_t what,
-                                                 struct rlimit *limit)
-{
-    switch(what) {
-        case APR_LIMIT_CPU:
-#ifdef RLIMIT_CPU
-            attr->limit_cpu = limit;
-            break;
-#else
-            return APR_ENOTIMPL;
-#endif
-
-        case APR_LIMIT_MEM:
-#if defined (RLIMIT_DATA) || defined (RLIMIT_VMEM) || defined(RLIMIT_AS)
-            attr->limit_mem = limit;
-            break;
-#else
-            return APR_ENOTIMPL;
-#endif
-
-        case APR_LIMIT_NPROC:
-#ifdef RLIMIT_NPROC
-            attr->limit_nproc = limit;
-            break;
-#else
-            return APR_ENOTIMPL;
-#endif
-
-        case APR_LIMIT_NOFILE:
-#ifdef RLIMIT_NOFILE
-            attr->limit_nofile = limit;
-            break;
-#else
-            return APR_ENOTIMPL;
-#endif
-
-    }
-
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/proc.lo b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/proc.lo
deleted file mode 100644
index 25a271a8..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/proc.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# proc.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/proc.o'
-
-# Name of the non-PIC object.
-non_pic_object='proc.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/proc.o b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/proc.o
deleted file mode 100644
index ee7cc330..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/proc.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/procsup.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/procsup.c
deleted file mode 100644
index e7b111bb..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/procsup.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_arch_threadproc.h"
-
-APR_DECLARE(apr_status_t) apr_proc_detach(int daemonize)
-{
-    int x;
-
-    chdir("/");
-#if !defined(MPE) && !defined(OS2) && !defined(TPF) && !defined(BEOS)
-    /* Don't detach for MPE because child processes can't survive the death of
-     * the parent. */
-    if (daemonize) {
-	    if ((x = fork()) > 0) {
-	        exit(0);
-        }
-	    else if (x == -1) {
-	        perror("fork");
-	        fprintf(stderr, "unable to fork new process\n");
-	        exit(1);  /* we can't do anything here, so just exit. */
-	    }
-	    /* RAISE_SIGSTOP(DETACH); */
-    }
-#endif
-
-#ifdef HAVE_SETSID
-    /* A setsid() failure is not fatal if we didn't just fork().
-     * The calling process may be the process group leader, in
-     * which case setsid() will fail with EPERM.
-     */
-    if (setsid() == -1 && daemonize) {
-        return errno;
-    }
-#elif defined(NEXT) || defined(NEWSOS)
-    if (setpgrp(0, getpid()) == -1) {
-        return errno;
-    }
-#elif defined(OS2) || defined(TPF) || defined(MPE)
-    /* do nothing */
-#else
-    if (setpgid(0, 0) == -1) {
-        return errno;
-    }
-#endif
-
-    /* close out the standard file descriptors */
-    if (freopen("/dev/null", "r", stdin) == NULL) {
-        return errno;
-        /* continue anyhow -- note we can't close out descriptor 0 because we
-         * have nothing to replace it with, and if we didn't have a descriptor
-         * 0 the next file would be created with that value ... leading to
-         * havoc.
-         */
-    }
-    if (freopen("/dev/null", "w", stdout) == NULL) {
-        return errno;
-    }
-     /* We are going to reopen this again in a little while to the error
-      * log file, but better to do it twice and suffer a small performance
-      * hit for consistancy than not reopen it here.
-      */
-    if (freopen("/dev/null", "w", stderr) == NULL) {
-        return errno;
-    }
-    return APR_SUCCESS;
-}
-
-#if (!HAVE_WAITPID)
-/* From ikluft@amdahl.com
- * this is not ideal but it works for SVR3 variants
- * Modified by dwd@bell-labs.com to call wait3 instead of wait because
- *   apache started to use the WNOHANG option.
- */
-int waitpid(pid_t pid, int *statusp, int options)
-{
-    int tmp_pid;
-    if (kill(pid, 0) == -1) {
-        errno = ECHILD;
-        return -1;
-    }
-    while (((tmp_pid = wait3(statusp, options, 0)) != pid) &&
-                (tmp_pid != -1) && (tmp_pid != 0) && (pid != -1))
-        ;
-    return tmp_pid;
-}
-#endif
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/procsup.lo b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/procsup.lo
deleted file mode 100644
index 97676e24..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/procsup.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# procsup.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/procsup.o'
-
-# Name of the non-PIC object.
-non_pic_object='procsup.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/procsup.o b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/procsup.o
deleted file mode 100644
index 1fb7b463..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/procsup.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/signals.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/signals.c
deleted file mode 100644
index ac0997f0..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/signals.c
+++ /dev/null
@@ -1,433 +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.
- */
-
-#define INCL_DOSEXCEPTIONS      /* for OS2 */
-#include "apr_arch_threadproc.h"
-#include "apr_private.h"
-#include "apr_pools.h"
-#include "apr_signal.h"
-#include "apr_strings.h"
-
-#include <assert.h>
-#if APR_HAS_THREADS && APR_HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
-
-APR_DECLARE(apr_status_t) apr_proc_kill(apr_proc_t *proc, int signum)
-{
-#ifdef OS2
-    /* SIGTERM's don't work too well in OS/2 (only affects other EMX
-     * programs). CGIs may not be, esp. REXX scripts, so use a native
-     * call instead
-     */
-    if (signum == SIGTERM) {
-        return APR_OS2_STATUS(DosSendSignalException(proc->pid,
-                                                     XCPT_SIGNAL_BREAK));
-    }
-#endif /* OS2 */
-
-    if (kill(proc->pid, signum) == -1) {
-        return errno;
-    }
-
-    return APR_SUCCESS;
-}
-
-
-#if APR_HAVE_SIGACTION
-
-#ifdef DARWIN
-static void avoid_zombies(int signo)
-{
-    int exit_status;
-
-    while (waitpid(-1, &exit_status, WNOHANG) > 0) {
-        /* do nothing */
-    }
-}
-#endif /* DARWIN */
-
-/*
- * Replace standard signal() with the more reliable sigaction equivalent
- * from W. Richard Stevens' "Advanced Programming in the UNIX Environment"
- * (the version that does not automatically restart system calls).
- */
-APR_DECLARE(apr_sigfunc_t *) apr_signal(int signo, apr_sigfunc_t * func)
-{
-    struct sigaction act, oact;
-
-    act.sa_handler = func;
-    sigemptyset(&act.sa_mask);
-    act.sa_flags = 0;
-#ifdef SA_INTERRUPT             /* SunOS */
-    act.sa_flags |= SA_INTERRUPT;
-#endif
-#if defined(__osf__) && defined(__alpha)
-    /* XXX jeff thinks this should be enabled whenever SA_NOCLDWAIT is defined */
-
-    /* this is required on Tru64 to cause child processes to
-     * disappear gracefully - XPG4 compatible 
-     */
-    if ((signo == SIGCHLD) && (func == SIG_IGN)) {
-        act.sa_flags |= SA_NOCLDWAIT;
-    }
-#endif
-#ifdef DARWIN
-    /* ignoring SIGCHLD or leaving the default disposition doesn't avoid zombies,
-     * and there is no SA_NOCLDWAIT flag, so catch the signal and reap status in 
-     * the handler to avoid zombies
-     */
-    if ((signo == SIGCHLD) && (func == SIG_IGN)) {
-        act.sa_handler = avoid_zombies;
-    }
-#endif
-    if (sigaction(signo, &act, &oact) < 0)
-        return SIG_ERR;
-    return oact.sa_handler;
-}
-
-#endif /* HAVE_SIGACTION */
-
-/* AC_DECL_SYS_SIGLIST defines either of these symbols depending
- * on the version of autoconf used. */
-#if defined(SYS_SIGLIST_DECLARED) || HAVE_DECL_SYS_SIGLIST
-
-void apr_signal_init(apr_pool_t *pglobal)
-{
-}
-const char *apr_signal_description_get(int signum)
-{
-    return sys_siglist[signum];
-}
-
-#else /* !(SYS_SIGLIST_DECLARED || HAVE_DECL_SYS_SIGLIST) */
-
-/* we need to roll our own signal description stuff */
-
-#if defined(NSIG)
-#define APR_NUMSIG NSIG
-#elif defined(_NSIG)
-#define APR_NUMSIG _NSIG
-#elif defined(__NSIG)
-#define APR_NUMSIG __NSIG
-#else
-#define APR_NUMSIG 33   /* breaks on OS/390 with < 33; 32 is o.k. for most */
-#endif
-
-static const char *signal_description[APR_NUMSIG];
-
-#define store_desc(index, string) \
-        do { \
-            if (index >= APR_NUMSIG) { \
-                assert(index < APR_NUMSIG); \
-            } \
-            else { \
-                signal_description[index] = string; \
-            } \
-        } while (0)
-
-void apr_signal_init(apr_pool_t *pglobal)
-{
-    int sig;
-
-    store_desc(0, "Signal 0");
-
-#ifdef SIGHUP
-    store_desc(SIGHUP, "Hangup");
-#endif
-#ifdef SIGINT
-    store_desc(SIGINT, "Interrupt");
-#endif
-#ifdef SIGQUIT
-    store_desc(SIGQUIT, "Quit");
-#endif
-#ifdef SIGILL
-    store_desc(SIGILL, "Illegal instruction");
-#endif
-#ifdef SIGTRAP
-    store_desc(SIGTRAP, "Trace/BPT trap");
-#endif
-#ifdef SIGIOT
-    store_desc(SIGIOT, "IOT instruction");
-#endif
-#ifdef SIGABRT
-    store_desc(SIGABRT, "Abort");
-#endif
-#ifdef SIGEMT
-    store_desc(SIGEMT, "Emulator trap");
-#endif
-#ifdef SIGFPE
-    store_desc(SIGFPE, "Arithmetic exception");
-#endif
-#ifdef SIGKILL
-    store_desc(SIGKILL, "Killed");
-#endif
-#ifdef SIGBUS
-    store_desc(SIGBUS, "Bus error");
-#endif
-#ifdef SIGSEGV
-    store_desc(SIGSEGV, "Segmentation fault");
-#endif
-#ifdef SIGSYS
-    store_desc(SIGSYS, "Bad system call");
-#endif
-#ifdef SIGPIPE
-    store_desc(SIGPIPE, "Broken pipe");
-#endif
-#ifdef SIGALRM
-    store_desc(SIGALRM, "Alarm clock");
-#endif
-#ifdef SIGTERM
-    store_desc(SIGTERM, "Terminated");
-#endif
-#ifdef SIGUSR1
-    store_desc(SIGUSR1, "User defined signal 1");
-#endif
-#ifdef SIGUSR2
-    store_desc(SIGUSR2, "User defined signal 2");
-#endif
-#ifdef SIGCLD
-    store_desc(SIGCLD, "Child status change");
-#endif
-#ifdef SIGCHLD
-    store_desc(SIGCHLD, "Child status change");
-#endif
-#ifdef SIGPWR
-    store_desc(SIGPWR, "Power-fail restart");
-#endif
-#ifdef SIGWINCH
-    store_desc(SIGWINCH, "Window changed");
-#endif
-#ifdef SIGURG
-    store_desc(SIGURG, "urgent socket condition");
-#endif
-#ifdef SIGPOLL
-    store_desc(SIGPOLL, "Pollable event occurred");
-#endif
-#ifdef SIGIO
-    store_desc(SIGIO, "socket I/O possible");
-#endif
-#ifdef SIGSTOP
-    store_desc(SIGSTOP, "Stopped (signal)");
-#endif
-#ifdef SIGTSTP
-    store_desc(SIGTSTP, "Stopped");
-#endif
-#ifdef SIGCONT
-    store_desc(SIGCONT, "Continued");
-#endif
-#ifdef SIGTTIN
-    store_desc(SIGTTIN, "Stopped (tty input)");
-#endif
-#ifdef SIGTTOU
-    store_desc(SIGTTOU, "Stopped (tty output)");
-#endif
-#ifdef SIGVTALRM
-    store_desc(SIGVTALRM, "virtual timer expired");
-#endif
-#ifdef SIGPROF
-    store_desc(SIGPROF, "profiling timer expired");
-#endif
-#ifdef SIGXCPU
-    store_desc(SIGXCPU, "exceeded cpu limit");
-#endif
-#ifdef SIGXFSZ
-    store_desc(SIGXFSZ, "exceeded file size limit");
-#endif
-
-    for (sig = 0; sig < APR_NUMSIG; ++sig)
-        if (signal_description[sig] == NULL)
-            signal_description[sig] = apr_psprintf(pglobal, "signal #%d", sig);
-}
-
-const char *apr_signal_description_get(int signum)
-{
-    return
-        signum < APR_NUMSIG
-        ? signal_description[signum]
-        : "unknown signal (number)";
-}
-
-#endif /* SYS_SIGLIST_DECLARED || HAVE_DECL_SYS_SIGLIST */
-
-#if APR_HAS_THREADS && (HAVE_SIGSUSPEND || APR_HAVE_SIGWAIT) && !defined(OS2)
-
-static void remove_sync_sigs(sigset_t *sig_mask)
-{
-#ifdef SIGABRT
-    sigdelset(sig_mask, SIGABRT);
-#endif
-#ifdef SIGBUS
-    sigdelset(sig_mask, SIGBUS);
-#endif
-#ifdef SIGEMT
-    sigdelset(sig_mask, SIGEMT);
-#endif
-#ifdef SIGFPE
-    sigdelset(sig_mask, SIGFPE);
-#endif
-#ifdef SIGILL
-    sigdelset(sig_mask, SIGILL);
-#endif
-#ifdef SIGIOT
-    sigdelset(sig_mask, SIGIOT);
-#endif
-#ifdef SIGPIPE
-    sigdelset(sig_mask, SIGPIPE);
-#endif
-#ifdef SIGSEGV
-    sigdelset(sig_mask, SIGSEGV);
-#endif
-#ifdef SIGSYS
-    sigdelset(sig_mask, SIGSYS);
-#endif
-#ifdef SIGTRAP
-    sigdelset(sig_mask, SIGTRAP);
-#endif
-
-/* the rest of the signals removed from the mask in this function
- * absolutely must be removed; you cannot block synchronous signals
- * (requirement of pthreads API)
- *
- * SIGUSR2 is being removed from the mask for the convenience of
- * Purify users (Solaris, HP-UX, SGI) since Purify uses SIGUSR2
- */
-#ifdef SIGUSR2
-    sigdelset(sig_mask, SIGUSR2);
-#endif
-}
-
-APR_DECLARE(apr_status_t) apr_signal_thread(int(*signal_handler)(int signum))
-{
-    sigset_t sig_mask;
-#if APR_HAVE_SIGWAIT
-    int (*sig_func)(int signum) = (int (*)(int))signal_handler;
-#endif
-
-    /* This thread will be the one responsible for handling signals */
-    sigfillset(&sig_mask);
-
-    /* On certain platforms, sigwait() returns EINVAL if any of various
-     * unblockable signals are included in the mask.  This was first 
-     * observed on AIX and Tru64.
-     */
-#ifdef SIGKILL
-    sigdelset(&sig_mask, SIGKILL);
-#endif
-#ifdef SIGSTOP
-    sigdelset(&sig_mask, SIGSTOP);
-#endif
-#ifdef SIGCONT
-    sigdelset(&sig_mask, SIGCONT);
-#endif
-#ifdef SIGWAITING
-    sigdelset(&sig_mask, SIGWAITING);
-#endif
-
-    /* no synchronous signals should be in the mask passed to sigwait() */
-    remove_sync_sigs(&sig_mask);
-
-    /* On AIX (4.3.3, at least), sigwait() won't wake up if the high-
-     * order bit of the second word of flags is turned on.  sigdelset()
-     * returns an error when trying to turn this off, so we'll turn it
-     * off manually.
-     *
-     * Note that the private fields differ between 32-bit and 64-bit
-     * and even between _ALL_SOURCE and !_ALL_SOURCE.  Except that on
-     * AIX 4.3 32-bit builds and 64-bit builds use the same definition.
-     *
-     * Applicable AIX fixes such that this is no longer needed:
-     *
-     * APAR IY23096 for AIX 51B, fix included in AIX 51C, and
-     * APAR IY24162 for 43X.
-     */
-#if defined(_AIX)
-#if defined(__64BIT__) && defined(_AIXVERSION_510)
-#ifdef _ALL_SOURCE
-        sig_mask.ss_set[3] &= 0x7FFFFFFF;
-#else /* not _ALL_SOURCE */
-        sig_mask.__ss_set[3] &= 0x7FFFFFFF;
-#endif
-#else /* not 64-bit build, or 64-bit build on 4.3 */
-#ifdef _ALL_SOURCE
-        sig_mask.hisigs &= 0x7FFFFFFF;
-#else /* not _ALL_SOURCE */
-        sig_mask.__hisigs &= 0x7FFFFFFF;
-#endif
-#endif
-#endif /* _AIX */
-
-    while (1) {
-#if APR_HAVE_SIGWAIT
-        int signal_received;
-
-        if (apr_sigwait(&sig_mask, &signal_received) != 0)
-        {
-            /* handle sigwait() error here */
-        }
-        
-        if (sig_func(signal_received) == 1) {
-            return APR_SUCCESS;
-        }
-#elif HAVE_SIGSUSPEND
-	sigsuspend(&sig_mask);
-#else
-#error No apr_sigwait() and no sigsuspend()
-#endif
-    }
-}
-
-APR_DECLARE(apr_status_t) apr_setup_signal_thread(void)
-{
-    sigset_t sig_mask;
-    int rv;
-
-    /* All threads should mask out signals to be handled by
-     * the thread doing sigwait().
-     *
-     * No thread should ever block synchronous signals.
-     * See the Solaris man page for pthread_sigmask() for
-     * some information.  Solaris chooses to knock out such
-     * processes when a blocked synchronous signal is 
-     * delivered, skipping any registered signal handler.
-     * AIX doesn't call a signal handler either.  At least
-     * one level of linux+glibc does call the handler even
-     * when the synchronous signal is blocked.
-     */
-    sigfillset(&sig_mask);
-    remove_sync_sigs(&sig_mask);
-
-#if defined(SIGPROCMASK_SETS_THREAD_MASK)
-    if ((rv = sigprocmask(SIG_SETMASK, &sig_mask, NULL)) != 0) {
-        rv = errno;
-    }
-#else
-    if ((rv = pthread_sigmask(SIG_SETMASK, &sig_mask, NULL)) != 0) {
-#ifdef PTHREAD_SETS_ERRNO
-        rv = errno;
-#endif
-    }
-#endif
-    return rv;
-}
-
-#endif
-
-/* Deprecated */
-const char *apr_signal_get_description(int signum)
-{
-    return apr_signal_description_get(signum);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/signals.lo b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/signals.lo
deleted file mode 100644
index 43a4057b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/signals.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# signals.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/signals.o'
-
-# Name of the non-PIC object.
-non_pic_object='signals.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/signals.o b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/signals.o
deleted file mode 100644
index 0164202b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/signals.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/thread.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/thread.c
deleted file mode 100644
index d853818a..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/thread.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_portable.h"
-#include "apr_arch_threadproc.h"
-
-#if APR_HAS_THREADS
-
-#if APR_HAVE_PTHREAD_H
-APR_DECLARE(apr_status_t) apr_threadattr_create(apr_threadattr_t **new,
-                                                apr_pool_t *pool)
-{
-    apr_status_t stat;
-
-    (*new) = (apr_threadattr_t *)apr_pcalloc(pool, sizeof(apr_threadattr_t));
-    (*new)->attr = (pthread_attr_t *)apr_pcalloc(pool, sizeof(pthread_attr_t));
-
-    if ((*new) == NULL || (*new)->attr == NULL) {
-        return APR_ENOMEM;
-    }
-
-    (*new)->pool = pool;
-    stat = pthread_attr_init((*new)->attr);
-
-    if (stat == 0) {
-        return APR_SUCCESS;
-    }
-#ifdef PTHREAD_SETS_ERRNO
-    stat = errno;
-#endif
-
-    return stat;
-}
-
-APR_DECLARE(apr_status_t) apr_threadattr_detach_set(apr_threadattr_t *attr,
-                                                    apr_int32_t on)
-{
-    apr_status_t stat;
-#ifdef PTHREAD_ATTR_SETDETACHSTATE_ARG2_ADDR
-    int arg = on;
-
-    if ((stat = pthread_attr_setdetachstate(attr->attr, &arg)) == 0) {
-#else
-    if ((stat = pthread_attr_setdetachstate(attr->attr, on)) == 0) {
-#endif
-
-        return APR_SUCCESS;
-    }
-    else {
-#ifdef PTHREAD_SETS_ERRNO
-        stat = errno;
-#endif
-
-        return stat;
-    }
-}
-
-APR_DECLARE(apr_status_t) apr_threadattr_detach_get(apr_threadattr_t *attr)
-{
-    int state;
-
-#ifdef PTHREAD_ATTR_GETDETACHSTATE_TAKES_ONE_ARG
-    state = pthread_attr_getdetachstate(attr->attr);
-#else
-    pthread_attr_getdetachstate(attr->attr, &state);
-#endif
-    if (state == 1)
-        return APR_DETACH;
-    return APR_NOTDETACH;
-}
-
-APR_DECLARE(apr_status_t) apr_threadattr_stacksize_set(apr_threadattr_t *attr,
-                                                       apr_size_t stacksize)
-{
-    int stat;
-
-    stat = pthread_attr_setstacksize(attr->attr, stacksize);
-    if (stat == 0) {
-        return APR_SUCCESS;
-    }
-#ifdef PTHREAD_SETS_ERRNO
-    stat = errno;
-#endif
-
-    return stat;
-}
-
-static void *dummy_worker(void *opaque)
-{
-    apr_thread_t *thread = (apr_thread_t*)opaque;
-    return thread->func(thread, thread->data);
-}
-
-APR_DECLARE(apr_status_t) apr_thread_create(apr_thread_t **new,
-                                            apr_threadattr_t *attr,
-                                            apr_thread_start_t func,
-                                            void *data,
-                                            apr_pool_t *pool)
-{
-    apr_status_t stat;
-    pthread_attr_t *temp;
-
-    (*new) = (apr_thread_t *)apr_pcalloc(pool, sizeof(apr_thread_t));
-
-    if ((*new) == NULL) {
-        return APR_ENOMEM;
-    }
-
-    (*new)->td = (pthread_t *)apr_pcalloc(pool, sizeof(pthread_t));
-
-    if ((*new)->td == NULL) {
-        return APR_ENOMEM;
-    }
-
-    (*new)->pool = pool;
-    (*new)->data = data;
-    (*new)->func = func;
-
-    if (attr)
-        temp = attr->attr;
-    else
-        temp = NULL;
-
-    stat = apr_pool_create(&(*new)->pool, pool);
-    if (stat != APR_SUCCESS) {
-        return stat;
-    }
-
-    if ((stat = pthread_create((*new)->td, temp, dummy_worker, (*new))) == 0) {
-        return APR_SUCCESS;
-    }
-    else {
-#ifdef PTHREAD_SETS_ERRNO
-        stat = errno;
-#endif
-
-        return stat;
-    }
-}
-
-APR_DECLARE(apr_os_thread_t) apr_os_thread_current(void)
-{
-    return pthread_self();
-}
-
-APR_DECLARE(int) apr_os_thread_equal(apr_os_thread_t tid1,
-                                     apr_os_thread_t tid2)
-{
-    return pthread_equal(tid1, tid2);
-}
-
-APR_DECLARE(apr_status_t) apr_thread_exit(apr_thread_t *thd,
-                                          apr_status_t retval)
-{
-    thd->exitval = retval;
-    apr_pool_destroy(thd->pool);
-    pthread_exit(NULL);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_join(apr_status_t *retval,
-                                          apr_thread_t *thd)
-{
-    apr_status_t stat;
-    apr_status_t *thread_stat;
-
-    if ((stat = pthread_join(*thd->td,(void *)&thread_stat)) == 0) {
-        *retval = thd->exitval;
-        return APR_SUCCESS;
-    }
-    else {
-#ifdef PTHREAD_SETS_ERRNO
-        stat = errno;
-#endif
-
-        return stat;
-    }
-}
-
-APR_DECLARE(apr_status_t) apr_thread_detach(apr_thread_t *thd)
-{
-    apr_status_t stat;
-
-#ifdef PTHREAD_DETACH_ARG1_ADDR
-    if ((stat = pthread_detach(thd->td)) == 0) {
-#else
-    if ((stat = pthread_detach(*thd->td)) == 0) {
-#endif
-
-        return APR_SUCCESS;
-    }
-    else {
-#ifdef PTHREAD_SETS_ERRNO
-        stat = errno;
-#endif
-
-        return stat;
-    }
-}
-
-void apr_thread_yield()
-{
-}
-
-APR_DECLARE(apr_status_t) apr_thread_data_get(void **data, const char *key,
-                                              apr_thread_t *thread)
-{
-    return apr_pool_userdata_get(data, key, thread->pool);
-}
-
-APR_DECLARE(apr_status_t) apr_thread_data_set(void *data, const char *key,
-                              apr_status_t (*cleanup)(void *),
-                              apr_thread_t *thread)
-{
-    return apr_pool_userdata_set(data, key, cleanup, thread->pool);
-}
-
-APR_DECLARE(apr_status_t) apr_os_thread_get(apr_os_thread_t **thethd,
-                                            apr_thread_t *thd)
-{
-    *thethd = thd->td;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_thread_put(apr_thread_t **thd,
-                                            apr_os_thread_t *thethd,
-                                            apr_pool_t *pool)
-{
-    if (pool == NULL) {
-        return APR_ENOPOOL;
-    }
-
-    if ((*thd) == NULL) {
-        (*thd) = (apr_thread_t *)apr_pcalloc(pool, sizeof(apr_thread_t));
-        (*thd)->pool = pool;
-    }
-
-    (*thd)->td = thethd;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_once_init(apr_thread_once_t **control,
-                                               apr_pool_t *p)
-{
-    static const pthread_once_t once_init = PTHREAD_ONCE_INIT;
-
-    *control = apr_palloc(p, sizeof(**control));
-    (*control)->once = once_init;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_once(apr_thread_once_t *control,
-                                          void (*func)(void))
-{
-    return pthread_once(&control->once, func);
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(thread)
-
-#endif  /* HAVE_PTHREAD_H */
-#endif  /* APR_HAS_THREADS */
-
-#if !APR_HAS_THREADS
-
-/* avoid warning for no prototype */
-APR_DECLARE(apr_status_t) apr_os_thread_get(void);
-
-APR_DECLARE(apr_status_t) apr_os_thread_get(void)
-{
-    return APR_ENOTIMPL;
-}
-
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/thread.lo b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/thread.lo
deleted file mode 100644
index 39686879..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/thread.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# thread.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/thread.o'
-
-# Name of the non-PIC object.
-non_pic_object='thread.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/thread.o b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/thread.o
deleted file mode 100644
index 589dea35..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/thread.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/threadpriv.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/threadpriv.c
deleted file mode 100644
index c2785203..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/threadpriv.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_portable.h"
-#include "apr_arch_threadproc.h"
-
-#if APR_HAS_THREADS
-
-#if APR_HAVE_PTHREAD_H
-APR_DECLARE(apr_status_t) apr_threadkey_private_create(apr_threadkey_t **key,
-                                                       void (*dest)(void *),
-                                                       apr_pool_t *pool)
-{
-    (*key) = (apr_threadkey_t *)apr_pcalloc(pool, sizeof(apr_threadkey_t));
-
-    if ((*key) == NULL) {
-        return APR_ENOMEM;
-    }
-
-    (*key)->pool = pool;
-
-    return pthread_key_create(&(*key)->key, dest);
-
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_private_get(void **new,
-                                                    apr_threadkey_t *key)
-{
-#ifdef PTHREAD_GETSPECIFIC_TAKES_TWO_ARGS
-    if (pthread_getspecific(key->key,new))
-       *new = NULL;
-#else
-    (*new) = pthread_getspecific(key->key);
-#endif
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_private_set(void *priv,
-                                                    apr_threadkey_t *key)
-{
-    apr_status_t stat;
-
-    if ((stat = pthread_setspecific(key->key, priv)) == 0) {
-        return APR_SUCCESS;
-    }
-    else {
-        return stat;
-    }
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_private_delete(apr_threadkey_t *key)
-{
-#ifdef HAVE_PTHREAD_KEY_DELETE
-    apr_status_t stat;
-
-    if ((stat = pthread_key_delete(key->key)) == 0) {
-        return APR_SUCCESS;
-    }
-
-    return stat;
-#else
-    return APR_ENOTIMPL;
-#endif
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_data_get(void **data, const char *key,
-                                                 apr_threadkey_t *threadkey)
-{
-    return apr_pool_userdata_get(data, key, threadkey->pool);
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_data_set(void *data, const char *key,
-                              apr_status_t (*cleanup)(void *),
-                              apr_threadkey_t *threadkey)
-{
-    return apr_pool_userdata_set(data, key, cleanup, threadkey->pool);
-}
-
-APR_DECLARE(apr_status_t) apr_os_threadkey_get(apr_os_threadkey_t *thekey,
-                                               apr_threadkey_t *key)
-{
-    *thekey = key->key;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_threadkey_put(apr_threadkey_t **key,
-                                               apr_os_threadkey_t *thekey,
-                                               apr_pool_t *pool)
-{
-    if (pool == NULL) {
-        return APR_ENOPOOL;
-    }
-
-    if ((*key) == NULL) {
-        (*key) = (apr_threadkey_t *)apr_pcalloc(pool, sizeof(apr_threadkey_t));
-        (*key)->pool = pool;
-    }
-
-    (*key)->key = *thekey;
-    return APR_SUCCESS;
-}
-#endif /* APR_HAVE_PTHREAD_H */
-#endif /* APR_HAS_THREADS */
-
-#if !APR_HAS_THREADS
-
-/* avoid warning for no prototype */
-APR_DECLARE(apr_status_t) apr_os_threadkey_get(void);
-
-APR_DECLARE(apr_status_t) apr_os_threadkey_get(void)
-{
-    return APR_ENOTIMPL;
-}
-
-#endif
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/threadpriv.lo b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/threadpriv.lo
deleted file mode 100644
index a32c9d51..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/threadpriv.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# threadpriv.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/threadpriv.o'
-
-# Name of the non-PIC object.
-non_pic_object='threadpriv.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/threadpriv.o b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/threadpriv.o
deleted file mode 100644
index fcf0f393..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/unix/threadpriv.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/win32/proc.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/win32/proc.c
deleted file mode 100644
index df1b6404..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/win32/proc.c
+++ /dev/null
@@ -1,874 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "win32/apr_arch_threadproc.h"
-#include "win32/apr_arch_file_io.h"
-
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include "apr_lib.h"
-#include <stdlib.h>
-#if APR_HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-#include <string.h>
-#if APR_HAVE_PROCESS_H
-#include <process.h>
-#endif
-
-/* We have very carefully excluded volumes of definitions from the
- * Microsoft Platform SDK, which kill the build time performance.
- * These the sole constants we borrow from WinBase.h and WinUser.h
- */
-#ifndef LOGON32_LOGON_NETWORK
-#define LOGON32_LOGON_NETWORK 3
-#endif
-
-#ifdef _WIN32_WCE
-#ifndef DETACHED_PROCESS
-#define DETACHED_PROCESS 0
-#endif
-#ifndef CREATE_UNICODE_ENVIRONMENT
-#define CREATE_UNICODE_ENVIRONMENT 0
-#endif
-#ifndef STARTF_USESHOWWINDOW
-#define STARTF_USESHOWWINDOW 0
-#endif
-#ifndef SW_HIDE
-#define SW_HIDE 0
-#endif
-#endif
-/* 
- * some of the ideas expressed herein are based off of Microsoft
- * Knowledge Base article: Q190351
- *
- */
-
-APR_DECLARE(apr_status_t) apr_procattr_create(apr_procattr_t **new,
-                                                  apr_pool_t *pool)
-{
-    (*new) = (apr_procattr_t *)apr_pcalloc(pool, sizeof(apr_procattr_t));
-    (*new)->pool = pool;
-    (*new)->cmdtype = APR_PROGRAM;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr,
-                                              apr_int32_t in, 
-                                              apr_int32_t out,
-                                              apr_int32_t err)
-{
-    apr_status_t stat = APR_SUCCESS;
-
-    if (in) {
-        /* APR_CHILD_BLOCK maps to APR_WRITE_BLOCK, while
-         * APR_PARENT_BLOCK maps to APR_READ_BLOCK, so we
-         * must transpose the CHILD/PARENT blocking flags
-         * only for the stdin pipe.  stdout/stderr naturally
-         * map to the correct mode.
-         */
-        if (in == APR_CHILD_BLOCK)
-            in = APR_READ_BLOCK;
-        else if (in == APR_PARENT_BLOCK)
-            in = APR_WRITE_BLOCK;
-
-        stat = apr_create_nt_pipe(&attr->child_in, &attr->parent_in,
-                                  in, attr->pool);
-        if (stat == APR_SUCCESS)
-            stat = apr_file_inherit_unset(attr->parent_in);
-    }
-    if (out && stat == APR_SUCCESS) {
-        stat = apr_create_nt_pipe(&attr->parent_out, &attr->child_out,
-                                  out, attr->pool);
-        if (stat == APR_SUCCESS)
-            stat = apr_file_inherit_unset(attr->parent_out);
-    }
-    if (err && stat == APR_SUCCESS) {
-        stat = apr_create_nt_pipe(&attr->parent_err, &attr->child_err,
-                                  err, attr->pool);
-        if (stat == APR_SUCCESS)
-            stat = apr_file_inherit_unset(attr->parent_err);
-    }
-    return stat;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_child_in_set(apr_procattr_t *attr, 
-                                                  apr_file_t *child_in, 
-                                                  apr_file_t *parent_in)
-{
-    apr_status_t rv = APR_SUCCESS;
-
-    if (child_in) {
-        if (attr->child_in == NULL)
-            rv = apr_file_dup(&attr->child_in, child_in, attr->pool);
-        else
-            rv = apr_file_dup2(attr->child_in, child_in, attr->pool);
-
-        if (rv == APR_SUCCESS)
-            rv = apr_file_inherit_set(attr->child_in);
-    }
-
-    if (parent_in && rv == APR_SUCCESS) {
-        if (attr->parent_in == NULL)
-            rv = apr_file_dup(&attr->parent_in, parent_in, attr->pool);
-        else
-            rv = apr_file_dup2(attr->parent_in, parent_in, attr->pool);
-    }
-
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_child_out_set(apr_procattr_t *attr,
-                                                   apr_file_t *child_out,
-                                                   apr_file_t *parent_out)
-{
-    apr_status_t rv = APR_SUCCESS;
-
-    if (child_out) {
-        if (attr->child_out == NULL)
-            rv = apr_file_dup(&attr->child_out, child_out, attr->pool);
-        else
-            rv = apr_file_dup2(attr->child_out, child_out, attr->pool);
-
-        if (rv == APR_SUCCESS)
-            rv = apr_file_inherit_set(attr->child_out);
-    }
-
-    if (parent_out && rv == APR_SUCCESS) {
-        if (attr->parent_out == NULL)
-            rv = apr_file_dup(&attr->parent_out, parent_out, attr->pool);
-        else
-            rv = apr_file_dup2(attr->parent_out, parent_out, attr->pool);
-    }
-
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_child_err_set(apr_procattr_t *attr,
-                                                   apr_file_t *child_err,
-                                                   apr_file_t *parent_err)
-{
-    apr_status_t rv = APR_SUCCESS;
-
-    if (child_err) {
-        if (attr->child_err == NULL)
-            rv = apr_file_dup(&attr->child_err, child_err, attr->pool);
-        else
-            rv = apr_file_dup2(attr->child_err, child_err, attr->pool);
-
-        if (rv == APR_SUCCESS)
-            rv = apr_file_inherit_set(attr->child_err);
-    }
-
-    if (parent_err && rv == APR_SUCCESS) {
-        if (attr->parent_err == NULL)
-            rv = apr_file_dup(&attr->parent_err, parent_err, attr->pool);
-        else
-            rv = apr_file_dup2(attr->parent_err, parent_err, attr->pool);
-    }
-
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_dir_set(apr_procattr_t *attr,
-                                              const char *dir) 
-{
-    /* curr dir must be in native format, there are all sorts of bugs in
-     * the NT library loading code that flunk the '/' parsing test.
-     */
-    return apr_filepath_merge(&attr->currdir, NULL, dir, 
-                              APR_FILEPATH_NATIVE, attr->pool);
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_cmdtype_set(apr_procattr_t *attr,
-                                                  apr_cmdtype_e cmd) 
-{
-    attr->cmdtype = cmd;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_detach_set(apr_procattr_t *attr,
-                                                 apr_int32_t det) 
-{
-    attr->detached = det;
-    return APR_SUCCESS;
-}
-
-static const char* has_space(const char *str)
-{
-    const char *ch;
-    for (ch = str; *ch; ++ch) {
-        if (apr_isspace(*ch)) {
-            return ch;
-        }
-    }
-    return NULL;
-}
-
-static char *apr_caret_escape_args(apr_pool_t *p, const char *str)
-{
-    char *cmd;
-    unsigned char *d;
-    const unsigned char *s;
-
-    cmd = apr_palloc(p, 2 * strlen(str) + 1);	/* Be safe */
-    d = (unsigned char *)cmd;
-    s = (const unsigned char *)str;
-    for (; *s; ++s) {
-
-        /* 
-         * Newlines to Win32/OS2 CreateProcess() are ill advised.
-         * Convert them to spaces since they are effectively white
-         * space to most applications
-         */
-	if (*s == '\r' || *s == '\n') {
-	    *d++ = ' ';
-            continue;
-	}
-
-	if (IS_SHCHAR(*s)) {
-	    *d++ = '^';
-	}
-	*d++ = *s;
-    }
-    *d = '\0';
-
-    return cmd;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_child_errfn_set(apr_procattr_t *attr,
-                                                       apr_child_errfn_t *errfn)
-{
-    attr->errfn = errfn;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_error_check_set(apr_procattr_t *attr,
-                                                       apr_int32_t chk)
-{
-    attr->errchk = chk;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_addrspace_set(apr_procattr_t *attr,
-                                                       apr_int32_t addrspace)
-{
-    /* won't ever be used on this platform, so don't save the flag */
-    return APR_SUCCESS;
-}
-
-#if APR_HAS_UNICODE_FS && !defined(_WIN32_WCE)
-
-/* Used only for the NT code path, a critical section is the fastest
- * implementation available.
- */
-static CRITICAL_SECTION proc_lock;
-
-static apr_status_t threadproc_global_cleanup(void *ignored)
-{
-    DeleteCriticalSection(&proc_lock);
-    return APR_SUCCESS;
-}
-
-/* Called from apr_initialize, we need a critical section to handle
- * the pipe inheritance on win32.  This will mutex any process create
- * so as we change our inherited pipes, we prevent another process from
- * also inheriting those alternate handles, and prevent the other process
- * from failing to inherit our standard handles.
- */
-apr_status_t apr_threadproc_init(apr_pool_t *pool)
-{
-    IF_WIN_OS_IS_UNICODE
-    {
-        InitializeCriticalSection(&proc_lock);
-        /* register the cleanup */
-        apr_pool_cleanup_register(pool, &proc_lock,
-                                  threadproc_global_cleanup,
-                                  apr_pool_cleanup_null);
-    }
-    return APR_SUCCESS;
-}
-
-#else /* !APR_HAS_UNICODE_FS || defined(_WIN32_WCE) */
-
-apr_status_t apr_threadproc_init(apr_pool_t *pool)
-{
-    return APR_SUCCESS;
-}
-
-#endif
-
-APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new,
-                                          const char *progname,
-                                          const char * const *args,
-                                          const char * const *env,
-                                          apr_procattr_t *attr,
-                                          apr_pool_t *pool)
-{
-    apr_status_t rv;
-    apr_size_t i;
-    const char *argv0;
-    char *cmdline;
-    char *pEnvBlock;
-    PROCESS_INFORMATION pi;
-    DWORD dwCreationFlags = 0;
-
-    new->in = attr->parent_in;
-    new->out = attr->parent_out;
-    new->err = attr->parent_err;
-
-    if (attr->detached) {
-        /* If we are creating ourselves detached, Then we should hide the
-         * window we are starting in.  And we had better redfine our
-         * handles for STDIN, STDOUT, and STDERR. Do not set the
-         * detached attribute for Win9x. We have found that Win9x does
-         * not manage the stdio handles properly when running old 16
-         * bit executables if the detached attribute is set.
-         */
-        if (apr_os_level >= APR_WIN_NT) {
-            /* 
-             * XXX DETACHED_PROCESS won't on Win9x at all; on NT/W2K 
-             * 16 bit executables fail (MS KB: Q150956)
-             */
-            dwCreationFlags |= DETACHED_PROCESS;
-        }
-    }
-
-    /* progname must be unquoted, in native format, as there are all sorts 
-     * of bugs in the NT library loader code that fault when parsing '/'.
-     * XXX progname must be NULL if this is a 16 bit app running in WOW
-     */
-    if (progname[0] == '\"') {
-        progname = apr_pstrndup(pool, progname + 1, strlen(progname) - 2);
-    }
-
-    if (attr->cmdtype == APR_PROGRAM || attr->cmdtype == APR_PROGRAM_ENV) {
-        char *fullpath = NULL;
-        if ((rv = apr_filepath_merge(&fullpath, attr->currdir, progname, 
-                                     APR_FILEPATH_NATIVE, pool)) != APR_SUCCESS) {
-            if (attr->errfn) {
-                attr->errfn(pool, rv, 
-                            apr_pstrcat(pool, "filepath_merge failed.", 
-                                        " currdir: ", attr->currdir, 
-                                        " progname: ", progname,NULL));
-            }
-            return rv;
-        }
-        progname = fullpath;
-    } 
-    else {
-        /* Do not fail if the path isn't parseable for APR_PROGRAM_PATH
-         * or APR_SHELLCMD.  We only invoke apr_filepath_merge (with no
-         * left hand side expression) in order to correct the path slash
-         * delimiters.  But the filename doesn't need to be in the CWD,
-         * nor does it need to be a filename at all (it could be a
-         * built-in shell command.)
-         */
-        char *fullpath = NULL;
-        if ((rv = apr_filepath_merge(&fullpath, "", progname, 
-                                     APR_FILEPATH_NATIVE, pool)) == APR_SUCCESS) {
-            progname = fullpath;
-        }        
-    }
-
-    if (has_space(progname)) {
-        argv0 = apr_pstrcat(pool, "\"", progname, "\"", NULL);
-    }
-    else {
-        argv0 = progname;
-    }
-
-    /* Handle the args, seperate from argv0 */
-    cmdline = "";
-    for (i = 1; args && args[i]; ++i) {
-        if (has_space(args[i]) || !args[i][0]) {
-            cmdline = apr_pstrcat(pool, cmdline, " \"", args[i], "\"", NULL);
-        }
-        else {
-            cmdline = apr_pstrcat(pool, cmdline, " ", args[i], NULL);
-        }
-    }
-
-#ifndef _WIN32_WCE
-    if (attr->cmdtype == APR_SHELLCMD || attr->cmdtype == APR_SHELLCMD_ENV) {
-        char *shellcmd = getenv("COMSPEC");
-        if (!shellcmd) {
-            if (attr->errfn) {
-                attr->errfn(pool, APR_EINVAL, "COMSPEC envar is not set");
-            }
-            return APR_EINVAL;
-        }
-        if (shellcmd[0] == '"') {
-            progname = apr_pstrndup(pool, shellcmd + 1, strlen(shellcmd) - 2);
-        }
-        else {
-            progname = shellcmd;
-            if (has_space(shellcmd)) {
-                shellcmd = apr_pstrcat(pool, "\"", shellcmd, "\"", NULL);
-            }
-        }
-        /* Command.com does not support a quoted command, while cmd.exe demands one.
-         */
-        i = strlen(progname);
-        if (i >= 11 && strcasecmp(progname + i - 11, "command.com") == 0) {
-            cmdline = apr_pstrcat(pool, shellcmd, " /C ", argv0, cmdline, NULL);
-        }
-        else {
-            cmdline = apr_pstrcat(pool, shellcmd, " /C \"", argv0, cmdline, "\"", NULL);
-        }
-    } 
-    else 
-#endif
-    {
-#if defined(_WIN32_WCE)
-        {
-#else
-        /* Win32 is _different_ than unix.  While unix will find the given
-         * program since it's already chdir'ed, Win32 cannot since the parent
-         * attempts to open the program with it's own path.
-         * ###: This solution isn't much better - it may defeat path searching
-         * when the path search was desired.  Open to further discussion.
-         */
-        i = strlen(progname);
-        if (i >= 4 && (strcasecmp(progname + i - 4, ".bat") == 0
-                    || strcasecmp(progname + i - 4, ".cmd") == 0))
-        {
-            char *shellcmd = getenv("COMSPEC");
-            if (!shellcmd) {
-                if (attr->errfn) {
-                    attr->errfn(pool, APR_EINVAL, "COMSPEC envar is not set");
-                }
-                return APR_EINVAL;
-            }
-            if (shellcmd[0] == '"') {
-                progname = apr_pstrndup(pool, shellcmd + 1, strlen(shellcmd) - 2);
-            }
-            else {
-                progname = shellcmd;
-                if (has_space(shellcmd)) {
-                    shellcmd = apr_pstrcat(pool, "\"", shellcmd, "\"", NULL);
-                }
-            }
-            i = strlen(progname);
-            if (i >= 11 && strcasecmp(progname + i - 11, "command.com") == 0) {
-                /* XXX: Still insecure - need doubled-quotes on each individual
-                 * arg of cmdline.  Suspect we need to postpone cmdline parsing
-                 * until this moment in all four code paths, with some flags
-                 * to toggle 'which flavor' is needed.
-                 */
-                cmdline = apr_pstrcat(pool, shellcmd, " /C ", argv0, cmdline, NULL);
-            }
-            else {
-                /* We must protect the cmdline args from any interpolation - this
-                 * is not a shellcmd, and the source of argv[] is untrusted.
-                 * Notice we escape ALL the cmdline args, including the quotes
-                 * around the individual args themselves.  No sense in allowing
-                 * the shift-state to be toggled, and the application will 
-                 * not see the caret escapes.
-                 */
-                cmdline = apr_caret_escape_args(pool, cmdline);
-                /*
-                 * Our app name must always be quoted so the quotes surrounding
-                 * the entire /c "command args" are unambigious.
-                 */
-                if (*argv0 != '"') {
-                    cmdline = apr_pstrcat(pool, shellcmd, " /C \"\"", argv0, "\"", cmdline, "\"", NULL);
-                }
-                else {
-                    cmdline = apr_pstrcat(pool, shellcmd, " /C \"", argv0, cmdline, "\"", NULL);
-                }
-            }
-        }
-        else {
-#endif
-            /* A simple command we are directly invoking.  Do not pass
-             * the first arg to CreateProc() for APR_PROGRAM_PATH
-             * invocation, since it would need to be a literal and
-             * complete file path.  That is; "c:\bin\aprtest.exe"
-             * would succeed, but "c:\bin\aprtest" or "aprtest.exe"
-             * can fail.
-             */
-            cmdline = apr_pstrcat(pool, argv0, cmdline, NULL);
-
-            if (attr->cmdtype == APR_PROGRAM_PATH) {
-                progname = NULL;
-            }
-        }
-    }
-
-    if (!env || attr->cmdtype == APR_PROGRAM_ENV ||
-        attr->cmdtype == APR_SHELLCMD_ENV) {
-        pEnvBlock = NULL;
-    }
-    else {
-        apr_size_t iEnvBlockLen;
-        /*
-         * Win32's CreateProcess call requires that the environment
-         * be passed in an environment block, a null terminated block of
-         * null terminated strings.
-         */  
-        i = 0;
-        iEnvBlockLen = 1;
-        while (env[i]) {
-            iEnvBlockLen += strlen(env[i]) + 1;
-            i++;
-        }
-        if (!i) 
-            ++iEnvBlockLen;
-
-#if APR_HAS_UNICODE_FS
-        IF_WIN_OS_IS_UNICODE
-        {
-            apr_wchar_t *pNext;
-            pEnvBlock = (char *)apr_palloc(pool, iEnvBlockLen * 2);
-            dwCreationFlags |= CREATE_UNICODE_ENVIRONMENT;
-
-            i = 0;
-            pNext = (apr_wchar_t*)pEnvBlock;
-            while (env[i]) {
-                apr_size_t in = strlen(env[i]) + 1;
-                if ((rv = apr_conv_utf8_to_ucs2(env[i], &in, 
-                                                pNext, &iEnvBlockLen)) 
-                        != APR_SUCCESS) {
-                    if (attr->errfn) {
-                        attr->errfn(pool, rv, 
-                                    apr_pstrcat(pool, 
-                                                "utf8 to ucs2 conversion failed" 
-                                                " on this string: ", env[i], NULL));
-                    }
-                    return rv;
-                }
-                pNext = wcschr(pNext, L'\0') + 1;
-                i++;
-            }
-	    if (!i)
-                *(pNext++) = L'\0';
-	    *pNext = L'\0';
-        }
-#endif /* APR_HAS_UNICODE_FS */
-#if APR_HAS_ANSI_FS
-        ELSE_WIN_OS_IS_ANSI
-        {
-            char *pNext;
-            pEnvBlock = (char *)apr_palloc(pool, iEnvBlockLen);
-    
-            i = 0;
-            pNext = pEnvBlock;
-            while (env[i]) {
-                strcpy(pNext, env[i]);
-                pNext = strchr(pNext, '\0') + 1;
-                i++;
-            }
-	    if (!i)
-                *(pNext++) = '\0';
-	    *pNext = '\0';
-        }
-#endif /* APR_HAS_ANSI_FS */
-    } 
-
-    new->invoked = cmdline;
-
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-        STARTUPINFOW si;
-        DWORD stdin_reset = 0;
-        DWORD stdout_reset = 0;
-        DWORD stderr_reset = 0;
-        apr_wchar_t *wprg = NULL;
-        apr_wchar_t *wcmd = NULL;
-        apr_wchar_t *wcwd = NULL;
-
-        if (progname) {
-            apr_size_t nprg = strlen(progname) + 1;
-            apr_size_t nwprg = nprg + 6;
-            wprg = apr_palloc(pool, nwprg * sizeof(wprg[0]));
-            if ((rv = apr_conv_utf8_to_ucs2(progname, &nprg, wprg, &nwprg))
-                   != APR_SUCCESS) {
-                if (attr->errfn) {
-                    attr->errfn(pool, rv, 
-                                apr_pstrcat(pool, 
-                                            "utf8 to ucs2 conversion failed" 
-                                            " on progname: ", progname, NULL));
-                }
-                return rv;
-            }
-        }
-
-        if (cmdline) {
-            apr_size_t ncmd = strlen(cmdline) + 1;
-            apr_size_t nwcmd = ncmd;
-            wcmd = apr_palloc(pool, nwcmd * sizeof(wcmd[0]));
-            if ((rv = apr_conv_utf8_to_ucs2(cmdline, &ncmd, wcmd, &nwcmd))
-                    != APR_SUCCESS) {
-                if (attr->errfn) {
-                    attr->errfn(pool, rv, 
-                                apr_pstrcat(pool, 
-                                            "utf8 to ucs2 conversion failed" 
-                                            " on cmdline: ", cmdline, NULL));
-                }
-                return rv;
-            }
-        }
-
-        if (attr->currdir)
-        {
-            apr_size_t ncwd = strlen(attr->currdir) + 1;
-            apr_size_t nwcwd = ncwd;
-            wcwd = apr_palloc(pool, ncwd * sizeof(wcwd[0]));
-            if ((rv = apr_conv_utf8_to_ucs2(attr->currdir, &ncwd, 
-                                            wcwd, &nwcwd))
-                    != APR_SUCCESS) {
-                if (attr->errfn) {
-                    attr->errfn(pool, rv, 
-                                apr_pstrcat(pool, 
-                                            "utf8 to ucs2 conversion failed" 
-                                            " on currdir: ", attr->currdir, NULL));
-                }
-                return rv;
-            }
-        }
-
-        memset(&si, 0, sizeof(si));
-        si.cb = sizeof(si);
-
-        if (attr->detached) {
-            si.dwFlags |= STARTF_USESHOWWINDOW;
-            si.wShowWindow = SW_HIDE;
-        }
-
-#ifndef _WIN32_WCE
-        /* LOCK CRITICAL SECTION 
-         * before we begin to manipulate the inherited handles
-         */
-        EnterCriticalSection(&proc_lock);
-
-        if ((attr->child_in && attr->child_in->filehand)
-            || (attr->child_out && attr->child_out->filehand)
-            || (attr->child_err && attr->child_err->filehand))
-        {
-            si.dwFlags |= STARTF_USESTDHANDLES;
-
-            si.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
-            if (GetHandleInformation(si.hStdInput, &stdin_reset)
-                    && (stdin_reset &= HANDLE_FLAG_INHERIT))
-                SetHandleInformation(si.hStdInput,
-                                     HANDLE_FLAG_INHERIT, 0);
-
-            if (attr->child_in && attr->child_in->filehand)
-            {
-                si.hStdInput = attr->child_in->filehand;
-                SetHandleInformation(si.hStdInput, HANDLE_FLAG_INHERIT,
-                                                   HANDLE_FLAG_INHERIT);
-            }
-            else
-                si.hStdInput = INVALID_HANDLE_VALUE;
-            
-            si.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
-            if (GetHandleInformation(si.hStdOutput, &stdout_reset)
-                    && (stdout_reset &= HANDLE_FLAG_INHERIT))
-                SetHandleInformation(si.hStdOutput,
-                                     HANDLE_FLAG_INHERIT, 0);
-
-            if (attr->child_out && attr->child_out->filehand)
-            {
-                si.hStdOutput = attr->child_out->filehand;
-                SetHandleInformation(si.hStdOutput, HANDLE_FLAG_INHERIT,
-                                                    HANDLE_FLAG_INHERIT);
-            }
-            else
-                si.hStdOutput = INVALID_HANDLE_VALUE;
-
-            si.hStdError = GetStdHandle(STD_ERROR_HANDLE);
-            if (GetHandleInformation(si.hStdError, &stderr_reset)
-                    && (stderr_reset &= HANDLE_FLAG_INHERIT))
-                SetHandleInformation(si.hStdError,
-                                     HANDLE_FLAG_INHERIT, 0);
-
-            if (attr->child_err && attr->child_err->filehand)
-            {
-                si.hStdError = attr->child_err->filehand;
-                SetHandleInformation(si.hStdError, HANDLE_FLAG_INHERIT,
-                                                   HANDLE_FLAG_INHERIT);
-            }
-            else
-                si.hStdError = INVALID_HANDLE_VALUE;
-        }
-        rv = CreateProcessW(wprg, wcmd,        /* Executable & Command line */
-                            NULL, NULL,        /* Proc & thread security attributes */
-                            TRUE,              /* Inherit handles */
-                            dwCreationFlags,   /* Creation flags */
-                            pEnvBlock,         /* Environment block */
-                            wcwd,              /* Current directory name */
-                            &si, &pi);
-
-        if ((attr->child_in && attr->child_in->filehand)
-            || (attr->child_out && attr->child_out->filehand)
-            || (attr->child_err && attr->child_err->filehand))
-        {
-            if (stdin_reset)
-                SetHandleInformation(GetStdHandle(STD_INPUT_HANDLE),
-                                     stdin_reset, stdin_reset);
-
-            if (stdout_reset)
-                SetHandleInformation(GetStdHandle(STD_OUTPUT_HANDLE),
-                                     stdout_reset, stdout_reset);
-
-            if (stderr_reset)
-                SetHandleInformation(GetStdHandle(STD_ERROR_HANDLE),
-                                     stderr_reset, stderr_reset);
-        }
-        /* RELEASE CRITICAL SECTION 
-         * The state of the inherited handles has been restored.
-         */
-        LeaveCriticalSection(&proc_lock);
-
-#else /* defined(_WIN32_WCE) */
-        rv = CreateProcessW(wprg, wcmd,        /* Executable & Command line */
-                            NULL, NULL,        /* Proc & thread security attributes */
-                            FALSE,             /* must be 0 */
-                            dwCreationFlags,   /* Creation flags */
-                            NULL,              /* Environment block must be NULL */
-                            NULL,              /* Current directory name must be NULL*/
-                            NULL,              /* STARTUPINFO not supported */
-                            &pi);
-#endif
-    }
-#endif /* APR_HAS_UNICODE_FS */
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-    {
-        STARTUPINFOA si;
-        memset(&si, 0, sizeof(si));
-        si.cb = sizeof(si);
-
-        if (attr->detached) {
-            si.dwFlags |= STARTF_USESHOWWINDOW;
-            si.wShowWindow = SW_HIDE;
-        }
-
-        if ((attr->child_in && attr->child_in->filehand)
-            || (attr->child_out && attr->child_out->filehand)
-            || (attr->child_err && attr->child_err->filehand))
-        {
-            si.dwFlags |= STARTF_USESTDHANDLES;
-
-            si.hStdInput = (attr->child_in) 
-                              ? attr->child_in->filehand
-                              : GetStdHandle(STD_INPUT_HANDLE);
-
-            si.hStdOutput = (attr->child_out)
-                              ? attr->child_out->filehand
-                              : GetStdHandle(STD_OUTPUT_HANDLE);
-
-            si.hStdError = (attr->child_err)
-                              ? attr->child_err->filehand
-                              : GetStdHandle(STD_ERROR_HANDLE);
-        }
-
-        rv = CreateProcessA(progname, cmdline, /* Command line */
-                            NULL, NULL,        /* Proc & thread security attributes */
-                            TRUE,              /* Inherit handles */
-                            dwCreationFlags,   /* Creation flags */
-                            pEnvBlock,         /* Environment block */
-                            attr->currdir,     /* Current directory name */
-                            &si, &pi);
-    }
-#endif /* APR_HAS_ANSI_FS */
-
-    /* Check CreateProcess result 
-     */
-    if (!rv)
-        return apr_get_os_error();
-
-    /* XXX Orphaned handle warning - no fix due to broken apr_proc_t api.
-     */
-    new->hproc = pi.hProcess;
-    new->pid = pi.dwProcessId;
-
-    if (attr->child_in) {
-        apr_file_close(attr->child_in);
-    }
-    if (attr->child_out) {
-        apr_file_close(attr->child_out);
-    }
-    if (attr->child_err) {
-        apr_file_close(attr->child_err);
-    }
-    CloseHandle(pi.hThread);
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_proc_wait_all_procs(apr_proc_t *proc,
-                                                  int *exitcode,
-                                                  apr_exit_why_e *exitwhy,
-                                                  apr_wait_how_e waithow,
-                                                  apr_pool_t *p)
-{
-    /* Unix does apr_proc_wait(proc(-1), exitcode, exitwhy, waithow)
-     * but Win32's apr_proc_wait won't work that way.  We can either
-     * register all APR created processes in some sort of AsyncWait
-     * thread, or simply walk from the global process pool for all 
-     * apr_pool_note_subprocess()es registered with APR.
-     */
-    return APR_ENOTIMPL;
-}
-
-static apr_exit_why_e why_from_exit_code(DWORD exit) {
-    /* See WinNT.h STATUS_ACCESS_VIOLATION and family for how
-     * this class of failures was determined
-     */
-    if (((exit & 0xC0000000) == 0xC0000000) 
-                    && !(exit & 0x3FFF0000))
-        return APR_PROC_SIGNAL;
-    else
-        return APR_PROC_EXIT;
-
-    /* ### No way to tell if Dr Watson grabbed a core, AFAICT. */
-}
-
-APR_DECLARE(apr_status_t) apr_proc_wait(apr_proc_t *proc,
-                                        int *exitcode, apr_exit_why_e *exitwhy,
-                                        apr_wait_how_e waithow)
-{
-    DWORD stat;
-    DWORD time;
-
-    if (waithow == APR_WAIT)
-        time = INFINITE;
-    else
-        time = 0;
-
-    if ((stat = WaitForSingleObject(proc->hproc, time)) == WAIT_OBJECT_0) {
-        if (GetExitCodeProcess(proc->hproc, &stat)) {
-            if (exitcode)
-                *exitcode = stat;
-            if (exitwhy)
-                *exitwhy = why_from_exit_code(stat);
-            CloseHandle(proc->hproc);
-            proc->hproc = NULL;
-            return APR_CHILD_DONE;
-        }
-    }
-    else if (stat == WAIT_TIMEOUT) {
-        return APR_CHILD_NOTDONE;
-    }
-    return apr_get_os_error();
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/win32/signals.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/win32/signals.c
deleted file mode 100644
index 24c9dd53..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/win32/signals.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "win32/apr_arch_threadproc.h"
-#include "win32/apr_arch_file_io.h"
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#if APR_HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-#include <string.h>
-#if APR_HAVE_SYS_WAIT
-#include <sys/wait.h>
-#endif
-
-/* Windows only really support killing process, but that will do for now. 
- *
- * ### Actually, closing the input handle to the proc should also do fine 
- * for most console apps.  This definately needs improvement...
- */
-APR_DECLARE(apr_status_t) apr_proc_kill(apr_proc_t *proc, int signal)
-{
-    if (proc->hproc != NULL) {
-        if (TerminateProcess(proc->hproc, signal) == 0) {
-            return apr_get_os_error();
-        }
-        /* On unix, SIGKILL leaves a apr_proc_wait()able pid lying around, 
-         * so we will leave hproc alone until the app calls apr_proc_wait().
-         */
-        return APR_SUCCESS;
-    }
-    return APR_EPROC_UNKNOWN;
-}
-
-void apr_signal_init(apr_pool_t *pglobal)
-{
-}
-
-const char *apr_signal_description_get(int signum)
-{
-    return "unknown signal (not supported)";
-}
-
-/* Deprecated */
-const char *apr_signal_get_description(int signum)
-{
-    return apr_signal_description_get(signum);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/win32/thread.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/win32/thread.c
deleted file mode 100644
index 64317d9b..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/win32/thread.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_private.h"
-#include "win32/apr_arch_threadproc.h"
-#include "apr_thread_proc.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_portable.h"
-#if APR_HAVE_PROCESS_H
-#include <process.h>
-#endif
-#include "apr_arch_misc.h"   
-
-/* Chosen for us by apr_initialize */
-DWORD tls_apr_thread = 0;
-
-APR_DECLARE(apr_status_t) apr_threadattr_create(apr_threadattr_t **new,
-                                                apr_pool_t *pool)
-{
-    (*new) = (apr_threadattr_t *)apr_palloc(pool, 
-              sizeof(apr_threadattr_t));
-
-    if ((*new) == NULL) {
-        return APR_ENOMEM;
-    }
-
-    (*new)->pool = pool;
-    (*new)->detach = 0;
-    (*new)->stacksize = 0;
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_threadattr_detach_set(apr_threadattr_t *attr,
-                                                   apr_int32_t on)
-{
-    attr->detach = on;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_threadattr_detach_get(apr_threadattr_t *attr)
-{
-    if (attr->detach == 1)
-        return APR_DETACH;
-    return APR_NOTDETACH;
-}
-
-APR_DECLARE(apr_status_t) apr_threadattr_stacksize_set(apr_threadattr_t *attr,
-                                                       apr_size_t stacksize)
-{
-    attr->stacksize = stacksize;
-    return APR_SUCCESS;
-}
-
-static void *dummy_worker(void *opaque)
-{
-    apr_thread_t *thd = (apr_thread_t *)opaque;
-    TlsSetValue(tls_apr_thread, thd->td);
-    return thd->func(thd, thd->data);
-}
-
-APR_DECLARE(apr_status_t) apr_thread_create(apr_thread_t **new,
-                                            apr_threadattr_t *attr,
-                                            apr_thread_start_t func,
-                                            void *data, apr_pool_t *pool)
-{
-    apr_status_t stat;
-	unsigned temp;
-    HANDLE   handle;
-    
-    (*new) = (apr_thread_t *)apr_palloc(pool, sizeof(apr_thread_t));
-
-    if ((*new) == NULL) {
-        return APR_ENOMEM;
-    }
-
-    (*new)->pool = pool;
-    (*new)->data = data;
-    (*new)->func = func;
-    (*new)->td   = NULL;
-
-    stat = apr_pool_create(&(*new)->pool, pool);
-    if (stat != APR_SUCCESS) {
-        return stat;
-    }
-
-    /* Use 0 for Thread Stack Size, because that will default the stack to the
-     * same size as the calling thread. 
-     */
-#ifndef _WIN32_WCE
-    if ((handle = (HANDLE)_beginthreadex(NULL,
-                        attr && attr->stacksize > 0 ? attr->stacksize : 0,
-                        (unsigned int (APR_THREAD_FUNC *)(void *))dummy_worker,
-                        (*new), 0, &temp)) == 0) {
-        return APR_FROM_OS_ERROR(_doserrno);
-    }
-#else
-   if ((handle = CreateThread(NULL,
-                        attr && attr->stacksize > 0 ? attr->stacksize : 0,
-                        (unsigned int (APR_THREAD_FUNC *)(void *))dummy_worker,
-                        (*new), 0, &temp)) == 0) {
-        return apr_get_os_error();
-    }
-#endif
-    if (attr && attr->detach) {
-        CloseHandle(handle);
-    }
-    else
-        (*new)->td = handle;
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_exit(apr_thread_t *thd,
-                                          apr_status_t retval)
-{
-    thd->exitval = retval;
-    apr_pool_destroy(thd->pool);
-    thd->pool = NULL;
-#ifndef _WIN32_WCE
-    _endthreadex(0);
-#else
-    ExitThread(0);
-#endif
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_join(apr_status_t *retval,
-                                          apr_thread_t *thd)
-{
-    apr_status_t rv = APR_SUCCESS;
-    
-    if (!thd->td) {
-        /* Can not join on detached threads */
-        return APR_DETACH;
-    }
-    rv = WaitForSingleObject(thd->td, INFINITE);
-    if ( rv == WAIT_OBJECT_0 || rv == WAIT_ABANDONED) {
-        /* If the thread_exit has been called */
-        if (!thd->pool)
-            *retval = thd->exitval;
-        else
-            rv = APR_INCOMPLETE;
-    }
-    else
-        rv = apr_get_os_error();
-    CloseHandle(thd->td);
-    thd->td = NULL;
-
-    return rv;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_detach(apr_thread_t *thd)
-{
-    if (thd->td && CloseHandle(thd->td)) {
-        thd->td = NULL;
-        return APR_SUCCESS;
-    }
-    else {
-        return apr_get_os_error();
-    }
-}
-
-APR_DECLARE(void) apr_thread_yield()
-{
-    /* SwitchToThread is not supported on Win9x, but since it's
-     * primarily a noop (entering time consuming code, therefore
-     * providing more critical threads a bit larger timeslice)
-     * we won't worry too much if it's not available.
-     */
-#ifndef _WIN32_WCE
-    if (apr_os_level >= APR_WIN_NT) {
-        SwitchToThread();
-    }
-#endif
-}
-
-APR_DECLARE(apr_status_t) apr_thread_data_get(void **data, const char *key,
-                                             apr_thread_t *thread)
-{
-    return apr_pool_userdata_get(data, key, thread->pool);
-}
-
-APR_DECLARE(apr_status_t) apr_thread_data_set(void *data, const char *key,
-                                             apr_status_t (*cleanup) (void *),
-                                             apr_thread_t *thread)
-{
-    return apr_pool_userdata_set(data, key, cleanup, thread->pool);
-}
-
-
-APR_DECLARE(apr_os_thread_t) apr_os_thread_current(void)
-{
-    HANDLE hthread = (HANDLE)TlsGetValue(tls_apr_thread);
-    HANDLE hproc;
-
-    if (hthread) {
-        return hthread;
-    }
-    
-    hproc = GetCurrentProcess();
-    hthread = GetCurrentThread();
-    if (!DuplicateHandle(hproc, hthread, 
-                         hproc, &hthread, 0, FALSE, 
-                         DUPLICATE_SAME_ACCESS)) {
-        return NULL;
-    }
-    TlsSetValue(tls_apr_thread, hthread);
-    return hthread;
-}
-
-APR_DECLARE(apr_status_t) apr_os_thread_get(apr_os_thread_t **thethd,
-                                            apr_thread_t *thd)
-{
-    if (thd == NULL) {
-        return APR_ENOTHREAD;
-    }
-    *thethd = thd->td;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_thread_put(apr_thread_t **thd,
-                                            apr_os_thread_t *thethd,
-                                            apr_pool_t *pool)
-{
-    if (pool == NULL) {
-        return APR_ENOPOOL;
-    }
-    if ((*thd) == NULL) {
-        (*thd) = (apr_thread_t *)apr_palloc(pool, sizeof(apr_thread_t));
-        (*thd)->pool = pool;
-    }
-    (*thd)->td = thethd;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_once_init(apr_thread_once_t **control,
-                                               apr_pool_t *p)
-{
-    (*control) = apr_pcalloc(p, sizeof(**control));
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_thread_once(apr_thread_once_t *control,
-                                          void (*func)(void))
-{
-    if (!InterlockedExchange(&control->value, 1)) {
-        func();
-    }
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(int) apr_os_thread_equal(apr_os_thread_t tid1,
-                                     apr_os_thread_t tid2)
-{
-    /* Since the only tid's we support our are own, and
-     * apr_os_thread_current returns the identical handle
-     * to the one we created initially, the test is simple.
-     */
-    return (tid1 == tid2);
-}
-
-APR_POOL_IMPLEMENT_ACCESSOR(thread)
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/win32/threadpriv.c b/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/win32/threadpriv.c
deleted file mode 100644
index 9ddc24fb..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/threadproc/win32/threadpriv.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "win32/apr_arch_threadproc.h"
-#include "apr_thread_proc.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_errno.h"
-#include "apr_portable.h"
-
-APR_DECLARE(apr_status_t) apr_threadkey_private_create(apr_threadkey_t **key,
-                                                    void (*dest)(void *),
-                                                    apr_pool_t *pool)
-{
-    (*key) = (apr_threadkey_t *)apr_palloc(pool, sizeof(apr_threadkey_t));
-    if ((*key) == NULL) {
-        return APR_ENOMEM;
-    }
-
-    (*key)->pool = pool;
-
-    if (((*key)->key = TlsAlloc()) != 0xFFFFFFFF) {
-        return APR_SUCCESS;
-    }
-    return apr_get_os_error();
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_private_get(void **new,
-                                                 apr_threadkey_t *key)
-{
-    if ((*new) = TlsGetValue(key->key)) {
-        return APR_SUCCESS;
-    }
-    return apr_get_os_error();
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_private_set(void *priv,
-                                                 apr_threadkey_t *key)
-{
-    if (TlsSetValue(key->key, priv)) {
-        return APR_SUCCESS;
-    }
-    return apr_get_os_error();
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_private_delete(apr_threadkey_t *key)
-{
-    if (TlsFree(key->key)) {
-        return APR_SUCCESS; 
-    }
-    return apr_get_os_error();
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_data_get(void **data, const char *key,
-                                                apr_threadkey_t *threadkey)
-{
-    return apr_pool_userdata_get(data, key, threadkey->pool);
-}
-
-APR_DECLARE(apr_status_t) apr_threadkey_data_set(void *data, const char *key,
-                                                apr_status_t (*cleanup)(void *),
-                                                apr_threadkey_t *threadkey)
-{
-    return apr_pool_userdata_set(data, key, cleanup, threadkey->pool);
-}
-
-APR_DECLARE(apr_status_t) apr_os_threadkey_get(apr_os_threadkey_t *thekey,
-                                               apr_threadkey_t *key)
-{
-    *thekey = key->key;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_threadkey_put(apr_threadkey_t **key,
-                                               apr_os_threadkey_t *thekey,
-                                               apr_pool_t *pool)
-{
-    if (pool == NULL) {
-        return APR_ENOPOOL;
-    }
-    if ((*key) == NULL) {
-        (*key) = (apr_threadkey_t *)apr_palloc(pool, sizeof(apr_threadkey_t));
-        (*key)->pool = pool;
-    }
-    (*key)->key = *thekey;
-    return APR_SUCCESS;
-}           
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/.libs/time.o b/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/.libs/time.o
deleted file mode 100644
index 316635d7..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/.libs/time.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/.libs/timestr.o b/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/.libs/timestr.o
deleted file mode 100644
index 95193180..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/.libs/timestr.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/Makefile
deleted file mode 100644
index 80911a61..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-srcdir = .
-
-
-TARGETS = time.lo timestr.lo
-
-# bring in rules.mk for standard functionality
-include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
-
-DEFOSDIR=$(INCDIR)/arch/unix
-INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/Makefile.in
deleted file mode 100644
index 1cc010b5..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = time.lo timestr.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/time.c b/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/time.c
deleted file mode 100644
index bcfa8195..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/time.c
+++ /dev/null
@@ -1,351 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_portable.h"
-#include "apr_time.h"
-#include "apr_lib.h"
-#include "apr_private.h"
-#include "apr_strings.h"
-
-/* private APR headers */
-#include "apr_arch_internal_time.h"
-
-/* System Headers required for time library */
-#if APR_HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_TIME_H
-#include <time.h>
-#endif
-/* End System Headers */
-
-#if !defined(HAVE_GMTOFF) && !defined(HAVE___OFFSET)
-static apr_int32_t server_gmt_offset;
-#endif /* if !defined(HAVE_GMTOFF) && !defined(HAVE___OFFSET) */
-
-static apr_int32_t get_offset(struct tm *tm)
-{
-#ifdef HAVE_GMTOFF
-    return tm->tm_gmtoff;
-#elif defined(HAVE___OFFSET)
-    return tm->__tm_gmtoff;
-#else
-#ifdef NETWARE
-    /* Need to adjust the global variable each time otherwise
-        the web server would have to be restarted when daylight
-        savings changes.
-    */
-    if (daylightOnOff) {
-        return server_gmt_offset + daylightOffset;
-    }
-#else
-    if(tm->tm_isdst)
-        return server_gmt_offset + 3600;
-#endif
-    return server_gmt_offset;
-#endif
-}
-
-APR_DECLARE(apr_status_t) apr_time_ansi_put(apr_time_t *result,
-                                            time_t input)
-{
-    *result = (apr_time_t)input * APR_USEC_PER_SEC;
-    return APR_SUCCESS;
-}
-
-/* NB NB NB NB This returns GMT!!!!!!!!!! */
-APR_DECLARE(apr_time_t) apr_time_now(void)
-{
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    return tv.tv_sec * APR_USEC_PER_SEC + tv.tv_usec;
-}
-
-static void explode_time(apr_time_exp_t *xt, apr_time_t t,
-                         apr_int32_t offset, int use_localtime)
-{
-    struct tm tm;
-    time_t tt = (t / APR_USEC_PER_SEC) + offset;
-    xt->tm_usec = t % APR_USEC_PER_SEC;
-
-#if APR_HAS_THREADS && defined (_POSIX_THREAD_SAFE_FUNCTIONS)
-    if (use_localtime)
-        localtime_r(&tt, &tm);
-    else
-        gmtime_r(&tt, &tm);
-#else
-    if (use_localtime)
-        tm = *localtime(&tt);
-    else
-        tm = *gmtime(&tt);
-#endif
-
-    xt->tm_sec  = tm.tm_sec;
-    xt->tm_min  = tm.tm_min;
-    xt->tm_hour = tm.tm_hour;
-    xt->tm_mday = tm.tm_mday;
-    xt->tm_mon  = tm.tm_mon;
-    xt->tm_year = tm.tm_year;
-    xt->tm_wday = tm.tm_wday;
-    xt->tm_yday = tm.tm_yday;
-    xt->tm_isdst = tm.tm_isdst;
-    xt->tm_gmtoff = get_offset(&tm);
-}
-
-APR_DECLARE(apr_status_t) apr_time_exp_tz(apr_time_exp_t *result,
-                                          apr_time_t input, apr_int32_t offs)
-{
-    explode_time(result, input, offs, 0);
-    result->tm_gmtoff = offs;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_time_exp_gmt(apr_time_exp_t *result,
-                                           apr_time_t input)
-{
-    return apr_time_exp_tz(result, input, 0);
-}
-
-APR_DECLARE(apr_status_t) apr_time_exp_lt(apr_time_exp_t *result,
-                                                apr_time_t input)
-{
-#if defined(__EMX__)
-    /* EMX gcc (OS/2) has a timezone global we can use */
-    return apr_time_exp_tz(result, input, -timezone);
-#else
-    explode_time(result, input, 0, 1);
-    return APR_SUCCESS;
-#endif /* __EMX__ */
-}
-
-APR_DECLARE(apr_status_t) apr_time_exp_get(apr_time_t *t, apr_time_exp_t *xt)
-{
-    apr_time_t year = xt->tm_year;
-    apr_time_t days;
-    static const int dayoffset[12] =
-    {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275};
-
-    /* shift new year to 1st March in order to make leap year calc easy */
-
-    if (xt->tm_mon < 2)
-        year--;
-
-    /* Find number of days since 1st March 1900 (in the Gregorian calendar). */
-
-    days = year * 365 + year / 4 - year / 100 + (year / 100 + 3) / 4;
-    days += dayoffset[xt->tm_mon] + xt->tm_mday - 1;
-    days -= 25508;              /* 1 jan 1970 is 25508 days since 1 mar 1900 */
-    days = ((days * 24 + xt->tm_hour) * 60 + xt->tm_min) * 60 + xt->tm_sec;
-
-    if (days < 0) {
-        return APR_EBADDATE;
-    }
-    *t = days * APR_USEC_PER_SEC + xt->tm_usec;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_time_exp_gmt_get(apr_time_t *t, 
-                                               apr_time_exp_t *xt)
-{
-    apr_status_t status = apr_time_exp_get(t, xt);
-    if (status == APR_SUCCESS)
-        *t -= (apr_time_t) xt->tm_gmtoff * APR_USEC_PER_SEC;
-    return status;
-}
-
-APR_DECLARE(apr_status_t) apr_os_imp_time_get(apr_os_imp_time_t **ostime,
-                                              apr_time_t *aprtime)
-{
-    (*ostime)->tv_usec = *aprtime % APR_USEC_PER_SEC;
-    (*ostime)->tv_sec = *aprtime / APR_USEC_PER_SEC;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_exp_time_get(apr_os_exp_time_t **ostime,
-                                              apr_time_exp_t *aprtime)
-{
-    (*ostime)->tm_sec  = aprtime->tm_sec;
-    (*ostime)->tm_min  = aprtime->tm_min;
-    (*ostime)->tm_hour = aprtime->tm_hour;
-    (*ostime)->tm_mday = aprtime->tm_mday;
-    (*ostime)->tm_mon  = aprtime->tm_mon;
-    (*ostime)->tm_year = aprtime->tm_year;
-    (*ostime)->tm_wday = aprtime->tm_wday;
-    (*ostime)->tm_yday = aprtime->tm_yday;
-    (*ostime)->tm_isdst = aprtime->tm_isdst;
-
-#if HAVE_GMTOFF
-    (*ostime)->tm_gmtoff = aprtime->tm_gmtoff;
-#elif defined(HAVE__OFFSET)
-    (*ostime)->__tm_gmtoff = aprtime->tm_gmtoff;
-#endif
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_imp_time_put(apr_time_t *aprtime,
-                                              apr_os_imp_time_t **ostime,
-                                              apr_pool_t *cont)
-{
-    *aprtime = (*ostime)->tv_sec * APR_USEC_PER_SEC + (*ostime)->tv_usec;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_exp_time_put(apr_time_exp_t *aprtime,
-                                              apr_os_exp_time_t **ostime,
-                                              apr_pool_t *cont)
-{
-    aprtime->tm_sec = (*ostime)->tm_sec;
-    aprtime->tm_min = (*ostime)->tm_min;
-    aprtime->tm_hour = (*ostime)->tm_hour;
-    aprtime->tm_mday = (*ostime)->tm_mday;
-    aprtime->tm_mon = (*ostime)->tm_mon;
-    aprtime->tm_year = (*ostime)->tm_year;
-    aprtime->tm_wday = (*ostime)->tm_wday;
-    aprtime->tm_yday = (*ostime)->tm_yday;
-    aprtime->tm_isdst = (*ostime)->tm_isdst;
-
-#if HAVE_GMTOFF
-    aprtime->tm_gmtoff = (*ostime)->tm_gmtoff;
-#elif defined(HAVE__OFFSET)
-    aprtime->tm_gmtoff = (*ostime)->__tm_gmtoff;
-#endif
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(void) apr_sleep(apr_interval_time_t t)
-{
-#ifdef OS2
-    DosSleep(t/1000);
-#elif defined(BEOS)
-    snooze(t);
-#elif defined(NETWARE)
-    delay(t/1000);
-#else
-    struct timeval tv;
-    tv.tv_usec = t % APR_USEC_PER_SEC;
-    tv.tv_sec = t / APR_USEC_PER_SEC;
-    select(0, NULL, NULL, NULL, &tv);
-#endif
-}
-
-#ifdef OS2
-APR_DECLARE(apr_status_t) apr_os2_time_to_apr_time(apr_time_t *result,
-                                                   FDATE os2date,
-                                                   FTIME os2time)
-{
-  struct tm tmpdate;
-
-  memset(&tmpdate, 0, sizeof(tmpdate));
-  tmpdate.tm_hour  = os2time.hours;
-  tmpdate.tm_min   = os2time.minutes;
-  tmpdate.tm_sec   = os2time.twosecs * 2;
-
-  tmpdate.tm_mday  = os2date.day;
-  tmpdate.tm_mon   = os2date.month - 1;
-  tmpdate.tm_year  = os2date.year + 80;
-  tmpdate.tm_isdst = -1;
-
-  *result = mktime(&tmpdate) * APR_USEC_PER_SEC;
-  return APR_SUCCESS;
-}
-#endif
-
-#ifdef NETWARE
-APR_DECLARE(void) apr_netware_setup_time(void)
-{
-    tzset();
-    server_gmt_offset = -TZONE;
-}
-#else
-APR_DECLARE(void) apr_unix_setup_time(void)
-{
-#if !defined(HAVE_GMTOFF) && !defined(HAVE___OFFSET)
-    /* Precompute the offset from GMT on systems where it's not
-       in struct tm.
-
-       Note: This offset is normalized to be independent of daylight
-       savings time; if the calculation happens to be done in a
-       time/place where a daylight savings adjustment is in effect,
-       the returned offset has the same value that it would have
-       in the same location if daylight savings were not in effect.
-       The reason for this is that the returned offset can be
-       applied to a past or future timestamp in explode_time(),
-       so the DST adjustment obtained from the current time won't
-       necessarily be applicable.
-
-       mktime() is the inverse of localtime(); so, presumably,
-       passing in a struct tm made by gmtime() let's us calculate
-       the true GMT offset. However, there's a catch: if daylight
-       savings is in effect, gmtime()will set the tm_isdst field
-       and confuse mktime() into returning a time that's offset
-       by one hour. In that case, we must adjust the calculated GMT
-       offset.
-
-     */
-
-    struct timeval now;
-    time_t t1, t2;
-    struct tm t;
-
-    gettimeofday(&now, NULL);
-    t1 = now.tv_sec;
-    t2 = 0;
-
-#if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-    gmtime_r(&t1, &t);
-#else
-    t = *gmtime(&t1);
-#endif
-    t.tm_isdst = 0; /* we know this GMT time isn't daylight-savings */
-    t2 = mktime(&t);
-    server_gmt_offset = (apr_int32_t) difftime(t1, t2);
-#endif
-}
-
-#endif
-
-/* A noop on all known Unix implementations */
-APR_DECLARE(void) apr_time_clock_hires(apr_pool_t *p)
-{
-    return;
-}
-
-/* Deprecated */
-APR_DECLARE(apr_status_t) apr_explode_time(apr_time_exp_t *result,
-                                          apr_time_t input,
-                                          apr_int32_t offs)
-{
-    return apr_time_exp_tz(result, input, offs);
-}
-
-/* Deprecated */
-APR_DECLARE(apr_status_t) apr_explode_localtime(apr_time_exp_t *result, 
-                                                apr_time_t input)
-{
-    return apr_time_exp_lt(result, input);
-}
-
-/* Deprecated */
-APR_DECLARE(apr_status_t) apr_implode_gmt(apr_time_t *t, apr_time_exp_t *xt)
-{
-    return apr_time_exp_gmt_get(t, xt);
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/time.lo b/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/time.lo
deleted file mode 100644
index 74d7a1e1..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/time.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# time.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/time.o'
-
-# Name of the non-PIC object.
-non_pic_object='time.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/time.o b/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/time.o
deleted file mode 100644
index 1e407ae2..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/time.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/timestr.c b/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/timestr.c
deleted file mode 100644
index 14f27b7e..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/timestr.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_portable.h"
-#include "apr_time.h"
-#include "apr_lib.h"
-#include "apr_private.h"
-/* System Headers required for time library */
-#if APR_HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_TIME_H
-#include <time.h>
-#endif
-#if APR_HAVE_STRING_H
-#include <string.h>
-#endif
-/* End System Headers */
-
-APR_DECLARE_DATA const char apr_month_snames[12][4] =
-{
-    "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-APR_DECLARE_DATA const char apr_day_snames[7][4] =
-{
-    "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-};
-
-apr_status_t apr_rfc822_date(char *date_str, apr_time_t t)
-{
-    apr_time_exp_t xt;
-    const char *s;
-    int real_year;
-
-    apr_time_exp_gmt(&xt, t);
-
-    /* example: "Sat, 08 Jan 2000 18:31:41 GMT" */
-    /*           12345678901234567890123456789  */
-
-    s = &apr_day_snames[xt.tm_wday][0];
-    *date_str++ = *s++;
-    *date_str++ = *s++;
-    *date_str++ = *s++;
-    *date_str++ = ',';
-    *date_str++ = ' ';
-    *date_str++ = xt.tm_mday / 10 + '0';
-    *date_str++ = xt.tm_mday % 10 + '0';
-    *date_str++ = ' ';
-    s = &apr_month_snames[xt.tm_mon][0];
-    *date_str++ = *s++;
-    *date_str++ = *s++;
-    *date_str++ = *s++;
-    *date_str++ = ' ';
-    real_year = 1900 + xt.tm_year;
-    /* This routine isn't y10k ready. */
-    *date_str++ = real_year / 1000 + '0';
-    *date_str++ = real_year % 1000 / 100 + '0';
-    *date_str++ = real_year % 100 / 10 + '0';
-    *date_str++ = real_year % 10 + '0';
-    *date_str++ = ' ';
-    *date_str++ = xt.tm_hour / 10 + '0';
-    *date_str++ = xt.tm_hour % 10 + '0';
-    *date_str++ = ':';
-    *date_str++ = xt.tm_min / 10 + '0';
-    *date_str++ = xt.tm_min % 10 + '0';
-    *date_str++ = ':';
-    *date_str++ = xt.tm_sec / 10 + '0';
-    *date_str++ = xt.tm_sec % 10 + '0';
-    *date_str++ = ' ';
-    *date_str++ = 'G';
-    *date_str++ = 'M';
-    *date_str++ = 'T';
-    *date_str++ = 0;
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_ctime(char *date_str, apr_time_t t)
-{
-    apr_time_exp_t xt;
-    const char *s;
-    int real_year;
-
-    /* example: "Wed Jun 30 21:49:08 1993" */
-    /*           123456789012345678901234  */
-
-    apr_time_exp_lt(&xt, t);
-    s = &apr_day_snames[xt.tm_wday][0];
-    *date_str++ = *s++;
-    *date_str++ = *s++;
-    *date_str++ = *s++;
-    *date_str++ = ' ';
-    s = &apr_month_snames[xt.tm_mon][0];
-    *date_str++ = *s++;
-    *date_str++ = *s++;
-    *date_str++ = *s++;
-    *date_str++ = ' ';
-    *date_str++ = xt.tm_mday / 10 + '0';
-    *date_str++ = xt.tm_mday % 10 + '0';
-    *date_str++ = ' ';
-    *date_str++ = xt.tm_hour / 10 + '0';
-    *date_str++ = xt.tm_hour % 10 + '0';
-    *date_str++ = ':';
-    *date_str++ = xt.tm_min / 10 + '0';
-    *date_str++ = xt.tm_min % 10 + '0';
-    *date_str++ = ':';
-    *date_str++ = xt.tm_sec / 10 + '0';
-    *date_str++ = xt.tm_sec % 10 + '0';
-    *date_str++ = ' ';
-    real_year = 1900 + xt.tm_year;
-    *date_str++ = real_year / 1000 + '0';
-    *date_str++ = real_year % 1000 / 100 + '0';
-    *date_str++ = real_year % 100 / 10 + '0';
-    *date_str++ = real_year % 10 + '0';
-    *date_str++ = 0;
-
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_strftime(char *s, apr_size_t *retsize, apr_size_t max, 
-                        const char *format, apr_time_exp_t *xt)
-{
-    struct tm tm;
-    memset(&tm, 0, sizeof tm);
-    tm.tm_sec  = xt->tm_sec;
-    tm.tm_min  = xt->tm_min;
-    tm.tm_hour = xt->tm_hour;
-    tm.tm_mday = xt->tm_mday;
-    tm.tm_mon  = xt->tm_mon;
-    tm.tm_year = xt->tm_year;
-    tm.tm_wday = xt->tm_wday;
-    tm.tm_yday = xt->tm_yday;
-    tm.tm_isdst = xt->tm_isdst;
-#if defined(HAVE_GMTOFF)
-    tm.tm_gmtoff = xt->tm_gmtoff;
-#elif defined(HAVE___OFFSET)
-    tm.__tm_gmtoff = xt->tm_gmtoff;
-#endif
-    (*retsize) = strftime(s, max, format, &tm);
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/timestr.lo b/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/timestr.lo
deleted file mode 100644
index 0af55b22..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/timestr.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# timestr.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/timestr.o'
-
-# Name of the non-PIC object.
-non_pic_object='timestr.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/timestr.o b/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/timestr.o
deleted file mode 100644
index 2a0fe3d4..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/time/unix/timestr.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/time/win32/access.c b/rubbos/app/httpd-2.0.64/srclib/apr/time/win32/access.c
deleted file mode 100644
index cd25e2f0..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/time/win32/access.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "win32/apr_arch_atime.h"
-#include "apr_time.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-
-apr_status_t apr_get_curtime(struct atime_t *time, apr_time_t *rv)
-{
-    if (time) {
-        (*rv) = time->currtime;
-        return APR_SUCCESS;
-    }
-    return APR_ENOTIME;    
-}
-
-apr_status_t apr_get_sec(struct atime_t *time, apr_int32_t *rv)
-{
-    if (time) {
-        (*rv) = time->explodedtime->wSecond;
-        return APR_SUCCESS;
-    }
-    return APR_ENOTIME;
-}
-
-apr_status_t apr_get_min(struct atime_t *time, apr_int32_t *rv)
-{
-    if (time) {
-        (*rv) = time->explodedtime->wMinute;
-        return APR_SUCCESS;
-    }
-    return APR_ENOTIME;
-}
-
-apr_status_t apr_get_hour(struct atime_t *time, apr_int32_t *rv)
-{
-    if (time) {
-        (*rv) = time->explodedtime->wHour;
-        return APR_SUCCESS;
-    }
-    return APR_ENOTIME;
-}
-
-apr_status_t apr_get_mday(struct atime_t *time, apr_int32_t *rv)
-{
-    if (time) {
-        (*rv) = time->explodedtime->wDay;
-        return APR_SUCCESS;
-    }
-    return APR_ENOTIME;
-}
-
-apr_status_t apr_get_mon(struct atime_t *time, apr_int32_t *rv)
-{
-    if (time) {
-        (*rv) = time->explodedtime->wMonth;
-        return APR_SUCCESS;
-    }
-    return APR_ENOTIME;
-}
-
-apr_status_t apr_get_year(struct atime_t *time, apr_int32_t *rv)
-{
-    if (time) {
-        (*rv) = time->explodedtime->wYear;
-        return APR_SUCCESS;
-    }
-    return APR_ENOTIME;
-}
-
-apr_status_t apr_get_wday(struct atime_t *time, apr_int32_t *rv)
-{
-    if (time) {
-        (*rv) = time->explodedtime->wDayOfWeek;
-        return APR_SUCCESS;
-    }
-    return APR_ENOTIME;
-}
-
-apr_status_t apr_set_sec(struct atime_t *time, apr_int32_t value)
-{
-    if (!time) {
-        return APR_ENOTIME;
-    }
-    if (time->explodedtime == NULL) {
-        time->explodedtime = (SYSTEMTIME *)apr_pcalloc(time->cntxt, 
-                              sizeof(SYSTEMTIME));
-    }
-    if (time->explodedtime == NULL) {
-        return APR_ENOMEM;
-    }
-    time->explodedtime->wSecond = value;
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_set_min(struct atime_t *time, apr_int32_t value)
-{
-    if (!time) {
-        return APR_ENOTIME;
-    }
-    if (time->explodedtime == NULL) {
-        time->explodedtime = (SYSTEMTIME *)apr_pcalloc(time->cntxt, 
-                              sizeof(SYSTEMTIME));
-    }
-    if (time->explodedtime == NULL) {
-        return APR_ENOMEM;
-    }
-    time->explodedtime->wMinute = value;
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_set_hour(struct atime_t *time, apr_int32_t value)
-{
-    if (!time) {
-        return APR_ENOTIME;
-    }
-    if (time->explodedtime == NULL) {
-        time->explodedtime = (SYSTEMTIME *)apr_pcalloc(time->cntxt, 
-                              sizeof(SYSTEMTIME));
-    }
-    if (time->explodedtime == NULL) {
-        return APR_ENOMEM;
-    }
-    time->explodedtime->wHour = value;
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_set_mday(struct atime_t *time, apr_int32_t value)
-{
-    if (!time) {
-        return APR_ENOTIME;
-    }
-    if (time->explodedtime == NULL) {
-        time->explodedtime = (SYSTEMTIME *)apr_pcalloc(time->cntxt, 
-                              sizeof(SYSTEMTIME));
-    }
-    if (time->explodedtime == NULL) {
-        return APR_ENOMEM;
-    }
-    time->explodedtime->wDay = value;
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_set_mon(struct atime_t *time, apr_int32_t value)
-{
-    if (!time) {
-        return APR_ENOTIME;
-    }
-    if (time->explodedtime == NULL) {
-        time->explodedtime = (SYSTEMTIME *)apr_pcalloc(time->cntxt, 
-                              sizeof(SYSTEMTIME));
-    }
-    if (time->explodedtime == NULL) {
-        return APR_ENOMEM;
-    }
-    time->explodedtime->wMonth = value;
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_set_year(struct atime_t *time, apr_int32_t value)
-{
-    if (!time) {
-        return APR_ENOTIME;
-    }
-    if (time->explodedtime == NULL) {
-        time->explodedtime = (SYSTEMTIME *)apr_pcalloc(time->cntxt, 
-                              sizeof(SYSTEMTIME));
-    }
-    if (time->explodedtime == NULL) {
-        return APR_ENOMEM;
-    }
-    time->explodedtime->wYear = value;
-    return APR_SUCCESS;
-}
-
-apr_status_t apr_set_wday(struct atime_t *time, apr_int32_t value)
-{
-    if (!time) {
-        return APR_ENOTIME;
-    }
-    if (time->explodedtime == NULL) {
-        time->explodedtime = (SYSTEMTIME *)apr_pcalloc(time->cntxt, 
-                              sizeof(SYSTEMTIME));
-    }
-    if (time->explodedtime == NULL) {
-        return APR_ENOMEM;
-    }
-    time->explodedtime->wDayOfWeek = value;
-    return APR_SUCCESS;
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/time/win32/time.c b/rubbos/app/httpd-2.0.64/srclib/apr/time/win32/time.c
deleted file mode 100644
index 2711488f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/time/win32/time.c
+++ /dev/null
@@ -1,357 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "win32/apr_arch_atime.h"
-#include "apr_time.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include "apr_portable.h"
-#if APR_HAVE_TIME_H
-#include <time.h>
-#endif
-#if APR_HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#include <string.h>
-#include <winbase.h>
-#include "apr_arch_misc.h"
-
-/* Leap year is any year divisible by four, but not by 100 unless also
- * divisible by 400
- */
-#define IsLeapYear(y) ((!(y % 4)) ? (((!(y % 400)) && (y % 100)) ? 1 : 0) : 0)
-
-static DWORD get_local_timezone(TIME_ZONE_INFORMATION **tzresult)
-{
-    static TIME_ZONE_INFORMATION tz;
-    static DWORD result;
-    static int init = 0;
-
-    if (!init) {
-        result = GetTimeZoneInformation(&tz);
-        init = 1;
-    }
-
-    *tzresult = &tz;
-    return result;
-}
-
-static void SystemTimeToAprExpTime(apr_time_exp_t *xt, SYSTEMTIME *tm)
-{
-    static const int dayoffset[12] =
-    {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
-
-    /* Note; the caller is responsible for filling in detailed tm_usec,
-     * tm_gmtoff and tm_isdst data when applicable.
-     */
-    xt->tm_usec = tm->wMilliseconds * 1000;
-    xt->tm_sec  = tm->wSecond;
-    xt->tm_min  = tm->wMinute;
-    xt->tm_hour = tm->wHour;
-    xt->tm_mday = tm->wDay;
-    xt->tm_mon  = tm->wMonth - 1;
-    xt->tm_year = tm->wYear - 1900;
-    xt->tm_wday = tm->wDayOfWeek;
-    xt->tm_yday = dayoffset[xt->tm_mon] + (tm->wDay - 1);
-    xt->tm_isdst = 0;
-    xt->tm_gmtoff = 0;
-
-    /* If this is a leap year, and we're past the 28th of Feb. (the
-     * 58th day after Jan. 1), we'll increment our tm_yday by one.
-     */
-    if (IsLeapYear(tm->wYear) && (xt->tm_yday > 58))
-        xt->tm_yday++;
-}
-
-APR_DECLARE(apr_status_t) apr_time_ansi_put(apr_time_t *result, 
-                                                    time_t input)
-{
-    *result = (apr_time_t) input * APR_USEC_PER_SEC;
-    return APR_SUCCESS;
-}
-
-/* Return micro-seconds since the Unix epoch (jan. 1, 1970) UTC */
-APR_DECLARE(apr_time_t) apr_time_now(void)
-{
-    LONGLONG aprtime = 0;
-    FILETIME time;
-#ifndef _WIN32_WCE
-    GetSystemTimeAsFileTime(&time);
-#else
-    SYSTEMTIME st;
-    GetSystemTime(&st);
-    SystemTimeToFileTime(&st, &time);
-#endif
-    FileTimeToAprTime(&aprtime, &time);
-    return aprtime; 
-}
-
-APR_DECLARE(apr_status_t) apr_time_exp_gmt(apr_time_exp_t *result,
-                                           apr_time_t input)
-{
-    FILETIME ft;
-    SYSTEMTIME st;
-    AprTimeToFileTime(&ft, input);
-    FileTimeToSystemTime(&ft, &st);
-    /* The Platform SDK documents that SYSTEMTIME/FILETIME are
-     * generally UTC, so no timezone info needed
-     */
-    SystemTimeToAprExpTime(result, &st);
-    result->tm_usec = (apr_int32_t) (input % APR_USEC_PER_SEC);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_time_exp_tz(apr_time_exp_t *result, 
-                                          apr_time_t input, 
-                                          apr_int32_t offs)
-{
-    FILETIME ft;
-    SYSTEMTIME st;
-    AprTimeToFileTime(&ft, input + (offs *  APR_USEC_PER_SEC));
-    FileTimeToSystemTime(&ft, &st);
-    /* The Platform SDK documents that SYSTEMTIME/FILETIME are
-     * generally UTC, so we will simply note the offs used.
-     */
-    SystemTimeToAprExpTime(result, &st);
-    result->tm_usec = (apr_int32_t) (input % APR_USEC_PER_SEC);
-    result->tm_gmtoff = offs;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_time_exp_lt(apr_time_exp_t *result,
-                                          apr_time_t input)
-{
-    SYSTEMTIME st;
-    FILETIME ft, localft;
-
-    AprTimeToFileTime(&ft, input);
-
-#if APR_HAS_UNICODE_FS && !defined(_WIN32_WCE)
-    IF_WIN_OS_IS_UNICODE
-    {
-        TIME_ZONE_INFORMATION *tz;
-        SYSTEMTIME localst;
-        apr_time_t localtime;
-
-        get_local_timezone(&tz);
-
-        FileTimeToSystemTime(&ft, &st);
-
-        /* The Platform SDK documents that SYSTEMTIME/FILETIME are
-         * generally UTC.  We use SystemTimeToTzSpecificLocalTime
-         * because FileTimeToLocalFileFime is documented that the
-         * resulting time local file time would have DST relative
-         * to the *present* date, not the date converted.
-         */
-        SystemTimeToTzSpecificLocalTime(tz, &st, &localst);
-        SystemTimeToAprExpTime(result, &localst);
-        result->tm_usec = (apr_int32_t) (input % APR_USEC_PER_SEC);
-
-
-        /* Recover the resulting time as an apr time and use the
-         * delta for gmtoff in seconds (and ignore msec rounding) 
-         */
-        SystemTimeToFileTime(&localst, &localft);
-        FileTimeToAprTime(&localtime, &localft);
-        result->tm_gmtoff = (int)apr_time_sec(localtime) 
-                          - (int)apr_time_sec(input);
-
-        /* To compute the dst flag, we compare the expected 
-         * local (standard) timezone bias to the delta.
-         * [Note, in war time or double daylight time the
-         * resulting tm_isdst is, desireably, 2 hours]
-         */
-        result->tm_isdst = (result->tm_gmtoff / 3600)
-                         - (-(tz->Bias + tz->StandardBias) / 60);
-    }
-#endif
-#if APR_HAS_ANSI_FS || defined(_WIN32_WCE)
-    ELSE_WIN_OS_IS_ANSI
-    {
-        TIME_ZONE_INFORMATION tz;
-	/* XXX: This code is simply *wrong*.  The time converted will always
-         * map to the *now current* status of daylight savings time.
-         */
-
-        FileTimeToLocalFileTime(&ft, &localft);
-        FileTimeToSystemTime(&localft, &st);
-        SystemTimeToAprExpTime(result, &st);
-        result->tm_usec = (apr_int32_t) (input % APR_USEC_PER_SEC);
-
-        switch (GetTimeZoneInformation(&tz)) {
-            case TIME_ZONE_ID_UNKNOWN:
-                result->tm_isdst = 0;
-                /* Bias = UTC - local time in minutes
-                 * tm_gmtoff is seconds east of UTC
-                 */
-                result->tm_gmtoff = tz.Bias * -60;
-                break;
-            case TIME_ZONE_ID_STANDARD:
-                result->tm_isdst = 0;
-                result->tm_gmtoff = (tz.Bias + tz.StandardBias) * -60;
-                break;
-            case TIME_ZONE_ID_DAYLIGHT:
-                result->tm_isdst = 1;
-                result->tm_gmtoff = (tz.Bias + tz.DaylightBias) * -60;
-                break;
-            default:
-                /* noop */;
-        }
-    }
-#endif
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_time_exp_get(apr_time_t *t,
-                                           apr_time_exp_t *xt)
-{
-    apr_time_t year = xt->tm_year;
-    apr_time_t days;
-    static const int dayoffset[12] =
-    {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275};
-
-    /* shift new year to 1st March in order to make leap year calc easy */
-
-    if (xt->tm_mon < 2)
-        year--;
-
-    /* Find number of days since 1st March 1900 (in the Gregorian calendar). */
-
-    days = year * 365 + year / 4 - year / 100 + (year / 100 + 3) / 4;
-    days += dayoffset[xt->tm_mon] + xt->tm_mday - 1;
-    days -= 25508;              /* 1 jan 1970 is 25508 days since 1 mar 1900 */
-
-    days = ((days * 24 + xt->tm_hour) * 60 + xt->tm_min) * 60 + xt->tm_sec;
-
-    if (days < 0) {
-        return APR_EBADDATE;
-    }
-    *t = days * APR_USEC_PER_SEC + xt->tm_usec;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_time_exp_gmt_get(apr_time_t *t,
-                                               apr_time_exp_t *xt)
-{
-    apr_status_t status = apr_time_exp_get(t, xt);
-    if (status == APR_SUCCESS)
-        *t -= (apr_time_t) xt->tm_gmtoff * APR_USEC_PER_SEC;
-    return status;
-}
-
-APR_DECLARE(apr_status_t) apr_os_imp_time_get(apr_os_imp_time_t **ostime,
-                                              apr_time_t *aprtime)
-{
-    /* TODO: Consider not passing in pointer to apr_time_t (e.g., call by value) */
-    AprTimeToFileTime(*ostime, *aprtime);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_exp_time_get(apr_os_exp_time_t **ostime, 
-                                              apr_time_exp_t *aprexptime)
-{
-    (*ostime)->wYear = aprexptime->tm_year + 1900;
-    (*ostime)->wMonth = aprexptime->tm_mon + 1;
-    (*ostime)->wDayOfWeek = aprexptime->tm_wday;
-    (*ostime)->wDay = aprexptime->tm_mday;
-    (*ostime)->wHour = aprexptime->tm_hour;
-    (*ostime)->wMinute = aprexptime->tm_min;
-    (*ostime)->wSecond = aprexptime->tm_sec;
-    (*ostime)->wMilliseconds = aprexptime->tm_usec / 1000;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_imp_time_put(apr_time_t *aprtime,
-                                              apr_os_imp_time_t **ostime,
-                                              apr_pool_t *cont)
-{
-    /* XXX: sanity failure, what is file time, gmt or local ?
-     */
-    FileTimeToAprTime(aprtime, *ostime);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_os_exp_time_put(apr_time_exp_t *aprtime,
-                                              apr_os_exp_time_t **ostime,
-                                              apr_pool_t *cont)
-{
-    /* The Platform SDK documents that SYSTEMTIME/FILETIME are
-     * generally UTC, so no timezone info needed
-     */
-    SystemTimeToAprExpTime(aprtime, *ostime);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(void) apr_sleep(apr_interval_time_t t)
-{
-    /* One of the few sane situations for a cast, Sleep
-     * is in ms, not us, and passed as a DWORD value
-     */
-    Sleep((DWORD)(t / 1000));
-}
-
-#if defined(_WIN32_WCE)
-/* A noop on WinCE, like Unix implementation */
-APR_DECLARE(void) apr_time_clock_hires(apr_pool_t *p)
-{
-    return;
-}
-#else
-static apr_status_t clock_restore(void *unsetres)
-{
-    ULONG newRes;
-    SetTimerResolution((ULONG)unsetres, FALSE, &newRes);
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(void) apr_time_clock_hires(apr_pool_t *p)
-{
-    ULONG newRes;
-    /* Timer resolution is stated in 100ns units.  Note that TRUE requests the
-     * new clock resolution, FALSE above releases the request.
-     */
-    if (SetTimerResolution(10000, TRUE, &newRes) == 0 /* STATUS_SUCCESS */) {
-        /* register the cleanup... */
-        apr_pool_cleanup_register(p, (void*)10000, clock_restore,
-                                  apr_pool_cleanup_null);
-    }
-}
-#endif
-
-
-/* Deprecated */
-APR_DECLARE(apr_status_t) apr_explode_time(apr_time_exp_t *result,
-                                          apr_time_t input,
-                                          apr_int32_t offs)
-{
-    return apr_time_exp_tz(result, input, offs);
-}
-
-/* Deprecated */
-APR_DECLARE(apr_status_t) apr_explode_localtime(apr_time_exp_t *result, 
-                                                apr_time_t input)
-{
-    return apr_time_exp_lt(result, input);
-}
-
-/* Deprecated */
-APR_DECLARE(apr_status_t) apr_implode_gmt(apr_time_t *t,
-                                          apr_time_exp_t *xt)
-{
-    return apr_time_exp_gmt_get(t, xt);
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/time/win32/timestr.c b/rubbos/app/httpd-2.0.64/srclib/apr/time/win32/timestr.c
deleted file mode 100644
index 0c533be0..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/time/win32/timestr.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "win32/apr_arch_atime.h"
-#include "apr_portable.h"
-#include "apr_strings.h"
-
-APR_DECLARE_DATA const char apr_month_snames[12][4] =
-{
-    "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-APR_DECLARE_DATA const char apr_day_snames[7][4] =
-{
-    "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-};
-
-APR_DECLARE(apr_status_t) apr_rfc822_date(char *date_str, apr_time_t t)
-{
-    apr_time_exp_t xt;
-    const char *s;
-    int real_year;
-
-    apr_time_exp_gmt(&xt, t);
-
-    /* example: "Sat, 08 Jan 2000 18:31:41 GMT" */
-    /*           12345678901234567890123456789  */
-
-    s = &apr_day_snames[xt.tm_wday][0];
-    *date_str++ = *s++;
-    *date_str++ = *s++;
-    *date_str++ = *s++;
-    *date_str++ = ',';
-    *date_str++ = ' ';
-    *date_str++ = xt.tm_mday / 10 + '0';
-    *date_str++ = xt.tm_mday % 10 + '0';
-    *date_str++ = ' ';
-    s = &apr_month_snames[xt.tm_mon][0];
-    *date_str++ = *s++;
-    *date_str++ = *s++;
-    *date_str++ = *s++;
-    *date_str++ = ' ';
-    real_year = 1900 + xt.tm_year;
-    /* This routine isn't y10k ready. */
-    *date_str++ = real_year / 1000 + '0';
-    *date_str++ = real_year % 1000 / 100 + '0';
-    *date_str++ = real_year % 100 / 10 + '0';
-    *date_str++ = real_year % 10 + '0';
-    *date_str++ = ' ';
-    *date_str++ = xt.tm_hour / 10 + '0';
-    *date_str++ = xt.tm_hour % 10 + '0';
-    *date_str++ = ':';
-    *date_str++ = xt.tm_min / 10 + '0';
-    *date_str++ = xt.tm_min % 10 + '0';
-    *date_str++ = ':';
-    *date_str++ = xt.tm_sec / 10 + '0';
-    *date_str++ = xt.tm_sec % 10 + '0';
-    *date_str++ = ' ';
-    *date_str++ = 'G';
-    *date_str++ = 'M';
-    *date_str++ = 'T';
-    *date_str++ = 0;
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_ctime(char *date_str, apr_time_t t)
-{
-    apr_time_exp_t xt;
-    const char *s;
-    int real_year;
-
-    /* example: "Wed Jun 30 21:49:08 1993" */
-    /*           123456789012345678901234  */
-
-    apr_time_exp_lt(&xt, t);
-    s = &apr_day_snames[xt.tm_wday][0];
-    *date_str++ = *s++;
-    *date_str++ = *s++;
-    *date_str++ = *s++;
-    *date_str++ = ' ';
-    s = &apr_month_snames[xt.tm_mon][0];
-    *date_str++ = *s++;
-    *date_str++ = *s++;
-    *date_str++ = *s++;
-    *date_str++ = ' ';
-    *date_str++ = xt.tm_mday / 10 + '0';
-    *date_str++ = xt.tm_mday % 10 + '0';
-    *date_str++ = ' ';
-    *date_str++ = xt.tm_hour / 10 + '0';
-    *date_str++ = xt.tm_hour % 10 + '0';
-    *date_str++ = ':';
-    *date_str++ = xt.tm_min / 10 + '0';
-    *date_str++ = xt.tm_min % 10 + '0';
-    *date_str++ = ':';
-    *date_str++ = xt.tm_sec / 10 + '0';
-    *date_str++ = xt.tm_sec % 10 + '0';
-    *date_str++ = ' ';
-    real_year = 1900 + xt.tm_year;
-    *date_str++ = real_year / 1000 + '0';
-    *date_str++ = real_year % 1000 / 100 + '0';
-    *date_str++ = real_year % 100 / 10 + '0';
-    *date_str++ = real_year % 10 + '0';
-    *date_str++ = 0;
-
-    return APR_SUCCESS;
-}
-
-
-#ifndef _WIN32_WCE
-
-int win32_strftime_extra(char *s, size_t max, const char *format,
-                         const struct tm *tm) 
-{
-   /* If the new format string is bigger than max, the result string won't fit
-    * anyway. If format strings are added, made sure the padding below is
-    * enough */
-    char *new_format = (char *) malloc(max + 11);
-    size_t i, j, format_length = strlen(format);
-    int return_value;
-    int length_written;
-
-    for (i = 0, j = 0; (i < format_length && j < max);) {
-        if (format[i] != '%') {
-            new_format[j++] = format[i++];
-            continue;
-        }
-        switch (format[i+1]) {
-            case 'C':
-                length_written = apr_snprintf(new_format + j, max - j, "%2d",
-                    (tm->tm_year + 1970)/100);
-                j = (length_written == -1) ? max : (j + length_written);
-                i += 2;
-                break;
-            case 'D':
-                /* Is this locale dependent? Shouldn't be...
-                   Also note the year 2000 exposure here */
-                memcpy(new_format + j, "%m/%d/%y", 8);
-                i += 2;
-                j += 8;
-                break;
-            case 'r':
-                memcpy(new_format + j, "%I:%M:%S %p", 11);
-                i += 2;
-                j += 11;
-                break;
-            case 'R':
-                memcpy(new_format + j, "%H:%M", 5);
-                i += 2;
-                j += 5;
-                break;
-            case 'T':
-                memcpy(new_format + j, "%H:%M:%S", 8);
-                i += 2;
-                j += 8;
-                break;
-            case 'e':
-                length_written = apr_snprintf(new_format + j, max - j, "%2d",
-                    tm->tm_mday);
-                j = (length_written == -1) ? max : (j + length_written);
-                i += 2;
-                break;
-            default:
-                /* We know we can advance two characters forward here. Also
-                 * makes sure that %% is preserved. */
-                new_format[j++] = format[i++];
-                new_format[j++] = format[i++];
-        }
-    }
-    if (j >= max) {
-        *s = '\0';  /* Defensive programming, okay since output is undefined*/
-        return_value = 0;
-    } else {
-        new_format[j] = '\0';
-        return_value = strftime(s, max, new_format, tm);
-    }
-    free(new_format);
-    return return_value;
-}
-
-#endif
-
-
-APR_DECLARE(apr_status_t) apr_strftime(char *s, apr_size_t *retsize,
-                                       apr_size_t max, const char *format,
-                                       apr_time_exp_t *xt)
-{
-#ifdef _WIN32_WCE
-    return APR_ENOTIMPL;
-#else
-    struct tm tm;
-    memset(&tm, 0, sizeof tm);
-    tm.tm_sec  = xt->tm_sec;
-    tm.tm_min  = xt->tm_min;
-    tm.tm_hour = xt->tm_hour;
-    tm.tm_mday = xt->tm_mday;
-    tm.tm_mon  = xt->tm_mon;
-    tm.tm_year = xt->tm_year;
-    tm.tm_wday = xt->tm_wday;
-    tm.tm_yday = xt->tm_yday;
-    tm.tm_isdst = xt->tm_isdst;
-    (*retsize) = win32_strftime_extra(s, max, format, &tm);
-    return APR_SUCCESS;
-#endif
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/user/netware/groupinfo.c b/rubbos/app/httpd-2.0.64/srclib/apr/user/netware/groupinfo.c
deleted file mode 100644
index a671121f..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/user/netware/groupinfo.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include "apr_user.h"
-#include "apr_private.h"
-#ifdef HAVE_GRP_H
-#include <grp.h>
-#endif
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if APR_HAVE_UNISTD_H
-#include <unistd.h> /* for _POSIX_THREAD_SAFE_FUNCTIONS */
-#endif
-
-APR_DECLARE(apr_status_t) apr_gid_name_get(char **groupname, apr_gid_t groupid,
-                                           apr_pool_t *p)
-{
-    return APR_ENOTIMPL;
-}
-  
-APR_DECLARE(apr_status_t) apr_gid_get(apr_gid_t *groupid, 
-                                      const char *groupname, apr_pool_t *p)
-{
-    return APR_ENOTIMPL;
-}
-
-/* Deprecated */
-APR_DECLARE(apr_status_t) apr_get_groupname(char **groupname, 
-                                            apr_gid_t groupid, apr_pool_t *p)
-{
-    return apr_gid_name_get(groupname, groupid, p);
-}
-
-APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname, 
-                                             apr_gid_t groupid, apr_pool_t *p)
-{
-    return apr_gid_name_get(groupname, groupid, p);
-}
-
-APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *groupid, 
-                                          const char *groupname, apr_pool_t *p)
-{
-    return apr_gid_get(groupid, groupname, p);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/user/netware/userinfo.c b/rubbos/app/httpd-2.0.64/srclib/apr/user/netware/userinfo.c
deleted file mode 100644
index 94b42ae4..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/user/netware/userinfo.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include "apr_user.h"
-#include "apr_private.h"
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if APR_HAVE_UNISTD_H
-#include <unistd.h> /* for _POSIX_THREAD_SAFE_FUNCTIONS */
-#endif
-
-#define PWBUF_SIZE 512
-
-static apr_status_t getpwnam_safe(const char *username,
-                                  struct passwd *pw,
-                                  char pwbuf[PWBUF_SIZE])
-{
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_uid_homepath_get(char **dirname,
-                                               const char *username,
-                                               apr_pool_t *p)
-{
-    return APR_ENOTIMPL;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_uid_current(apr_uid_t *uid,
-                                          apr_gid_t *gid,
-                                          apr_pool_t *p)
-{
-    return APR_ENOTIMPL;
-}
-
-
-
-
-APR_DECLARE(apr_status_t) apr_uid_get(apr_uid_t *uid, apr_gid_t *gid,
-                                      const char *username, apr_pool_t *p)
-{
-    return APR_ENOTIMPL;
-}
-
-APR_DECLARE(apr_status_t) apr_uid_name_get(char **username, apr_uid_t userid,
-                                           apr_pool_t *p)
-{
-    return APR_ENOTIMPL;
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname,
-                                                 const char *username,
-                                                 apr_pool_t *p)
-{
-    return apr_uid_homepath_get(dirname, username, p);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_get_userid(apr_uid_t *uid, apr_gid_t *gid,
-                                         const char *username, apr_pool_t *p)
-{
-    return apr_uid_get(uid, gid, username, p);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_current_userid(apr_uid_t *uid,
-                                             apr_gid_t *gid,
-                                             apr_pool_t *p)
-{
-    return apr_uid_current(uid, gid, p);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid, apr_pool_t *p)
-{
-    return apr_uid_name_get(username, userid, p);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/.libs/groupinfo.o b/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/.libs/groupinfo.o
deleted file mode 100644
index fcf49822..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/.libs/groupinfo.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/.libs/userinfo.o b/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/.libs/userinfo.o
deleted file mode 100644
index d8007d69..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/.libs/userinfo.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/Makefile b/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/Makefile
deleted file mode 100644
index 1a98e0ec..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-srcdir = .
-
-
-TARGETS = userinfo.lo groupinfo.lo
-
-# bring in rules.mk for standard functionality
-include /bottlenecks/rubbos/app/httpd-2.0.64/srclib/apr/build/apr_rules.mk
-
-INCDIR=../../include
-DEFOSDIR=$(INCDIR)/arch/unix
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/Makefile.in b/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/Makefile.in
deleted file mode 100644
index 100498f5..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-TARGETS = userinfo.lo groupinfo.lo
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-
-INCDIR=../../include
-DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
-
-# DO NOT REMOVE
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/groupinfo.c b/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/groupinfo.c
deleted file mode 100644
index 8df3df85..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/groupinfo.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include "apr_user.h"
-#include "apr_private.h"
-#ifdef HAVE_GRP_H
-#include <grp.h>
-#endif
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if APR_HAVE_UNISTD_H
-#include <unistd.h> /* for _POSIX_THREAD_SAFE_FUNCTIONS */
-#endif
-
-APR_DECLARE(apr_status_t) apr_gid_name_get(char **groupname, apr_gid_t groupid,
-                                           apr_pool_t *p)
-{
-    struct group *gr;
-#ifndef BEOS
-
-#if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRGID_R)
-    struct group grp;
-    char grbuf[512];
-    apr_status_t rv;
-
-    /* See comment in getpwnam_safe on error handling. */
-    rv = getgrgid_r(groupid, &grp, grbuf, sizeof(grbuf), &gr);
-    if (rv) {
-        return rv;
-    }
-    if (gr == NULL) {
-        return APR_ENOENT;
-    }
-#else
-    errno = 0;
-    if ((gr = getgrgid(groupid)) == NULL) {
-        return errno ? errno : APR_ENOENT;
-    }
-#endif
-    *groupname = apr_pstrdup(p, gr->gr_name);
-#endif
-    return APR_SUCCESS;
-}
-  
-APR_DECLARE(apr_status_t) apr_gid_get(apr_gid_t *groupid, 
-                                      const char *groupname, apr_pool_t *p)
-{
-    struct group *gr;
-#ifndef BEOS
-
-#if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRNAM_R)
-    struct group grp;
-    char grbuf[512];
-    apr_status_t rv;
-
-    /* See comment in getpwnam_safe on error handling. */
-    rv = getgrnam_r(groupname, &grp, grbuf, sizeof(grbuf), &gr);
-    if (rv) {
-        return rv;
-    }
-    if (gr == NULL) {
-        return APR_ENOENT;
-    }
-#else
-    errno = 0;
-    if ((gr = getgrnam(groupname)) == NULL) {
-        return errno ? errno : APR_ENOENT;
-    }
-#endif
-    *groupid = gr->gr_gid;
-#endif
-    return APR_SUCCESS;
-}
-
-/* Deprecated */
-APR_DECLARE(apr_status_t) apr_get_groupname(char **groupname, 
-                                            apr_gid_t groupid, apr_pool_t *p)
-{
-    return apr_gid_name_get(groupname, groupid, p);
-}
-
-APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname, 
-                                             apr_gid_t groupid, apr_pool_t *p)
-{
-    return apr_gid_name_get(groupname, groupid, p);
-}
-
-APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *groupid, 
-                                          const char *groupname, apr_pool_t *p)
-{
-    return apr_gid_get(groupid, groupname, p);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/groupinfo.lo b/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/groupinfo.lo
deleted file mode 100644
index 815b0412..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/groupinfo.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# groupinfo.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/groupinfo.o'
-
-# Name of the non-PIC object.
-non_pic_object='groupinfo.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/groupinfo.o b/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/groupinfo.o
deleted file mode 100644
index 5ae3c860..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/groupinfo.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/userinfo.c b/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/userinfo.c
deleted file mode 100644
index f50f8053..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/userinfo.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include "apr_user.h"
-#include "apr_private.h"
-#ifdef HAVE_PWD_H
-#include <pwd.h>
-#endif
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if APR_HAVE_UNISTD_H
-#include <unistd.h> /* for _POSIX_THREAD_SAFE_FUNCTIONS */
-#endif
-#define APR_WANT_MEMFUNC
-#include "apr_want.h"
-
-#define PWBUF_SIZE 512
-
-static apr_status_t getpwnam_safe(const char *username,
-                                  struct passwd *pw,
-                                  char pwbuf[PWBUF_SIZE])
-{
-    struct passwd *pwptr;
-#if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
-    apr_status_t rv;
-
-    /* POSIX defines getpwnam_r() et al to return the error number
-     * rather than set errno, and requires pwptr to be set to NULL if
-     * the entry is not found, imply that "not found" is not an error
-     * condition; some implementations do return 0 with pwptr set to
-     * NULL. */
-    rv = getpwnam_r(username, pw, pwbuf, PWBUF_SIZE, &pwptr);
-    if (rv) {
-        return rv;
-    }
-    if (pwptr == NULL) {
-        return APR_ENOENT;
-    }
-#else
-    /* Some platforms (e.g. FreeBSD 4.x) do not set errno on NULL "not
-     * found" return values for the non-threadsafe function either. */
-    errno = 0;
-    if ((pwptr = getpwnam(username)) != NULL) {
-        memcpy(pw, pwptr, sizeof *pw);
-    }
-    else {
-        return errno ? errno : APR_ENOENT;
-    }
-#endif
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_uid_homepath_get(char **dirname,
-                                               const char *username,
-                                               apr_pool_t *p)
-{
-    struct passwd pw;
-    char pwbuf[PWBUF_SIZE];
-    apr_status_t rv;
-
-    if ((rv = getpwnam_safe(username, &pw, pwbuf)) != APR_SUCCESS)
-        return rv;
-
-#ifdef OS2
-    /* Need to manually add user name for OS/2 */
-    *dirname = apr_pstrcat(p, pw.pw_dir, pw.pw_name, NULL);
-#else
-    *dirname = apr_pstrdup(p, pw.pw_dir);
-#endif
-    return APR_SUCCESS;
-}
-
-
-
-APR_DECLARE(apr_status_t) apr_uid_current(apr_uid_t *uid,
-                                          apr_gid_t *gid,
-                                          apr_pool_t *p)
-{
-    *uid = getuid();
-    *gid = getgid();
-  
-    return APR_SUCCESS;
-}
-
-
-
-
-APR_DECLARE(apr_status_t) apr_uid_get(apr_uid_t *uid, apr_gid_t *gid,
-                                      const char *username, apr_pool_t *p)
-{
-    struct passwd pw;
-    char pwbuf[PWBUF_SIZE];
-    apr_status_t rv;
-        
-    if ((rv = getpwnam_safe(username, &pw, pwbuf)) != APR_SUCCESS)
-        return rv;
-
-    *uid = pw.pw_uid;
-    *gid = pw.pw_gid;
-
-    return APR_SUCCESS;
-}
-
-APR_DECLARE(apr_status_t) apr_uid_name_get(char **username, apr_uid_t userid,
-                                           apr_pool_t *p)
-{
-    struct passwd *pw;
-#if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWUID_R)
-    struct passwd pwd;
-    char pwbuf[PWBUF_SIZE];
-    apr_status_t rv;
-
-    rv = getpwuid_r(userid, &pwd, pwbuf, sizeof(pwbuf), &pw);
-    if (rv) {
-        return rv;
-    }
-
-    if (pw == NULL) {
-        return APR_ENOENT;
-    }
-
-#else
-    errno = 0;
-    if ((pw = getpwuid(userid)) == NULL) {
-        return errno ? errno : APR_ENOENT;
-    }
-#endif
-    *username = apr_pstrdup(p, pw->pw_name);
-    return APR_SUCCESS;
-}
-
-/* deprecated */  
-APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname,
-                                                 const char *username,
-                                                 apr_pool_t *p)
-{
-    return apr_uid_homepath_get(dirname, username, p);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_get_userid(apr_uid_t *uid, apr_gid_t *gid,
-                                         const char *username, apr_pool_t *p)
-{
-    return apr_uid_get(uid, gid, username, p);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_current_userid(apr_uid_t *uid,
-                                             apr_gid_t *gid,
-                                             apr_pool_t *p)
-{
-    return apr_uid_current(uid, gid, p);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid, 
-                                           apr_pool_t *p)
-{
-    return apr_uid_name_get(username, userid, p);
-}
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/userinfo.lo b/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/userinfo.lo
deleted file mode 100644
index 9ac20075..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/userinfo.lo
+++ /dev/null
@@ -1,12 +0,0 @@
-# userinfo.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/userinfo.o'
-
-# Name of the non-PIC object.
-non_pic_object='userinfo.o'
-
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/userinfo.o b/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/userinfo.o
deleted file mode 100644
index 47290d17..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/user/unix/userinfo.o
+++ /dev/null
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/user/win32/groupinfo.c b/rubbos/app/httpd-2.0.64/srclib/apr/user/win32/groupinfo.c
deleted file mode 100644
index 784409fc..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/user/win32/groupinfo.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include "apr_user.h"
-#include "apr_private.h"
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-APR_DECLARE(apr_status_t) apr_gid_get(apr_gid_t *gid, 
-                                      const char *groupname, apr_pool_t *p)
-{
-#ifdef _WIN32_WCE
-    return APR_ENOTIMPL;
-#else
-    SID_NAME_USE sidtype;
-    char anydomain[256];
-    char *domain;
-    DWORD sidlen = 0;
-    DWORD domlen = sizeof(anydomain);
-    DWORD rv;
-    char *pos;
-
-    if (pos = strchr(groupname, '/')) {
-        domain = apr_pstrndup(p, groupname, pos - groupname);
-        groupname = pos + 1;
-    }
-    else if (pos = strchr(groupname, '\\')) {
-        domain = apr_pstrndup(p, groupname, pos - groupname);
-        groupname = pos + 1;
-    }
-    else {
-        domain = NULL;
-    }
-    /* Get nothing on the first pass ... need to size the sid buffer 
-     */
-    rv = LookupAccountName(domain, groupname, domain, &sidlen, 
-                           anydomain, &domlen, &sidtype);
-    if (sidlen) {
-        /* Give it back on the second pass
-         */
-        *gid = apr_palloc(p, sidlen);
-        domlen = sizeof(anydomain);
-        rv = LookupAccountName(domain, groupname, *gid, &sidlen, 
-                               anydomain, &domlen, &sidtype);
-    }
-    if (!sidlen || !rv) {
-        return apr_get_os_error();
-    }
-    return APR_SUCCESS;
-#endif
-}
-
-APR_DECLARE(apr_status_t) apr_gid_name_get(char **groupname, apr_gid_t groupid, apr_pool_t *p)
-{
-#ifdef _WIN32_WCE
-    *groupname = apr_pstrdup(p, "Administrators");
-#else
-    SID_NAME_USE type;
-    char name[MAX_PATH], domain[MAX_PATH];
-    DWORD cbname = sizeof(name), cbdomain = sizeof(domain);
-    if (!groupid)
-        return APR_EINVAL;
-    if (!LookupAccountSid(NULL, groupid, name, &cbname, domain, &cbdomain, &type))
-        return apr_get_os_error();
-    if (type != SidTypeGroup && type != SidTypeWellKnownGroup 
-                             && type != SidTypeAlias)
-        return APR_EINVAL;
-    *groupname = apr_pstrdup(p, name);
-#endif
-    return APR_SUCCESS;
-}
-  
-APR_DECLARE(apr_status_t) apr_gid_compare(apr_gid_t left, apr_gid_t right)
-{
-    if (!left || !right)
-        return APR_EINVAL;
-#ifndef _WIN32_WCE
-    if (!IsValidSid(left) || !IsValidSid(right))
-        return APR_EINVAL;
-    if (!EqualSid(left, right))
-        return APR_EMISMATCH;
-#endif
-    return APR_SUCCESS;
-}
-
-/* Deprecated */
-APR_DECLARE(apr_status_t) apr_get_groupname(char **groupname, 
-                                            apr_gid_t groupid, apr_pool_t *p)
-{
-    return apr_gid_name_get(groupname, groupid, p);
-}
-
-APR_DECLARE(apr_status_t) apr_group_name_get(char **groupname, 
-                                             apr_gid_t groupid, apr_pool_t *p)
-{
-    return apr_gid_name_get(groupname, groupid, p);
-}
-
-APR_DECLARE(apr_status_t) apr_get_groupid(apr_gid_t *gid, 
-                                         const char *groupname, apr_pool_t *p)
-{
-    return apr_gid_get(gid, groupname, p);
-}
-
-APR_DECLARE(apr_status_t) apr_compare_groups(apr_gid_t left, apr_gid_t right)
-{
-    return apr_gid_compare(left, right);
-}
diff --git a/rubbos/app/httpd-2.0.64/srclib/apr/user/win32/userinfo.c b/rubbos/app/httpd-2.0.64/srclib/apr/user/win32/userinfo.c
deleted file mode 100644
index 61087f34..00000000
--- a/rubbos/app/httpd-2.0.64/srclib/apr/user/win32/userinfo.c
+++ /dev/null
@@ -1,317 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_private.h"
-#include "apr_strings.h"
-#include "apr_portable.h"
-#include "apr_user.h"
-#include "apr_arch_file_io.h"
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifndef _WIN32_WCE
-/* Internal sid binary to string translation, see MSKB Q131320.
- * Several user related operations require our SID to access
- * the registry, but in a string format.  All error handling
- * depends on IsValidSid(), which internally we better test long
- * before we get here!
- */
-void get_sid_string(char *buf, int blen, apr_uid_t id)
-{
-    PSID_IDENTIFIER_AUTHORITY psia;
-    DWORD nsa;
-    DWORD sa;
-    int slen;
-
-    /* Determine authority values (these is a big-endian value, 
-     * and NT records the value as hex if the value is > 2^32.)
-     */
-    psia = GetSidIdentifierAuthority(id);
-    nsa =  (DWORD)(psia->Value[5])        + ((DWORD)(psia->Value[4]) <<  8)
-        + ((DWORD)(psia->Value[3]) << 16) + ((DWORD)(psia->Value[2]) << 24);
-    sa  =  (DWORD)(psia->Value[1])        + ((DWORD)(psia->Value[0]) <<  8);
-    if (sa) {
-        slen = apr_snprintf(buf, blen, "S-%lu-0x%04x%08x",
-                            SID_REVISION, sa, nsa);
-    } else {
-        slen = apr_snprintf(buf, blen, "S-%lu-%lu",
-                            SID_REVISION, nsa);
-    }
-
-    /* Now append all the subauthority strings.
-     */
-    nsa = *GetSidSubAuthorityCount(id);
-    for (sa = 0; sa < nsa; ++sa) {
-        slen += apr_snprintf(buf + slen, blen - slen, "-%lu",
-                             *GetSidSubAuthority(id, sa));
-    }
-} 
-#endif
-/* Query the ProfileImagePath from the version-specific branch, where the
- * regkey uses the user's name on 9x, and user's sid string on NT.
- */
-APR_DECLARE(apr_status_t) apr_uid_homepath_get(char **dirname, 
-                                               const char *username, 
-                                               apr_pool_t *p)
-{
-#ifdef _WIN32_WCE
-    *dirname = apr_pstrdup(p, "/My Documents");
-    return APR_SUCCESS;
-#else
-    apr_status_t rv;
-    char regkey[MAX_PATH * 2];
-    char *fixch;
-    DWORD keylen;
-    DWORD type;
-    HKEY key;
-
-    if (apr_os_level >= APR_WIN_NT) {
-        apr_uid_t uid;
-        apr_gid_t gid;
-    
-        if ((rv = apr_uid_get(&uid, &gid, username, p)) != APR_SUCCESS)
-            return rv;
-
-        strcpy(regkey, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\"
-                       "ProfileList\\");
-        keylen = strlen(regkey);
-        get_sid_string(regkey + keylen, sizeof(regkey) - keylen, uid);
-    }
-    else {
-        strcpy(regkey, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\"
-                       "ProfileList\\");
-        keylen = strlen(regkey);
-        apr_cpystrn(regkey + keylen, username, sizeof(regkey) - keylen);
-
-    }
-
-    if ((rv = RegOpenKeyEx(HKEY_LOCAL_MACHINE, regkey, 0, 
-                           KEY_QUERY_VALUE, &key)) != ERROR_SUCCESS)
-        return APR_FROM_OS_ERROR(rv);
-
-#if APR_HAS_UNICODE_FS
-    IF_WIN_OS_IS_UNICODE
-    {
-
-        keylen = sizeof(regkey);
-        rv = RegQueryValueExW(key, L"ProfileImagePath", NULL, &type,
-                                   (void*)regkey, &keylen);
-        RegCloseKey(key);
-        if (rv != ERROR_SUCCESS)
-            return APR_FROM_OS_ERROR(rv);
-        if (type == REG_SZ) {
-            char retdir[MAX_PATH];
-            if ((rv = unicode_to_utf8_path(retdir, sizeof(retdir), 
-                                           (apr_wchar_t*)regkey)) != APR_SUCCESS)
-                return rv;
-            *dirname = apr_pstrdup(p, retdir);
-        }
-        else if (type == REG_EXPAND_SZ) {
-            apr_wchar_t path[MAX_PATH];
-            char retdir[MAX_PATH];
-            ExpandEnvironmentStringsW((apr_wchar_t*)regkey, path, 
-                                      sizeof(path) / 2);
-            if ((rv = unicode_to_utf8_path(retdir, sizeof(retdir), path))
-                    != APR_SUCCESS)
-                return rv;
-            *dirname = apr_pstrdup(p, retdir);
-        }
-        else
-            return APR_ENOENT;
-    }
-#endif
-#if APR_HAS_ANSI_FS
-    ELSE_WIN_OS_IS_ANSI
-    {
-        keylen = sizeof(regkey);
-        rv = RegQueryValueEx(key, "ProfileImagePath", NULL, &type,
-                                  (void*)regkey, &keylen);
-        RegCloseKey(key);
-        if (rv != ERROR_SUCCESS)
-            return APR_FROM_OS_ERROR(rv);
-        if (type == REG_SZ) {
-            *dirname = apr_pstrdup(p, regkey);
-        }
-        else if (type == REG_EXPAND_SZ) {
-            char path[MAX_PATH];
-            ExpandEnvironmentStrings(regkey, path, sizeof(path));
-            *dirname = apr_pstrdup(p, path);
-        }
-        else
-            return APR_ENOENT;
-    }
-#endif /* APR_HAS_ANSI_FS */
-    for (fixch = *dirname; *fixch; ++fixch)
-        if (*fixch == '\\')
-            *fixch = '/';
-    return APR_SUCCESS;
-#endif /* _WIN32_WCE */
-}
-
-APR_DECLARE(apr_status_t) apr_uid_current(apr_uid_t *uid,
-                                          apr_gid_t *gid,
-                                          apr_pool_t *p)
-{
-#ifdef _WIN32_WCE
-    return APR_ENOTIMPL;
-#else
-    HANDLE threadtok;
-    DWORD needed;
-    TOKEN_USER *usr;
-    TOKEN_PRIMARY_GROUP *grp;
-    
-    if(!OpenProcessToken(GetCurrentProcess(), STANDARD_RIGHTS_READ | READ_CONTROL | TOKEN_QUERY, &threadtok)) {
-        return apr_get_os_error();
-    }
-
-    *uid = NULL;
-    if (!GetTokenInformation(threadtok, TokenUser, NULL, 0, &needed)
-        && (GetLastError() == ERROR_INSUFFICIENT_BUFFER) 
-        && (usr = apr_palloc(p, needed))
-        && GetTokenInformation(threadtok, TokenUser, usr, needed, &needed))
-        *uid = usr->User.Sid;
-    else
-        return apr_get_os_error();
-
-    if (!GetTokenInformation(threadtok, TokenPrimaryGroup, NULL, 0, &needed)
-        && (GetLastError() == ERROR_INSUFFICIENT_BUFFER) 
-        && (grp = apr_palloc(p, needed))
-        && GetTokenInformation(threadtok, TokenPrimaryGroup, grp, needed, &needed))
-        *gid = grp->PrimaryGroup;
-    else
-        return apr_get_os_error();
-
-    return APR_SUCCESS;
-#endif 
-}
-
-APR_DECLARE(apr_status_t) apr_uid_get(apr_uid_t *uid, apr_gid_t *gid,
-                                      const char *username, apr_pool_t *p)
-{
-#ifdef _WIN32_WCE
-    return APR_ENOTIMPL;
-#else
-    SID_NAME_USE sidtype;
-    char anydomain[256];
-    char *domain;
-    DWORD sidlen = 0;
-    DWORD domlen = sizeof(anydomain);
-    DWORD rv;
-    char *pos;
-
-    if (pos = strchr(username, '/')) {
-        domain = apr_pstrndup(p, username, pos - username);
-        username = pos + 1;
-    }
-    else if (pos = strchr(username, '\\')) {
-        domain = apr_pstrndup(p, username, pos - username);
-        username = pos + 1;
-    }
-    else {
-        domain = NULL;
-    }
-    /* Get nothing on the first pass ... need to size the sid buffer 
-     */
-    rv = LookupAccountName(domain, username, domain, &sidlen, 
-                           anydomain, &domlen, &sidtype);
-    if (sidlen) {
-        /* Give it back on the second pass
-         */
-        *uid = apr_palloc(p, sidlen);
-        domlen = sizeof(anydomain);
-        rv = LookupAccountName(domain, username, *uid, &sidlen, 
-                               anydomain, &domlen, &sidtype);
-    }
-    if (!sidlen || !rv) {
-        return apr_get_os_error();
-    }
-    /* There doesn't seem to be a simple way to retrieve the primary group sid
-     */
-    *gid = NULL;
-    return APR_SUCCESS;
-#endif
-}
-
-APR_DECLARE(apr_status_t) apr_uid_name_get(char **username, apr_uid_t userid,
-                                           apr_pool_t *p)
-{
-#ifdef _WIN32_WCE
-    *username = apr_pstrdup(p, "Administrator");
-    return APR_SUCCESS;
-#else
-    SID_NAME_USE type;
-    char name[MAX_PATH], domain[MAX_PATH];
-    DWORD cbname = sizeof(name), cbdomain = sizeof(domain);
-    if (!userid)
-        return APR_EINVAL;
-    if (!LookupAccountSid(NULL, userid, name, &cbname, domain, &cbdomain, &type))
-        return apr_get_os_error();
-    if (type != SidTypeUser && type != SidTypeAlias && type != SidTypeWellKnownGroup)
-        return APR_EINVAL;
-    *username = apr_pstrdup(p, name);
-    return APR_SUCCESS;
-#endif
-}
-  
-APR_DECLARE(apr_status_t) apr_uid_compare(apr_uid_t left, apr_uid_t right)
-{
-    if (!left || !right)
-        return APR_EINVAL;
-#ifndef _WIN32_WCE
-    if (!IsValidSid(left) || !IsValidSid(right))
-        return APR_EINVAL;
-    if (!EqualSid(left, right))
-        return APR_EMISMATCH;
-#endif
-    return APR_SUCCESS;
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_get_home_directory(char **dirname, 
-                                                 const char *username, 
-                                                 apr_pool_t *p)
-{
-    return apr_uid_homepath_get(dirname, username, p);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_get_userid(apr_uid_t *uid, apr_gid_t *gid,
-                                         const char *username, apr_pool_t *p)
-{
-    return apr_uid_get(uid, gid, username, p);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_current_userid(apr_uid_t *uid,
-                                             apr_gid_t *gid,
-                                             apr_pool_t *p)
-{
-    return apr_uid_current(uid, gid, p);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_compare_users(apr_uid_t left, apr_uid_t right)
-{
-    return apr_uid_compare(left, right);
-}
-
-/* deprecated */
-APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid,
-                                           apr_pool_t *p)
-{
-    return apr_uid_name_get(username, userid, p);
-}